diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c09e949..6ae1079e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,8 +95,8 @@ generate_git_tag: - bash pre_build.sh sky - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///') - echo "project_url:$project_url" - - echo "CI_SERVER_FQDN:$CI_SERVER_FQDN" - - git remote set-url origin git@$CI_SERVER_FQDN:StarlockTeam/app-starlock.git + - echo "CI_SERVER_FQDN:$CI_SERVER_FQDN/CI_PROJECT_ROOT_NAMESPACE:$CI_PROJECT_ROOT_NAMESPACE/CI_PROJECT_NAME:$CI_PROJECT_NAME" + - git remote set-url origin git@$CI_SERVER_FQDN:$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME.git script: - bash tag_generator.sh generate_tag diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 4b399780..f4187699 100755 --- a/ios/Runner/AppDelegate.m +++ b/ios/Runner/AppDelegate.m @@ -19,7 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"]; +// [UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"]; XSFlutterManager *VC = [[XSFlutterManager alloc] init]; self.window.rootViewController = VC; diff --git a/lib/blue/io_gateway/io_gateway_configuringWifi.dart b/lib/blue/io_gateway/io_gateway_configuringWifi.dart index c66236a0..769f2079 100644 --- a/lib/blue/io_gateway/io_gateway_configuringWifi.dart +++ b/lib/blue/io_gateway/io_gateway_configuringWifi.dart @@ -1,6 +1,5 @@ // 网关配网 import 'dart:convert'; -import 'dart:typed_data'; import 'package:star_lock/app_settings/app_settings.dart'; @@ -50,19 +49,12 @@ class GatewayConfiguringWifiCommand extends SenderProtocol { //gatewayConfigurationStr final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length; - Uint8List lengthBytes = Uint8List(2); - ByteData byteData = ByteData.view(lengthBytes.buffer); - byteData.setUint16(0, clientIdLength, Endian.little); // 使用大端序(big-endian) - - // 将两个字节添加到 subData - subData.addAll(lengthBytes); - // subData.add(clientIdLength); - // final double clientIdLengthDouble = clientIdLength / 256; - // final int clientIdLengthDoubleType1 = clientIdLengthDouble.toInt(); - // final int clientIdLengthDoubleType2 = clientIdLength % 256; - // // AppLog.log('gatewayConfigurationStr!:$gatewayConfigurationStr! clientIdLength:$clientIdLength clientIdLengthDouble:$clientIdLengthDouble clientIdLengthDoubleType1:$clientIdLengthDoubleType1 clientIdLengthDoubleType2:$clientIdLengthDoubleType2'); - // data.add(clientIdLengthDoubleType1); - // data.add(clientIdLengthDoubleType2); + final double clientIdLengthDouble = clientIdLength / 256; + final int clientIdLengthDoubleType1 = clientIdLengthDouble.toInt(); + final int clientIdLengthDoubleType2 = clientIdLength % 256; + // AppLog.log('gatewayConfigurationStr!:$gatewayConfigurationStr! clientIdLength:$clientIdLength clientIdLengthDouble:$clientIdLengthDouble clientIdLengthDoubleType1:$clientIdLengthDoubleType1 clientIdLengthDoubleType2:$clientIdLengthDoubleType2'); + subData.add(clientIdLengthDoubleType1); + subData.add(clientIdLengthDoubleType2); subData.addAll(utf8.encode(gatewayConfigurationStr!)); // subData = getFixedLengthList(subData, 20 - clientIdLength); diff --git a/lib/tools/appFirstEnterHandle.dart b/lib/tools/appFirstEnterHandle.dart index 129a3cdc..1d8d58cc 100755 --- a/lib/tools/appFirstEnterHandle.dart +++ b/lib/tools/appFirstEnterHandle.dart @@ -107,7 +107,6 @@ class AppFirstEnterHandle { ), TextSpan( text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意,将无法使用我们的产品和服务,并会退出应用。' - .tr .tr), ], ), @@ -178,7 +177,6 @@ class AppFirstEnterHandle { ), TextSpan( text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意,将无法使用我们的产品和服务,并会退出应用。' - .tr .tr), ], ), diff --git a/pubspec.yaml b/pubspec.yaml index bda21c4f..b1f1e2b8 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -104,7 +104,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.85+2024120301:完善网关功能 # 1.0.85+2024120401:修复网关问题,打包给谢敬调试 -version: 1.0.85+2025010801 +version: 1.0.85+2025010802 environment: sdk: '>=2.12.0 <3.0.0'