From b577825ff7c571c91b65520adf7ea2cc2ee5f4c2 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 18 Feb 2025 14:41:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=8F=8D=E9=94=81=EF=BC=8C=E5=8F=8C=E9=87=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=EF=BC=8C=E5=8F=8C=E9=94=81=E8=81=94=E5=8A=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockSet/lockSet/lockSetInfo_entity.dart | 12 +++++ .../lockSet/lockSet/lockSet_page.dart | 49 +++++++++++-------- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart index 8e1d29d2..d5f5b60d 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart @@ -151,6 +151,9 @@ class LockFeature { this.stayWarn, this.abnormalWarn, this.isSupportBackupBattery, + this.isElectronicAntiLock, + this.isVisualDoorBellCode, + this.isDoubleLockLinkage, }); LockFeature.fromJson(Map json) { @@ -208,6 +211,9 @@ class LockFeature { stayWarn = json['stayWarn']; abnormalWarn = json['abnormalWarn']; isSupportBackupBattery = json['isSupportBackupBattery']; + isElectronicAntiLock = json['isElectronicAntiLock']; + isVisualDoorBellCode = json['isVisualDoorBellCode']; + isDoubleLockLinkage = json['isDoubleLockLinkage']; } int? password; @@ -264,6 +270,9 @@ class LockFeature { int? stayWarn; int? abnormalWarn; int? isSupportBackupBattery; + int? isElectronicAntiLock; + int? isVisualDoorBellCode; + int? isDoubleLockLinkage; Map toJson() { final Map data = {}; @@ -321,6 +330,9 @@ class LockFeature { data['stayWarn'] = stayWarn; data['abnormalWarn'] = abnormalWarn; data['isSupportBackupBattery'] = isSupportBackupBattery; + data['isElectronicAntiLock'] = isElectronicAntiLock; + data['isVisualDoorBellCode'] = isVisualDoorBellCode; + data['isDoubleLockLinkage'] = isDoubleLockLinkage; return data; } } diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index 83fada97..dbea2c40 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -322,19 +322,25 @@ class _LockSetPageState extends State }))), //todo 电子反锁、可视门铃码国际化 // 电子反锁 - Obx(() => CommonItem( - leftTitel: '电子反锁'.tr, - rightTitle: '', - isHaveLine: true, - isHaveRightWidget: true, - rightWidget: _elecAntiLockSwitch())), + Obx(() => Visibility( + visible: state.lockFeature.value.isElectronicAntiLock == 1, + child: CommonItem( + leftTitel: '电子反锁'.tr, + rightTitle: '', + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: _elecAntiLockSwitch()), + )), // 可视门铃码 - Obx(() => CommonItem( - leftTitel: '可视门铃码'.tr, - rightTitle: '', - isHaveLine: true, - isHaveRightWidget: true, - rightWidget: _visualDoorbellCodeSwitch())), + Obx(() => Visibility( + visible: state.lockFeature.value.isVisualDoorBellCode == 1, + child: CommonItem( + leftTitel: '可视门铃码'.tr, + rightTitle: '', + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: _visualDoorbellCodeSwitch()), + )), SizedBox(height: 10.h), // 常开模式 Obx(() => Visibility( @@ -364,14 +370,17 @@ class _LockSetPageState extends State isHaveRightWidget: true, rightWidget: _dualAuthSwitch()))), // 双锁联动 - CommonItem( - leftTitel: '双锁联动'.tr, - rightTitle: '未关联'.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.doubleLockLinkPage); - }), + Visibility( + visible: state.lockFeature.value.isDoubleLockLinkage == 1, + child: CommonItem( + leftTitel: '双锁联动'.tr, + rightTitle: '未关联'.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.doubleLockLinkPage); + }), + ), // 远程开锁 Obx(() => Visibility( visible: state.lockFeature.value.remoteUnlock == 1,