From e972d81599245791a23624ad049e9c2bfa44e436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Mon, 27 Nov 2023 09:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=81=E8=AE=BE=E7=BD=AEbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkingInSet/checkingInSet_logic.dart | 1 - .../massSendLockGroupList_page.dart | 2 +- .../automaticBlocking_logic.dart | 13 +++++++++- .../automaticBlocking_page.dart | 1 + .../uploadElectricQuantity_logic.dart | 0 .../uploadElectricQuantity_state.dart | 0 .../lcokSet/lockSet/lockSet_logic.dart | 18 ++++++------- .../lockDetail/lockDetail_logic.dart | 25 +++++++++---------- .../lockDetail/lockDetail_page.dart | 1 - .../otherTypeKeyList_logic.dart | 2 -- star_lock/lib/mine/about/about_page.dart | 16 +++--------- 11 files changed, 39 insertions(+), 40 deletions(-) create mode 100644 star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart create mode 100644 star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart index ae72c6a9..8dcd727b 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_logic.dart @@ -56,7 +56,6 @@ class CheckingInSetLogic extends BaseGetXController{ ); if(entity.errorCode!.codeIsSuccessful){ state.companyName.value = state.changeNameController.text; - print("state.checkingInSetInfo.value.companyName:${state.checkingInSetInfo.value.companyName}"); Toast.show(msg: "修改成功"); } } diff --git a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart index 509fcb1f..6960fbd7 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupList_page.dart @@ -71,7 +71,7 @@ class _MassSendLockGroupListPageState extends State { SubmitBtn( btnName: '确定', onClick: () { - print('得到lockid为$selectLockIdList '); + // print('得到lockid为$selectLockIdList '); Map resultMap = {}; resultMap['selectLockIdList'] = selectLockIdList; Navigator.pop(context, resultMap); diff --git a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart b/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart index 7a9e4bf8..96bae284 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_logic.dart @@ -20,10 +20,21 @@ class AutomaticBlockingLogic extends BaseGetXController{ final AutomaticBlockingState state = AutomaticBlockingState(); void setAutoUnLock() async{ + String autoTime; + if(state.isOpen.value == false){ + autoTime = "0"; + }else{ + if(state.isCustomLockTime.value == true){ + autoTime = state.timeController.text; + }else{ + autoTime = state.autoLockTime.value; + } + } + var entity = await ApiRepository.to.setAutoUnlock( lockId: state.lockSetInfoData.value.lockId!, autoLock:state.isOpen.value == true ? 1 : 0, - autoLockSecond: int.parse(state.autoLockTime.value), + autoLockSecond: int.parse(autoTime), ); if(entity.errorCode!.codeIsSuccessful){ diff --git a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart b/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart index 4e39e717..bcb893aa 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/automaticBlocking/automaticBlocking_page.dart @@ -83,6 +83,7 @@ class _AutomaticBlockingPageState extends State { //选择事件的回调 clickCallBack: (int index, var str) { if(index != 5){ + state.isCustomLockTime.value = false; state.autoLockTime.value = str.toString(); }else{ state.isCustomLockTime.value = true; diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_logic.dart new file mode 100644 index 00000000..e69de29b diff --git a/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart b/star_lock/lib/main/lockDetail/lcokSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_state.dart new file mode 100644 index 00000000..e69de29b diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart b/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart index 4848868e..c3abf1ad 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart @@ -194,7 +194,7 @@ class LockSetLogic extends BaseGetXController { } } - // 设置自动落锁数据解析 + // 锁设置数据解析 Future _replySetSupportFunctionsWithParameters(Reply reply) async { int status = reply.data[2]; switch(status){ @@ -204,10 +204,10 @@ class LockSetLogic extends BaseGetXController { // Toast.show(msg: "操作成功");featureEnable = state.isOpenStayWarn.value == 1 ? 0 : 1; if(state.settingUpSupportFeatures == 55){ // APP开锁时是否需联网 - state.isOpenLockNeedOnline.value = state.isOpenLockNeedOnline.value == 1 ? 0 : 1; - state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline = state.isOpenLockNeedOnline.value; + // state.isOpenLockNeedOnline.value = state.isOpenLockNeedOnline.value == 1 ? 0 : 1; + // state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline = state.isOpenLockNeedOnline.value; setLockSetOpenLockNeedOnline(); - eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline!)); + // eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSetInfoData.value.lockSettingInfo!.appUnlockOnline!)); }else if(state.settingUpSupportFeatures == 56){ // 蓝牙广播 state.isOpenBlueBroadcast.value = state.isOpenBlueBroadcast.value == 1 ? 0 : 1; @@ -416,7 +416,7 @@ class LockSetLogic extends BaseGetXController { password: state.passwordTF.text, ); if (entity.errorCode!.codeIsSuccessful) { - deletLockInfoData(); + // deletLockInfoData(); blockDeletNumberCheckPasswordCallback(); // if(state.currentDeviceUUid.value.isEmpty){ @@ -500,11 +500,11 @@ class LockSetLogic extends BaseGetXController { if(entity.errorCode!.codeIsSuccessful){ eventBus.fire(RefreshLockListInfoDataEvent()); - state.isAttendance.value = (state.isAttendance.value == 1 ? 0 : 1); - state.lockSettingInfo.value.attendance = state.isAttendance.value; + state.isOpenLockNeedOnline.value = (state.isOpenLockNeedOnline.value == 1 ? 0 : 1); + state.lockSettingInfo.value.appUnlockOnline = state.isOpenLockNeedOnline.value; - eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.attendance!)); - print("state.lockSettingInfo.value.attendance:${state.lockSettingInfo.value.attendance}"); + eventBus.fire(LockSetChangeSetRefreshLockDetailWithType(0, state.lockSettingInfo.value.appUnlockOnline!)); + print("state.lockSettingInfo.value.appUnlockOnline:${state.lockSettingInfo.value.appUnlockOnline}"); Toast.show(msg: "设置成功"); } } diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 77e57442..92cf3e5a 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -57,28 +57,23 @@ class LockDetailLogic extends BaseGetXController{ // 开门数据解析 Future _replyOpenLock(Reply reply) async { - var privateKey = await Storage.getStringList(saveBluePrivateKey); - List getPrivateKeyList = changeStringListToIntList(privateKey!); - - var signKey = await Storage.getStringList(saveBlueSignKey); - List signKeyDataList = changeStringListToIntList(signKey!); - var tokenData = reply.data.sublist(2, 6); var saveStrList = changeIntListToStringList(tokenData); // print("openDoorToken:$tokenData"); Storage.setStringList(saveBlueToken, saveStrList); - // 电量 - int power = reply.data[7]; - state.electricQuantity.value = power; - int status = reply.data[6]; print("status:$status"); switch(status){ case 0x00: - //成功 + //成功 print("${reply.commandType}数据解析成功"); + + // 电量 + int power = reply.data[7]; + state.electricQuantity.value = power; + getLockRecordLastUploadDataTime(); state.lockState.value = 2; state.animationController.reset(); @@ -89,6 +84,12 @@ class LockDetailLogic extends BaseGetXController{ //无权限 print("${reply.commandType}需要鉴权"); + var privateKey = await Storage.getStringList(saveBluePrivateKey); + List getPrivateKeyList = changeStringListToIntList(privateKey!); + + var signKey = await Storage.getStringList(saveBlueSignKey); + List signKeyDataList = changeStringListToIntList(signKey!); + IoSenderManage.senderOpenLock( keyID: BlueManage().connectDeviceName, userID: await Storage.getUid(), @@ -526,10 +527,8 @@ class LockDetailLogic extends BaseGetXController{ _lockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceEvent = eventBus.on().listen((event) { if(event.type == 0){ // 0考勤 - print("event.setResult:${event.setResult}"); state.isAttendance.value = event.setResult; state.keyInfos.value.lockSetting!.attendance = event.setResult; - print("state.keyInfos.value.lockSetting!.attendance:${state.keyInfos.value.lockSetting!.attendance}"); }else if(event.type == 1){ // 1 开锁时是否需联网 state.isOpenLockNeedOnline.value = event.setResult; diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 548a9058..85dda4e1 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -274,7 +274,6 @@ class _LockDetailPageState extends State List getShowWidget() { var showWidgetArr = []; - print("pagepagepage:state.keyInfos.value.lockSetting!.attendance:${state.keyInfos.value.lockSetting!.attendance}"); // 考勤 if (state.isAttendance.value == 1) { showWidgetArr.add(bottomItem('images/main/icon_main_clockingIn.png', diff --git a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_logic.dart b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_logic.dart index 03ae5c55..6fc4b274 100644 --- a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_logic.dart +++ b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_logic.dart @@ -30,9 +30,7 @@ class OtherTypeKeyListLogic extends BaseGetXController{ void _initReplySubscription() { _replySubscription = EventBusManager().eventBus!.on().listen((reply) { // 添加指纹开始(重置锁里面所有指纹) - print("111111111111111 isDeletFingerprintData:${state.isDeletFingerprintData} isDeletICCardData:${state.isDeletICCardData}"); if((reply is SenderAddFingerprintReply) && (state.isDeletFingerprintData == true)) { - print("111111111111111"); _replyAddFingerprintBegin(reply); } diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index d7ec95e9..960de892 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -29,22 +29,14 @@ class _AbountPageState extends State { body: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - SizedBox( - height: 150.h, - ), + SizedBox(height: 150.h), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Image.asset( - "images/icon_main_1024.png", - width: 160.w, - height: 160.w, - ), - ], - ), - SizedBox( - height: 20.h, + Image.asset("images/icon_main_1024.png", width: 160.w, height: 160.w), + ] ), + SizedBox(height: 20.h), Text( "星锁 1.0.0.02(preRelease-20231124)", style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),