1、修改锁详情-记录模块无记录时不上传

2、开完锁上传记录添加password字段
3、修复锁列表单次电子钥匙过期状态不显示问题
4、修复重置密码提交按钮置灰时能点击问题
5、修复我的模块客服不显示问题

ios/Podfile.lock

@@ -361,4 +361,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 317f9473a5705c6fe4d79d95e81676f248048fdc
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3

lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

@@ -213,6 +213,10 @@ class DoorLockLogLogic extends BaseGetXController {
 
   // 操作记录上传
   Future<void> lockRecordUploadData(List list) async {
+    // 无数据时不上传
+    if(list.isEmpty){
+      return;
+    }
     final KeyOperationRecordEntity entity = await ApiRepository.to
         .lockRecordUploadData(
             lockId: state.keyInfos.value.lockId.toString(), records: list);

lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -278,16 +278,15 @@ class LockDetailLogic extends BaseGetXController {
             AppLog.log('indexList:$indexList');
             final Map indexMap = {};
             indexMap['type'] = indexList[0].toString();
-            int operateDate = 0;
-            // if (indexList[0] == 2) {
+
+            final int userNo = (indexList[1] * 256) + indexList[2];
+            indexMap['user'] = userNo.toString();
+            // AppLog.log('userNouserNouserNouserNo:$userNo');
+
             final List<int> passwordData = indexList.sublist(7, 17);
             final String password = utf8String(passwordData);
-            AppLog.log('passwordData:$passwordData password:$password');
-            indexMap['user'] = password.toString();
-            // } else {
-            //   final int userNo = (indexList[1] * 256) + indexList[2];
-            //   indexMap['user'] = userNo.toString();
-            // }
+            indexMap['password'] = password.toString();
+            // AppLog.log('passwordpasswordpassword:$password');
 
             indexMap['success'] = '1';
 
@@ -295,7 +294,7 @@ class LockDetailLogic extends BaseGetXController {
                 (0xff & indexList[4]) << 16 |
                 (0xff & indexList[5]) << 8 |
                 (0xFF & indexList[6]);
-            operateDate = time * 1000;
+            int operateDate = time * 1000;
             if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter(
                 DateTime.fromMillisecondsSinceEpoch(getUTCNetTime() * 1000))) {
               continue;

lib/main/lockMian/lockList/lockList_logic.dart

@@ -145,6 +145,8 @@ class LockListLogic extends BaseGetXController {
       } else {
         return XSConstantMacro.getKeyStatusStr(keyInfo.keyStatus!);
       }
+    }else if (keyInfo.keyType == XSConstantMacro.keyTypeOnce){
+      return XSConstantMacro.getKeyStatusStr(keyInfo.keyStatus!);
     }
     return '';
   }
@@ -153,6 +155,7 @@ class LockListLogic extends BaseGetXController {
   bool getShowType(LockListInfoItemEntity keyInfo) {
     final List<int> keyTypes = <int>[
       XSConstantMacro.keyTypeTime,
+      XSConstantMacro.keyTypeOnce,
       XSConstantMacro.keyTypeLoop
     ];
     final List<int> keyStatus = <int>[

lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart

@@ -8,6 +8,7 @@ import 'package:star_lock/mine/minePersonInfo/minePersonInfoResetPassword/minePe
 
 import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
+import '../../../main/lockMian/lockMain/lockMain_logic.dart';
 import '../../../tools/submitBtn.dart';
 import '../../../tools/tf_loginInput.dart';
 import '../../../tools/titleAppBar.dart';
@@ -56,9 +57,17 @@ class _MinePersonInfoResetPasswordPageState
                   borderRadius: 20.w,
                   isDisabled: state.canSub.value,
                   padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
-                  onClick: () {
+                  onClick: state.canSub.value ? () async {
+                    final bool isNetWork =
+                        await LockMainLogic.to()?.judgeTheNetwork() ??
+                        false;
+                    if (!isNetWork) {
+                      return;
+                    }
+
                     logic.changePasswordRequest();
-                  })),
+                  } : null
+              )),
               SizedBox(height: 40.w),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,

lib/mine/mineSet/mineSet/mineSet_page.dart

@@ -364,7 +364,7 @@ class _MineSetPageState extends State<MineSetPage>
         //       action: () {
         //         logic.showToast('功能暂未开放'.tr);
         //       }),
-        if (F.isXHJ)
+        if (!F.isSKY)
           CommonItem(
             leftTitel: '客服'.tr,
             isHaveLine: widget.showAbout,

lib/widget/permission/permission_dialog.dart

@@ -232,7 +232,7 @@ class PermissionDialog {
     }
 
     bool application = true;
-    const Permission permission = Permission.photos;
+    const Permission permission = Permission.storage;
     final List<Permission> permissions = requestPermission();
     final dynamic cache = await Storage.getString(titles[permission]??'');
     final bool isGranted = await permissionStatus(permissions);