From 1b97722657184aba4f73125c4eb7355c4bf5a0a9 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Mon, 1 Jul 2024 16:30:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=B6=88=E6=81=AF=E5=88=B7=E6=96=B0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 6 ++++++ lib/main/lockMian/lockMain/lockMain_logic.dart | 2 +- lib/tools/push/message_management.dart | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3ffb1e4d..1b0b0834 100755 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -127,6 +127,8 @@ PODS: - Flutter - network_info_plus (0.0.1): - Flutter + - open_filex (0.0.2): + - Flutter - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): @@ -188,6 +190,7 @@ DEPENDENCIES: - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`) + - open_filex (from `.symlinks/plugins/open_filex/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) @@ -280,6 +283,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/just_audio/ios" network_info_plus: :path: ".symlinks/plugins/network_info_plus/ios" + open_filex: + :path: ".symlinks/plugins/open_filex/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" path_provider_foundation: @@ -344,6 +349,7 @@ SPEC CHECKSUMS: jpush_flutter: 1f436f1a02db5c5ef9e9b42378f557096ccd328b just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f + open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index b4d2ba83..6bd0b1ee 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -179,7 +179,7 @@ class LockMainLogic extends BaseGetXController { list.lockList ??= []; final int keyIndex = lockList.indexWhere( - (LockListInfoItemEntity lock) => lock.keyId == keyId) ?? + (LockListInfoItemEntity lock) => lock.lockId == lockId) ?? -1; if (keyIndex != -1) { //已存在 diff --git a/lib/tools/push/message_management.dart b/lib/tools/push/message_management.dart index 429dcc36..c274d858 100644 --- a/lib/tools/push/message_management.dart +++ b/lib/tools/push/message_management.dart @@ -24,6 +24,7 @@ class MessageManagement { if (extra.isEmpty) { return; } + AppLog.log(message.toString()); _shuntingBus(extra); } From 208dc9ff8ae07171659d5845b14b804ec9766d8b Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Mon, 1 Jul 2024 17:46:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E9=94=81=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=92=A5=E5=8C=99=E8=BF=87=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockDetail/lockDetail_page.dart | 31 ++++++++++++++++++- .../lockMian/lockList/lockList_logic.dart | 26 +++++++++++++++- lib/main/lockMian/lockList/lockList_page.dart | 9 +----- .../lockMian/lockList/lockList_xhj_page.dart | 9 +----- 4 files changed, 57 insertions(+), 18 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index a4f4ec1d..400c0c2a 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -93,6 +93,18 @@ class _LockDetailPageState extends State //鑫泓佳布局 Widget xhjWidget() { + final bool isShowTip = (state.keyInfos.value.keyType == + XSConstantMacro.keyTypeTime || + state.keyInfos.value.keyType == + XSConstantMacro.keyTypeLoop) && // 限时、循环 + (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) <= + 15 && + DateTool() + .compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) >= + 0) && // 0到30天 + (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse || + state.keyInfos.value.keyStatus == + XSConstantMacro.keyStatusWaitReceive); return Scaffold( backgroundColor: Colors.white, body: Obx(() { @@ -103,7 +115,7 @@ class _LockDetailPageState extends State child: Column( children: [ SizedBox( - height: 10.h, + height: isShowTip ? 70.h : 10.h, ), Padding( padding: EdgeInsets.symmetric(horizontal: 24.w), @@ -144,6 +156,23 @@ class _LockDetailPageState extends State ], ), ), + Visibility( + visible: isShowTip, + child: Container( + // height: 30.h, + color: const Color(0xFFFBEFD4), + padding: EdgeInsets.only(top: 8.h, bottom: 8.h), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "${"钥匙将在".tr}${DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!)}${"天后失效".tr}", + style: TextStyle( + color: const Color(0xffCBA74B), fontSize: 24.sp)) + ], + ), + ), + ), Visibility( visible: state.iSClosedUnlockSuccessfulPopup.value, child: Container( diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart index b06b7f1f..57247151 100755 --- a/lib/main/lockMian/lockList/lockList_logic.dart +++ b/lib/main/lockMian/lockList/lockList_logic.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; @@ -30,7 +31,8 @@ class LockListLogic extends BaseGetXController { LockListInfoGroupEntity? entity; List get groupDataList { - final List list = _groupDataList.map((e)=>e.copy()).toList(); + final List list = + _groupDataList.map((GroupList e) => e.copy()).toList(); if (state.searchStr.value != '' && state.showSearch.value) { list.forEach((GroupList element) { element.lockList?.removeWhere((LockListInfoItemEntity element) => @@ -141,6 +143,28 @@ class LockListLogic extends BaseGetXController { return ''; } + //判断是否要显示提示 + bool getShowType(LockListInfoItemEntity keyInfo) { + final List keyTypes = [ + XSConstantMacro.keyTypeTime, + XSConstantMacro.keyTypeLoop + ]; + final List keyStatus = [ + XSConstantMacro.keyStatusWaitIneffective, + XSConstantMacro.keyStatusFrozen, + XSConstantMacro.keyStatusExpired, + ]; + final DateTime endDate = + DateTime.fromMillisecondsSinceEpoch(keyInfo.endDate ?? 0); + final DateTime now = DateTime.now(); + final bool isKeyType = keyTypes.contains(keyInfo.keyType); + final bool isKeyStatus = keyStatus.contains(keyInfo.keyStatus); + final Duration difference = endDate.difference(now); + final bool isExpirationSoon = isKeyType && difference.inDays <= 15; + final bool isShow = isKeyType && isKeyStatus || isExpirationSoon; + return isShow; + } + /// 以下为删除逻辑 void deleyLockLogicOfRoles() { if (state.lockListInfoItemEntity.isLockOwner == 1) { diff --git a/lib/main/lockMian/lockList/lockList_page.dart b/lib/main/lockMian/lockList/lockList_page.dart index ccfc714d..d97b3c0c 100755 --- a/lib/main/lockMian/lockList/lockList_page.dart +++ b/lib/main/lockMian/lockList/lockList_page.dart @@ -14,7 +14,6 @@ import 'lockListGroup_view.dart'; import 'lockList_logic.dart'; class LockListPage extends StatefulWidget { - const LockListPage({required this.lockListInfoGroupEntity, Key? key}) : super(key: key); final LockListInfoGroupEntity lockListInfoGroupEntity; @@ -229,13 +228,7 @@ class _LockListPageState extends State with RouteAware { )), SizedBox(height: 20.h), Visibility( - visible: (keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && - (keyInfo.keyStatus == - XSConstantMacro.keyStatusWaitIneffective || - keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen || - keyInfo.keyStatus == XSConstantMacro.keyStatusExpired), - // visible: true, + visible: logic.getShowType(keyInfo), child: Row( children: [ SizedBox(width: 30.w), diff --git a/lib/main/lockMian/lockList/lockList_xhj_page.dart b/lib/main/lockMian/lockList/lockList_xhj_page.dart index c86fdaaa..47d6fce9 100755 --- a/lib/main/lockMian/lockList/lockList_xhj_page.dart +++ b/lib/main/lockMian/lockList/lockList_xhj_page.dart @@ -360,14 +360,7 @@ class _LockListXHJPageState extends State with RouteAware { ], ), Visibility( - visible: (keyInfo.keyType == XSConstantMacro.keyTypeTime || - keyInfo.keyType == XSConstantMacro.keyTypeLoop) && - (keyInfo.keyStatus == - XSConstantMacro.keyStatusWaitIneffective || - keyInfo.keyStatus == - XSConstantMacro.keyStatusFrozen || - keyInfo.keyStatus == - XSConstantMacro.keyStatusExpired), + visible: logic.getShowType(keyInfo), child: Padding( padding: EdgeInsets.only(top: 5.h), child: Row( From 5a342d5715a5263285318c9464f9607114846f96 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Mon, 1 Jul 2024 18:31:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=81=E6=89=93?= =?UTF-8?q?=E5=BC=80=E8=81=94=E7=BD=91=E5=BC=80=E9=94=81=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E9=92=A5=E5=8C=99=E5=BC=80=E9=94=81=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=90=8E=E6=97=A0=E6=B3=95=E5=BC=80=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockDetail/lockDetail_page.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 400c0c2a..b49677af 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -10,6 +10,7 @@ import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_list_page.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/aliyunRealNameAuth/aliyunRealNameAuthHandle.dart'; import 'package:star_lock/tools/showCupertinoAlertView.dart'; import 'package:star_lock/tools/showTipView.dart'; @@ -1433,11 +1434,16 @@ class _LockDetailPageState extends State if (state.openLockBtnState.value == 1) { return; } + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isOpenLockNeedOnline = state.isOpenLockNeedOnline.value == 0; + if (!isOpenLockNeedOnline && !isNetWork) { + return; + } state.iSOpenLock.value = true; state.openLockBtnState.value = 1; state.animationController!.forward(); AppLog.log('点击开锁'); - if (state.isOpenLockNeedOnline.value == 0) { + if (isOpenLockNeedOnline) { // 不需要联网 state.openDoorModel = 0; AppLog.log('点击开锁 state.openDoorModel = 0 不需要联网'); From 3b9e2ea68c707f5a09d1796555df32c5efefc5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Mon, 1 Jul 2024 18:33:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9TAPDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/.DS_Store | Bin 8196 -> 8196 bytes ios/Podfile.lock | 12 +++++++++--- .../massSendElectronicKey_page.dart | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ios/.DS_Store b/ios/.DS_Store index bc9ad5a583ae69f768c560174625c50d696a5095..e746db5abd7b770f6d76fc6414db27c0dba90405 100755 GIT binary patch delta 92 zcmZp1XmOa}&nUVvU^hRb=wu#&>6=dr)H5+@iA=sAq#=@<@8Xh_lb^)Ez`*f~cfXF8 j5?oA0Sx&JDGbG)Ir+&+Ir&Kp3=9Gc42<2IrwH^h zF*!I*P7v0b>?h2{9wVQdq4ekI { action: () async { final result = await Get.toNamed(Routers.massSendLockGroupListPage, arguments: { - 'keyLimits': '1', + 'keyLimits': '2', 'lockIdList': state.lockIdList }); if (result != null && result.isNotEmpty) {