sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:增加电子反锁，双重认证，双锁联动显示支持项

Browse Source
This commit is contained in:
liyi 2025-02-18 14:41:28 +08:00
parent 9682c558b7
commit b577825ff7
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart
View File

@ -151,6 +151,9 @@ class LockFeature {
this.stayWarn, this.stayWarn,
this.abnormalWarn, this.abnormalWarn,
this.isSupportBackupBattery, this.isSupportBackupBattery,
this.isElectronicAntiLock,
this.isVisualDoorBellCode,
this.isDoubleLockLinkage,
}); });
LockFeature.fromJson(Map<String, dynamic> json) { LockFeature.fromJson(Map<String, dynamic> json) {
@ -208,6 +211,9 @@ class LockFeature {
stayWarn = json['stayWarn']; stayWarn = json['stayWarn'];
abnormalWarn = json['abnormalWarn']; abnormalWarn = json['abnormalWarn'];
isSupportBackupBattery = json['isSupportBackupBattery']; isSupportBackupBattery = json['isSupportBackupBattery'];
isElectronicAntiLock = json['isElectronicAntiLock'];
isVisualDoorBellCode = json['isVisualDoorBellCode'];
isDoubleLockLinkage = json['isDoubleLockLinkage'];
} }
int? password; int? password;
@ -264,6 +270,9 @@ class LockFeature {
int? stayWarn; int? stayWarn;
int? abnormalWarn; int? abnormalWarn;
int? isSupportBackupBattery; int? isSupportBackupBattery;
int? isElectronicAntiLock;
int? isVisualDoorBellCode;
int? isDoubleLockLinkage;
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{}; final Map<String, dynamic> data = <String, dynamic>{};
@ -321,6 +330,9 @@ class LockFeature {
data['stayWarn'] = stayWarn; data['stayWarn'] = stayWarn;
data['abnormalWarn'] = abnormalWarn; data['abnormalWarn'] = abnormalWarn;
data['isSupportBackupBattery'] = isSupportBackupBattery; data['isSupportBackupBattery'] = isSupportBackupBattery;
data['isElectronicAntiLock'] = isElectronicAntiLock;
data['isVisualDoorBellCode'] = isVisualDoorBellCode;
data['isDoubleLockLinkage'] = isDoubleLockLinkage;
return data; return data;
} }
} }

49
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -322,19 +322,25 @@ class _LockSetPageState extends State<LockSetPage>
}))), }))),
//todo 电子反锁、可视门铃码国际化 //todo 电子反锁、可视门铃码国际化
// 电子反锁 // 电子反锁
Obx(() => CommonItem( Obx(() => Visibility(
leftTitel: '电子反锁'.tr, visible: state.lockFeature.value.isElectronicAntiLock == 1,
rightTitle: '', child: CommonItem(
isHaveLine: true, leftTitel: '电子反锁'.tr,
isHaveRightWidget: true, rightTitle: '',
rightWidget: _elecAntiLockSwitch())), isHaveLine: true,
isHaveRightWidget: true,
rightWidget: _elecAntiLockSwitch()),
)),
// 可视门铃码 // 可视门铃码
Obx(() => CommonItem( Obx(() => Visibility(
leftTitel: '可视门铃码'.tr, visible: state.lockFeature.value.isVisualDoorBellCode == 1,
rightTitle: '', child: CommonItem(
isHaveLine: true, leftTitel: '可视门铃码'.tr,
isHaveRightWidget: true, rightTitle: '',
rightWidget: _visualDoorbellCodeSwitch())), isHaveLine: true,
isHaveRightWidget: true,
rightWidget: _visualDoorbellCodeSwitch()),
)),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// 常开模式 // 常开模式
Obx(() => Visibility( Obx(() => Visibility(
@ -364,14 +370,17 @@ class _LockSetPageState extends State<LockSetPage>
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: _dualAuthSwitch()))), rightWidget: _dualAuthSwitch()))),
// 双锁联动 // 双锁联动
CommonItem( Visibility(
leftTitel: '双锁联动'.tr, visible: state.lockFeature.value.isDoubleLockLinkage == 1,
rightTitle: '未关联'.tr, child: CommonItem(
isHaveLine: true, leftTitel: '双锁联动'.tr,
isHaveDirection: true, rightTitle: '未关联'.tr,
action: () { isHaveLine: true,
Get.toNamed(Routers.doubleLockLinkPage); isHaveDirection: true,
}), action: () {
Get.toNamed(Routers.doubleLockLinkPage);
}),
),
// 远程开锁 // 远程开锁
Obx(() => Visibility( Obx(() => Visibility(
visible: state.lockFeature.value.remoteUnlock == 1, visible: state.lockFeature.value.remoteUnlock == 1,