From 74e81c004fdc56f1d308c1439ad14c20621bb186 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Thu, 18 Apr 2024 15:46:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=81=E8=AE=BE=E7=BD=AE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E7=8C=AB=E7=9C=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockSet/lockSet/lockSetInfo_entity.dart | 4 ++++ .../lockDetail/lockSet/lockSet/lockSet_page.dart | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart index e427a2ea..e9c62300 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart @@ -137,6 +137,7 @@ class LockFeature { int? wirelessKeyboard; int? lightingTime; int? passageMode; + int? isSupportCatEye; int? hotelLockCardSystem; int? appUnlockOnline; int? bluetoothBroadcast; @@ -191,6 +192,7 @@ class LockFeature { this.wirelessKeyboard, this.lightingTime, this.passageMode, + this.isSupportCatEye, this.hotelLockCardSystem, this.appUnlockOnline, this.bluetoothBroadcast, @@ -246,6 +248,7 @@ class LockFeature { wirelessKeyboard = json['wirelessKeyboard']; lightingTime = json['lightingTime']; passageMode = json['passageMode']; + isSupportCatEye = json['isSupportCatEye']; hotelLockCardSystem = json['hotelLockCardSystem']; appUnlockOnline = json['appUnlockOnline']; bluetoothBroadcast = json['bluetoothBroadcast']; @@ -302,6 +305,7 @@ class LockFeature { data['wirelessKeyboard'] = wirelessKeyboard; data['lightingTime'] = lightingTime; data['passageMode'] = passageMode; + data['isSupportCatEye'] = isSupportCatEye; data['hotelLockCardSystem'] = hotelLockCardSystem; data['appUnlockOnline'] = appUnlockOnline; data['bluetoothBroadcast'] = bluetoothBroadcast; diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index c5ab9fdb..646abc06 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -377,8 +377,8 @@ class _LockSetPageState extends State with RouteAware { }); })), //猫眼设置 - Visibility( - visible: true, + Obx(() => Visibility( + visible: state.lockFeature.value.isSupportCatEye == 1 ? true : false, child: CommonItem( leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr, rightTitle: "", @@ -388,7 +388,7 @@ class _LockSetPageState extends State with RouteAware { Get.toNamed(Routers.catEyeSetPage, arguments: { 'lockSetInfoData': state.lockSetInfoData.value }); - })), + }))), // Obx(() => //自动亮屏已包括至面容开锁模块 // Visibility( @@ -644,11 +644,10 @@ class _LockSetPageState extends State with RouteAware { logic.openCheckingInData((checkingInInfoDataEntity) { if (checkingInInfoDataEntity.data!.companyId == 0) { // logic.showCupertinoAlertDialog(context); - ShowTipView().showIosTipWithContentDialog("创建公司后,考勤功能才能使用".tr, (){ + ShowTipView().showIosTipWithContentDialog("创建公司后,考勤功能才能使用".tr, () { // 删除锁 - Get.toNamed(Routers.checkInCreatCompanyPage, arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); + Get.toNamed(Routers.checkInCreatCompanyPage, + arguments: {'lockSetInfoData': state.lockSetInfoData.value}); }); } else { logic.setLockSetGeneralSetting(); From f8efe064124fe50eb1ae51fd389801e37adccba5 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Thu, 18 Apr 2024 16:01:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=8E=82=E5=95=86=E5=90=8D=E7=A7=B0=E5=86=99=E6=AD=BB=E4=B8=BA?= =?UTF-8?q?--XL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addLock/nearbyLock/nearbyLock_logic.dart | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart index f76d56d6..d618407b 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart @@ -20,12 +20,13 @@ class NearbyLockLogic extends BaseGetXController { final NearbyLockState state = NearbyLockState(); // 点击连接设备 - void connect(String deviceName){ + void connect(String deviceName) { showEasyLoading(); - BlueManage().bludSendData(deviceName, (BluetoothConnectionState state) async { + BlueManage().bludSendData(deviceName, + (BluetoothConnectionState state) async { if (state == BluetoothConnectionState.connected) { IoSenderManage.getPublicKey(lockId: deviceName); - }else if (state == BluetoothConnectionState.disconnected) { + } else if (state == BluetoothConnectionState.disconnected) { dismissEasyLoading(); } }, isAddEquipment: true); @@ -34,7 +35,8 @@ class NearbyLockLogic extends BaseGetXController { // 获取解析后的数据 late StreamSubscription _replySubscription; void _initReplySubscription() { - _replySubscription = EventBusManager().eventBus!.on().listen((reply) { + _replySubscription = + EventBusManager().eventBus!.on().listen((reply) { if (reply is GetPublicKeyReply) { _replyGetPublicKey(reply); } @@ -141,8 +143,8 @@ class NearbyLockLogic extends BaseGetXController { // 厂商名称 var vendor = reply.data.sublist(3, 23); var vendorStr = utf8String(vendor); - // state.lockInfo["vendor"] = vendorStr; - state.lockInfo["vendor"] = "XL"; + state.lockInfo["vendor"] = vendorStr; + // state.lockInfo["vendor"] = "XL"; Get.log("vendor:$vendor vendorStr:$vendorStr reply.data:${reply.data}"); // 锁设备类型 @@ -173,7 +175,8 @@ class NearbyLockLogic extends BaseGetXController { var serialNum0Str = utf8String(serialNum0); state.lockInfo["serialNum0"] = serialNum0Str; // state.lockInfo["serialNum0"] = "${DateTime.now().millisecondsSinceEpoch ~/ 10}"; - Get.log("serialNum0Str:$serialNum0Str serialNum0Str:${serialNum0Str.length}"); + Get.log( + "serialNum0Str:$serialNum0Str serialNum0Str:${serialNum0Str.length}"); // 成品商序列号 var serialNum1 = reply.data.sublist(100, 116); @@ -236,11 +239,12 @@ class NearbyLockLogic extends BaseGetXController { // 锁特征值说明(本机能支持的功能) // 获取到锁给的字符数组 var featureNetxLength = index + featureValueLength + 1; - if(reply.data.length < featureNetxLength){ + if (reply.data.length < featureNetxLength) { showToast("锁数据异常，请重试"); return; } - var featureValue = reply.data.sublist(index + 1, index + featureValueLength + 1); + var featureValue = + reply.data.sublist(index + 1, index + featureValueLength + 1); String featureValueStr = asciiString(featureValue); state.featureValue = featureValueStr; // List allFeatureValueTwoList = charListChangeIntList(featureValue); @@ -251,11 +255,12 @@ class NearbyLockLogic extends BaseGetXController { var featureEnValLength = reply.data[index]; // 使能锁特征值说明(本机启用的功能) var featureEnNextLength = index + featureEnValLength + 1; - if(reply.data.length < featureEnNextLength){ + if (reply.data.length < featureEnNextLength) { showToast("锁数据异常，请重试"); return; } - var featureEnVal = reply.data.sublist(index + 1, index + featureEnValLength + 1); + var featureEnVal = + reply.data.sublist(index + 1, index + featureEnValLength + 1); String featureEnValStr = asciiString(featureEnVal); state.featureSettingValue = featureEnValStr; // List allFeatureEnValTwoList = charListChangeIntList(featureEnVal); @@ -317,7 +322,8 @@ class NearbyLockLogic extends BaseGetXController { Future _getStarLockStatus() async { // print("connectDeviceMacAddress:${BlueManage().connectDeviceMacAddress} connectDeviceName:${BlueManage().connectDeviceName}"); // 进来之后首先连接 - BlueManage().bludSendData(BlueManage().connectDeviceName, (BluetoothConnectionState state) async { + BlueManage().bludSendData(BlueManage().connectDeviceName, + (BluetoothConnectionState state) async { if (state == BluetoothConnectionState.connected) { dismissEasyLoading(); var privateKey = await Storage.getStringList(saveBluePrivateKey); @@ -351,19 +357,23 @@ class NearbyLockLogic extends BaseGetXController { // }); // } - void startScanBlueList(){ - BlueManage().startScan(2000, (List list){ + void startScanBlueList() { + BlueManage().startScan(2000, (List list) { state.devices.clear(); for (int i = 0; i < list.length; i++) { ScanResult device = list[i]; - if (((device.advertisementData.serviceUuids.isNotEmpty ? device.advertisementData.serviceUuids[0] : "").toString()[31] != "1")) { + if (((device.advertisementData.serviceUuids.isNotEmpty + ? device.advertisementData.serviceUuids[0] + : "") + .toString()[31] != + "1")) { state.devices.add(list[i]); } } }); } - void stopScanBlueList(){ + void stopScanBlueList() { BlueManage().disconnect(); BlueManage().stopScan(); }