Merge branch 'develop_liyi' into 'canary_release'

Develop liyi

See merge request StarlockTeam/app-starlock!16

lib/blue/io_protocol/io_changeAdministratorPassword.dart

@@ -1,6 +1,6 @@
-
 import 'dart:convert';
 
+import 'package:star_lock/flavors.dart';
 import 'package:star_lock/tools/dateTool.dart';
 
 import '../../app_settings/app_settings.dart';
@@ -13,7 +13,6 @@ import 'package:crypto/crypto.dart' as crypto;
 
 // 修改管理员密码
 class ChangeAdministratorPasswordCommand extends SenderProtocol {
-
   ChangeAdministratorPasswordCommand({
     this.keyID,
     this.userID,
@@ -40,7 +39,6 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol {
   List<int>? signKey;
   List<int>? privateKey;
 
-
   @override
   String toString() {
     return 'ChangeAdministratorPasswordCommand{keyID: $keyID, userID: $userID,'
@@ -80,7 +78,12 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol {
     subData = getFixedLengthList(subData, 20 - userIDLength);
 
     // PwdNo
-    subData.addAll(intChangList(pwdNo!));
+    if (F.isSKY) {
+      subData.add(pwdNo! & 0xFF); // 低字节
+      subData.add((pwdNo! >> 8) & 0xFF); // 高字节
+    } else {
+      subData.addAll(intChangList(pwdNo!));
+    }
 
     // pwd 20
     final int pwdLength = utf8.encode(pwd!).length;
@@ -105,7 +108,7 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol {
     subData.add((endTime! & 0xff00) >> 8);
     subData.add(endTime! & 0xff);
 
-    if(needAuthor == 0){
+    if (needAuthor == 0) {
       //AuthCodeLen  1
       subData.add(0);
     } else {
@@ -147,10 +150,11 @@ class ChangeAdministratorPasswordCommand extends SenderProtocol {
 }
 
 class ChangeAdministratorPasswordReply extends Reply {
-  ChangeAdministratorPasswordReply.parseData(CommandType commandType, List<int> dataDetail)
+  ChangeAdministratorPasswordReply.parseData(
+      CommandType commandType, List<int> dataDetail)
       : super.parseData(commandType, dataDetail) {
     data = dataDetail;
     final int status = data[2];
     errorWithStstus(status);
   }
-}
+}

lib/login/login/starLock_login_logic.dart

@@ -179,10 +179,7 @@ class StarLockLoginLogic extends BaseGetXController {
   Future<void> onInit() async {
     super.onInit();
 
-    JverifyOneClickLoginManage();
-    oneClickLoginAction();
-    state.isCheckVerifyEnable.value =
-        await JverifyOneClickLoginManage().checkVerifyEnable();
+
   }
 
   @override

lib/main.dart

@@ -9,6 +9,7 @@ import 'package:get/get.dart';
 import 'package:path/path.dart' as path;
 import 'package:provider/provider.dart';
 import 'package:star_lock/flavors.dart';
+import 'package:star_lock/login/login/starLock_login_logic.dart';
 import 'package:star_lock/mine/about/debug/debug_tool.dart';
 import 'package:star_lock/network/api_provider.dart';
 import 'package:star_lock/network/api_repository.dart';
@@ -17,6 +18,7 @@ import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart';
 import 'package:star_lock/talk/starChart/status/appLifecycle_observer.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
 import 'package:star_lock/tools/device_info_service.dart';
+import 'package:star_lock/tools/jverify_one_click_login.dart';
 import 'package:star_lock/tools/platform_info_services.dart';
 import 'package:star_lock/tools/push/notification_service.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
@@ -99,4 +101,11 @@ Future<void> privacySDKInitialization() async {
   final XSJPushProvider jpushProvider = XSJPushProvider();
   await jpushProvider.initJPushService();
   NotificationService().init(); // 初始化通知服务
+
+  // 初始化一键登录服务
+  final StarLockLoginLogic loginLogic = Get.put(StarLockLoginLogic());
+  JverifyOneClickLoginManage();
+  loginLogic.oneClickLoginAction();
+  loginLogic.state.isCheckVerifyEnable.value =
+      await JverifyOneClickLoginManage().checkVerifyEnable();
 }

lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart

@@ -68,15 +68,16 @@ class _ValueAddedServicesPageListState
               '高级功能'.tr, () async {
             final bool? isVip = await Storage.getBool(saveIsVip);
             if (isVip == null || !isVip) {
-              if (CommonDataManage().currentKeyInfo.isLockOwner != 1) {
-                logic.showToast('请先添加锁'.tr);
-              } else {
-                //刷新购买状态
-                Get.toNamed(Routers.advancedFeaturesWebPage,
-                    arguments: <String, int>{
-                      'webBuyType': XSConstantMacro.webBuyTypeVip,
-                    })?.then((value) => logic.getUserInfoRequest());
-              }
+              // vip状态是和账号绑定，这里判断用户打开的某个锁是不是LockOwner没意义
+              // if (CommonDataManage().currentKeyInfo.isLockOwner != 1) {
+              //   logic.showToast('请先添加锁'.tr);
+              // } else {
+              //刷新购买状态
+              Get.toNamed(Routers.advancedFeaturesWebPage,
+                  arguments: <String, int>{
+                    'webBuyType': XSConstantMacro.webBuyTypeVip,
+                  })?.then((value) => logic.getUserInfoRequest());
+              // }
             } else {
               Get.toNamed(Routers.valueAddedServicesHighFunctionPage);
             }

lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart

@@ -1,33 +1,15 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:typed_data';
 
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:get/get.dart';
-import 'package:star_lock/appRouters.dart';
+import 'dart:convert';
+
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/blue/blue_manage.dart';
-import 'package:star_lock/blue/io_protocol/io_openLock.dart';
-import 'package:star_lock/blue/io_reply.dart';
-import 'package:star_lock/blue/io_tool/io_tool.dart';
-import 'package:star_lock/blue/io_tool/manager_event_bus.dart';
+
 import 'package:star_lock/blue/reciver_data.dart';
-import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart';
-import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart';
 import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
 import 'package:star_lock/talk/starChart/entity/scp_message.dart';
 import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
 import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart';
-import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
-import 'package:star_lock/tools/bugly/bugly_tool.dart';
-import 'package:star_lock/tools/dateTool.dart';
-import 'package:star_lock/tools/eventBusEventManage.dart';
-import 'package:star_lock/tools/storage.dart';
-import 'package:umeng_common_sdk/umeng_common_sdk.dart';
 
-import '../../star_chart_manage.dart';
 
 class UdpBlePassThroughHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {