修改锁设置bug

star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart

@@ -56,7 +56,6 @@ class CheckingInSetLogic extends BaseGetXController{
     );
     if(entity.errorCode!.codeIsSuccessful){
       state.companyName.value = state.changeNameController.text;
-      print("state.checkingInSetInfo.value.companyName:${state.checkingInSetInfo.value.companyName}");
       Toast.show(msg: "修改成功");
     }
   }

star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart

@@ -71,7 +71,7 @@ class _MassSendLockGroupListPageState extends State<MassSendLockGroupListPage> {
             SubmitBtn(
               btnName: '确定',
               onClick: () {
-                print('得到lockid为$selectLockIdList ');
+                // print('得到lockid为$selectLockIdList ');
                 Map<String, dynamic> resultMap = {};
                 resultMap['selectLockIdList'] = selectLockIdList;
                 Navigator.pop(context, resultMap);

star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart

@@ -20,10 +20,21 @@ class AutomaticBlockingLogic extends BaseGetXController{
   final AutomaticBlockingState state = AutomaticBlockingState();
 
   void setAutoUnLock() async{
+    String autoTime;
+    if(state.isOpen.value == false){
+      autoTime = "0";
+    }else{
+      if(state.isCustomLockTime.value == true){
+        autoTime = state.timeController.text;
+      }else{
+        autoTime = state.autoLockTime.value;
+      }
+    }
+
     var entity = await ApiRepository.to.setAutoUnlock(
         lockId: state.lockSetInfoData.value.lockId!,
         autoLock:state.isOpen.value == true ? 1 : 0,
-        autoLockSecond: int.parse(state.autoLockTime.value),
+        autoLockSecond: int.parse(autoTime),
     );
     if(entity.errorCode!.codeIsSuccessful){
 

star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart

@@ -83,6 +83,7 @@ class _AutomaticBlockingPageState extends State<AutomaticBlockingPage> {
                         //选择事件的回调
                         clickCallBack: (int index, var str) {
                           if(index != 5){
+                            state.isCustomLockTime.value = false;
                             state.autoLockTime.value = str.toString();
                           }else{
                             state.isCustomLockTime.value = true;

star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart

@@ -194,7 +194,7 @@ class LockSetLogic extends BaseGetXController {
     }
   }
 
-  // 设置自动落锁数据解析
+  // 锁设置数据解析
   Future<void> _replySetSupportFunctionsWithParameters(Reply reply) async {
     int status = reply.data[2];
     switch(status){
@@ -204,10 +204,10 @@ class LockSetLogic extends BaseGetXController {
         // Toast.show(msg: "操作成功");featureEnable = state.isOpenStayWarn.value == 1 ? 0 : 1;
         if(state.settingUpSupportFeatures == 55){
           // APP开锁时是否需联网
-          state.isOpenLockNeedOnline.value = state.isOpenLockNeedOnline.value == 1 ? 0 : 1;
+          // state.isOpenLockNeedOnline.value = state.isOpenLockNeedOnline.value == 1 ? 0 : 1;
-          state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline = state.isOpenLockNeedOnline.value;
+          // state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline = state.isOpenLockNeedOnline.value;
           setLockSetOpenLockNeedOnline();
-          eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline!));
+          // eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline!));
         }else if(state.settingUpSupportFeatures == 56){
           // 蓝牙广播
           state.isOpenBlueBroadcast.value = state.isOpenBlueBroadcast.value == 1 ? 0 : 1;
@@ -416,7 +416,7 @@ class LockSetLogic extends BaseGetXController {
       password: state.passwordTF.text,
     );
     if (entity.errorCode!.codeIsSuccessful) {
-      deletLockInfoData();
+      // deletLockInfoData();
 
       blockDeletNumberCheckPasswordCallback();
       // if(state.currentDeviceUUid.value.isEmpty){
@@ -500,11 +500,11 @@ class LockSetLogic extends BaseGetXController {
     if(entity.errorCode!.codeIsSuccessful){
       eventBus.fire(RefreshLockListInfoDataEvent());
 
-      state.isAttendance.value = (state.isAttendance.value == 1 ? 0 : 1);
+      state.isOpenLockNeedOnline.value = (state.isOpenLockNeedOnline.value == 1 ? 0 : 1);
-      state.lockSettingInfo.value.attendance = state.isAttendance.value;
+      state.lockSettingInfo.value.appUnlockOnline = state.isOpenLockNeedOnline.value;
 
-      eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.attendance!));
+      eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.appUnlockOnline!));
-      print("state.lockSettingInfo.value.attendance:${state.lockSettingInfo.value.attendance}");
+      print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}");
       Toast.show(msg: "设置成功");
     }
   }

star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -57,28 +57,23 @@ class LockDetailLogic extends BaseGetXController{
 
   // 开门数据解析
   Future<void> _replyOpenLock(Reply reply) async {
-      var privateKey = await Storage.getStringList(saveBluePrivateKey);
-      List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
-
-      var signKey = await Storage.getStringList(saveBlueSignKey);
-      List<int> signKeyDataList = changeStringListToIntList(signKey!);
-
       var tokenData = reply.data.sublist(2, 6);
       var saveStrList = changeIntListToStringList(tokenData);
       // print("openDoorToken:$tokenData");
       Storage.setStringList(saveBlueToken, saveStrList);
 
-      // 电量
-      int power = reply.data[7];
-      state.electricQuantity.value = power;
-
       int status = reply.data[6];
       print("status:$status");
 
       switch(status){
         case 0x00:
-        //成功
+          //成功
           print("${reply.commandType}数据解析成功");
+
+          // 电量
+          int power = reply.data[7];
+          state.electricQuantity.value = power;
+
           getLockRecordLastUploadDataTime();
           state.lockState.value = 2;
           state.animationController.reset();
@@ -89,6 +84,12 @@ class LockDetailLogic extends BaseGetXController{
           //无权限
           print("${reply.commandType}需要鉴权");
 
+          var privateKey = await Storage.getStringList(saveBluePrivateKey);
+          List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+
+          var signKey = await Storage.getStringList(saveBlueSignKey);
+          List<int> signKeyDataList = changeStringListToIntList(signKey!);
+
           IoSenderManage.senderOpenLock(
             keyID: BlueManage().connectDeviceName,
             userID: await Storage.getUid(),
@@ -526,10 +527,8 @@ class LockDetailLogic extends BaseGetXController{
     _lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent = eventBus.on<LockSetChangeSetRefreshLockDetailWithType>().listen((event) {
       if(event.type == 0){
         // 0考勤
-        print("event.setResult:${event.setResult}");
         state.isAttendance.value = event.setResult;
         state.keyInfos.value.lockSetting!.attendance = event.setResult;
-        print("state.keyInfos.value.lockSetting!.attendance:${state.keyInfos.value.lockSetting!.attendance}");
       }else if(event.type == 1){
         // 1 开锁时是否需联网
         state.isOpenLockNeedOnline.value = event.setResult;

star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -274,7 +274,6 @@ class _LockDetailPageState extends State<LockDetailPage>
 
   List<Widget> getShowWidget() {
     var showWidgetArr = <Widget>[];
-    print("pagepagepage:state.keyInfos.value.lockSetting!.attendance:${state.keyInfos.value.lockSetting!.attendance}");
     // 考勤
     if (state.isAttendance.value == 1) {
       showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png',

star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_logic.dart

@@ -30,9 +30,7 @@ class OtherTypeKeyListLogic extends BaseGetXController{
   void _initReplySubscription() {
     _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((reply) {
       // 添加指纹开始(重置锁里面所有指纹)
-      print("111111111111111 isDeletFingerprintData:${state.isDeletFingerprintData} isDeletICCardData:${state.isDeletICCardData}");
       if((reply is SenderAddFingerprintReply) && (state.isDeletFingerprintData == true)) {
-        print("111111111111111");
         _replyAddFingerprintBegin(reply);
       }
 

star_lock/lib/mine/about/about_page.dart

@@ -29,22 +29,14 @@ class _AbountPageState extends State<AbountPage> {
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          SizedBox(
+          SizedBox(height: 150.h),
-            height: 150.h,
-          ),
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Image.asset(
+              Image.asset("images/icon_main_1024.png", width: 160.w, height: 160.w),
-                "images/icon_main_1024.png",
+            ]
-                width: 160.w,
-                height: 160.w,
-              ),
-            ],
-          ),
-          SizedBox(
-            height: 20.h,
           ),
+          SizedBox(height: 20.h),
           Text(
             "星锁 1.0.0.02(preRelease-20231124)",
             style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),