sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop_liyi

Browse Source 
# Conflicts:
#	lib/blue/io_gateway/io_gateway_configuringWifi.dart
This commit is contained in:
liyi 2025-01-09 14:11:04 +08:00
commit 6ecf89088e
5 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -95,8 +95,8 @@ generate_git_tag:
- bash pre_build.sh sky - bash pre_build.sh sky
- project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///') - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///')
- echo "project_url:$project_url" - echo "project_url:$project_url"
- echo "CI_SERVER_FQDN:$CI_SERVER_FQDN" - 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:StarlockTeam/app-starlock.git - git remote set-url origin git@$CI_SERVER_FQDN:$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME.git
script: script:
- bash tag_generator.sh generate_tag - bash tag_generator.sh generate_tag

2
ios/Runner/AppDelegate.m
View File

@ -19,7 +19,7 @@
- (BOOL)application:(UIApplication *)application - (BOOL)application:(UIApplication *)application
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"]; // [UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"];
XSFlutterManager *VC = [[XSFlutterManager alloc] init]; XSFlutterManager *VC = [[XSFlutterManager alloc] init];
self.window.rootViewController = VC; self.window.rootViewController = VC;

20
lib/blue/io_gateway/io_gateway_configuringWifi.dart
View File

@ -1,6 +1,5 @@
// 网关配网 // 网关配网
import 'dart:convert'; import 'dart:convert';
import 'dart:typed_data';
import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/app_settings/app_settings.dart';
@ -50,19 +49,12 @@ class GatewayConfiguringWifiCommand extends SenderProtocol {
//gatewayConfigurationStr //gatewayConfigurationStr
final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length; final int clientIdLength = utf8.encode(gatewayConfigurationStr!).length;
Uint8List lengthBytes = Uint8List(2); final double clientIdLengthDouble = clientIdLength / 256;
ByteData byteData = ByteData.view(lengthBytes.buffer); final int clientIdLengthDoubleType1 = clientIdLengthDouble.toInt();
byteData.setUint16(0, clientIdLength, Endian.little); // 使用大端序（big-endian） final int clientIdLengthDoubleType2 = clientIdLength % 256;
// AppLog.log('gatewayConfigurationStr!:$gatewayConfigurationStr! clientIdLength:$clientIdLength clientIdLengthDouble:$clientIdLengthDouble clientIdLengthDoubleType1:$clientIdLengthDoubleType1 clientIdLengthDoubleType2:$clientIdLengthDoubleType2');
// 将两个字节添加到 subData subData.add(clientIdLengthDoubleType1);
subData.addAll(lengthBytes); subData.add(clientIdLengthDoubleType2);
// 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);
subData.addAll(utf8.encode(gatewayConfigurationStr!)); subData.addAll(utf8.encode(gatewayConfigurationStr!));
// subData = getFixedLengthList(subData, 20 - clientIdLength); // subData = getFixedLengthList(subData, 20 - clientIdLength);

2
lib/tools/appFirstEnterHandle.dart
View File

@ -107,7 +107,6 @@ class AppFirstEnterHandle {
), ),
TextSpan( TextSpan(
text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。' text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
.tr
.tr), .tr),
], ],
), ),
@ -178,7 +177,6 @@ class AppFirstEnterHandle {
), ),
TextSpan( TextSpan(
text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。' text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
.tr
.tr), .tr),
], ],
), ),

2
pubspec.yaml
View File

@ -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+2024120301：完善网关功能
# 1.0.85+2024120401：修复网关问题，打包给谢敬调试 # 1.0.85+2024120401：修复网关问题，打包给谢敬调试
version: 1.0.85+2025010801 version: 1.0.85+2025010802
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'