From 19c4a881e7f3ce81265a2dbac73a9c5e3b529727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Fri, 3 May 2024 11:47:10 +0800 Subject: [PATCH] =?UTF-8?q?App=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=A4=87=E7=94=A8=E7=94=B5=E6=B1=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/addCardType/addCardType_logic.dart | 3 +++ .../lockMian/lockMain/lockMain_logic.dart | 1 - .../addLock/nearbyLock/nearbyLock_logic.dart | 22 +++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart index c5a0a42b..d19f57fe 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_logic.dart @@ -1,5 +1,6 @@ import 'package:get/get.dart'; +import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../appRouters.dart'; @@ -48,6 +49,8 @@ class AddCardTypeLogic extends BaseGetXController{ showToast("失效时间要大于生效时间".tr); return; } + AppLog.log("state.timeLimitBeginTime.value:${state.timeLimitBeginTime.value} startDate:$startDate"); + AppLog.log("state.timeLimitEndTime.value:${state.timeLimitEndTime.value} endDate:$endDate"); } else if (state.selectType.value == "2") { if (state.cycleBeginTime.value.isEmpty) { showToast("请选择有效期".tr); diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart index 90e0b474..f86bd6fc 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -54,7 +54,6 @@ class LockMainLogic extends BaseGetXController { /// 获取联网类型 void getConnectType() async { var connectResult = await (Connectivity().checkConnectivity()); - if (connectResult == ConnectivityResult.mobile) { // _netType = "4G"; state.networkConnectionStatus.value = 1; diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart index 87269f89..05cd0e47 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart @@ -140,7 +140,7 @@ class NearbyLockLogic extends BaseGetXController { var vendorStr = utf8String(vendor); state.lockInfo["vendor"] = vendorStr; // state.lockInfo["vendor"] = "XL"; - AppLog.log("厂商名称 vendor:$vendor vendorStr:$vendorStr reply.data:${reply.data}"); + AppLog.log("厂商名称 vendorStr:$vendorStr"); // 锁设备类型 var product = reply.data[23]; @@ -191,17 +191,17 @@ class NearbyLockLogic extends BaseGetXController { AppLog.log("电池剩余电量 battRemCap:$battRemCap"); // 备用电池剩余电量 - var battRemCapStandby = reply.data[133]; - state.lockInfo["electricQuantityStandby"] = battRemCapStandby; - AppLog.log("电池剩余电量 battRemCap:$battRemCap"); + // var battRemCapStandby = reply.data[133]; + // state.lockInfo["electricQuantityStandby"] = battRemCapStandby; + // AppLog.log("电池剩余电量 battRemCap:$battRemCap"); // 重置次数 - var restoreCounter = reply.data.sublist(134, 136); + var restoreCounter = reply.data.sublist(133, 135); state.lockInfo["restoreCount"] = restoreCounter[0] * 256 + restoreCounter[1]; AppLog.log("重置次数 restoreCounter:${restoreCounter[0] * 256 + restoreCounter[1]}"); // 重置时间 - var restoreDate = reply.data.sublist(136, 140); + var restoreDate = reply.data.sublist(135, 139); int restoreDateValue = ((0xff & restoreDate[(0)]) << 24 | (0xff & restoreDate[1]) << 16 | (0xff & restoreDate[2]) << 8 | @@ -211,13 +211,13 @@ class NearbyLockLogic extends BaseGetXController { AppLog.log("重置时间 restoreDateValue:$restoreDateValue"); // 主控芯片型号 - var icPartNo = reply.data.sublist(140, 150); + var icPartNo = reply.data.sublist(139, 149); var icPartNoStr = utf8String(icPartNo); state.lockInfo["icPartNo"] = icPartNoStr; AppLog.log("主控芯片型号 icPartNoStr:$icPartNoStr"); // 有效时间 - var indate = reply.data.sublist(150, 154); + var indate = reply.data.sublist(149, 153); int indateValue = ((0xff & indate[(0)]) << 24 | (0xff & indate[1]) << 16 | (0xff & indate[2]) << 8 | @@ -227,14 +227,14 @@ class NearbyLockLogic extends BaseGetXController { AppLog.log("有效时间 indateValue:$indateValue"); // mac地址 - var macAddress = reply.data.sublist(154, 174); + var macAddress = reply.data.sublist(153, 173); var macAddressStr = utf8String(macAddress); state.lockInfo["mac"] = macAddressStr; AppLog.log("mac地址 macAddressStr:$macAddressStr"); - var index = 174; + var index = 173; // 锁特征值字符串长度 - var featureValueLength = reply.data[174]; + var featureValueLength = reply.data[index]; AppLog.log("锁特征值字符串长度 featureValueLength:$featureValueLength"); // 锁特征值说明(本机能支持的功能)