From fa06dc6837a98d8ed091f6bec5ab822d6ecfff9b Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Mon, 17 Jun 2024 17:16:59 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=94=81=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=8E=88=E6=9D=83=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=92=8C=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=202=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B6=88=E6=81=AF?= =?UTF-8?q?--=E9=94=81=E8=AE=BE=E7=BD=AE=E5=8F=98=E6=9B=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=8F=8A=E7=9B=B8=E5=BA=94=E9=80=BB=E8=BE=91=E5=A4=84?= =?UTF-8?q?=E7=90=86=203=EF=BC=8C=E5=BC=80=E9=94=81=E9=A1=B5-=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE-=E5=BC=80=E9=94=81=E6=97=B6=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=81=94=E7=BD=91=20=E8=AE=BE=E7=BD=AE=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E8=BF=94=E5=9B=9E=E5=BC=80=E9=94=81=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E6=9C=AA=E5=88=B7=E6=96=B0=E3=80=82=E5=8F=A6?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=92=8C=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E5=92=8C=E4=BD=BF=E7=94=A8=E6=B2=A1=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BA=86=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E3=80=82=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=204=EF=BC=8C=E4=BF=AE=E5=A4=8DbugID=EF=BC=9AID1002246?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockDetail/lockDetail_page.dart | 5 +++-- lib/tools/push/message_constant.dart | 2 ++ lib/tools/push/message_management.dart | 12 ++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 79e27ef0..360b2919 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -68,6 +68,7 @@ class _LockDetailPageState extends State /// 路由订阅 AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!); + state.isOpenLockNeedOnline.refresh(); } StreamSubscription? _lockRefreshLockDetailInfoDataEvent; @@ -777,7 +778,7 @@ class _LockDetailPageState extends State child: Image.asset('images/main/icon_lockDetail_needNetwork.png', width: 24.w, height: 20.w, - color: state.keyInfos.value.appUnlockOnline == 1 + color: state.isOpenLockNeedOnline.value == 1 ? AppColors.mainColor : AppColors.btnDisableColor), ), @@ -786,7 +787,7 @@ class _LockDetailPageState extends State '手机需联网', style: TextStyle( fontSize: 20.sp, - color: state.keyInfos.value.appUnlockOnline == 1 + color: state.isOpenLockNeedOnline.value == 1 ? AppColors.mainColor : AppColors.btnDisableColor), ), diff --git a/lib/tools/push/message_constant.dart b/lib/tools/push/message_constant.dart index c2e183fb..c81dd455 100644 --- a/lib/tools/push/message_constant.dart +++ b/lib/tools/push/message_constant.dart @@ -7,4 +7,6 @@ class MessageConstant { static const int lockReceive = 30; //收到钥匙（返回指定钥匙分组+钥匙数据〉 static const int keyReceive = 40; + //锁设置变更 + static const int lockSetChange = 50; } diff --git a/lib/tools/push/message_management.dart b/lib/tools/push/message_management.dart index 9ef49c7d..df2f6c01 100644 --- a/lib/tools/push/message_management.dart +++ b/lib/tools/push/message_management.dart @@ -71,6 +71,18 @@ class MessageManagement { final int lockId = data['lockId']; eventBus.fire(RogerThatLockInfoDataEvent(keyId: keyId, lockId: lockId)); break; + case MessageConstant.lockSetChange: + final int keyId = data['keyId']; + final int lockId = data['lockId']; + final Map extra = data['updateFieldList']; + if (extra['appUnlockOnline'] != null) { + final String appUnlockOnline = extra['appUnlockOnline']; + eventBus.fire( + LockSetChangeSetRefreshLockDetailWithType(1, appUnlockOnline)); + eventBus.fire(RefreshLockInfoDataEvent(keyId: keyId, lockId: lockId)); + } + break; + default: throw Exception('无法识别eventNo 参数：$eventNo'); }