From 918df59662aee6e13bc5b6297352c27720b334ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 24 Sep 2024 09:55:54 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=94=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9D=97=E6=97=A0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=B6=E4=B8=8D=E4=B8=8A=E4=BC=A0=202?= =?UTF-8?q?=E3=80=81=E5=BC=80=E5=AE=8C=E9=94=81=E4=B8=8A=E4=BC=A0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0password=E5=AD=97=E6=AE=B5=203?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E9=94=81=E5=88=97=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E7=94=B5=E5=AD=90=E9=92=A5=E5=8C=99=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=204=E3=80=81=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0?= =?UTF-8?q?=E6=97=B6=E8=83=BD=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98=205?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 2 +- .../doorLockLog/doorLockLog_logic.dart | 4 ++++ .../lockDetail/lockDetail/lockDetail_logic.dart | 17 ++++++++--------- lib/main/lockMian/lockList/lockList_logic.dart | 3 +++ .../minePersonInfoResetPassword_page.dart | 13 +++++++++++-- lib/mine/mineSet/mineSet/mineSet_page.dart | 2 +- lib/widget/permission/permission_dialog.dart | 2 +- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 40f5428d..022a6c01 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -361,4 +361,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 317f9473a5705c6fe4d79d95e81676f248048fdc -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3 diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index 5513864a..a6528d18 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart @@ -213,6 +213,10 @@ class DoorLockLogLogic extends BaseGetXController { // 操作记录上传 Future lockRecordUploadData(List list) async { + // 无数据时不上传 + if(list.isEmpty){ + return; + } final KeyOperationRecordEntity entity = await ApiRepository.to .lockRecordUploadData( lockId: state.keyInfos.value.lockId.toString(), records: list); diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index e457fc19..fb186a7f 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/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 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; diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart index 84acab23..9844d980 100755 --- a/lib/main/lockMian/lockList/lockList_logic.dart +++ b/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 keyTypes = [ XSConstantMacro.keyTypeTime, + XSConstantMacro.keyTypeOnce, XSConstantMacro.keyTypeLoop ]; final List keyStatus = [ diff --git a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart index b6cdb379..75e38406 100755 --- a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart +++ b/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, diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index 79f7fe76..0afe0223 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -364,7 +364,7 @@ class _MineSetPageState extends State // action: () { // logic.showToast('功能暂未开放'.tr); // }), - if (F.isXHJ) + if (!F.isSKY) CommonItem( leftTitel: '客服'.tr, isHaveLine: widget.showAbout, diff --git a/lib/widget/permission/permission_dialog.dart b/lib/widget/permission/permission_dialog.dart index c15f1737..dc7afbf6 100755 --- a/lib/widget/permission/permission_dialog.dart +++ b/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 permissions = requestPermission(); final dynamic cache = await Storage.getString(titles[permission]??''); final bool isGranted = await permissionStatus(permissions);