From d36f170889ea4432b3eb9686d9fc80f629f69a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 16 Apr 2024 18:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 2 ++ star_lock/images/lan/lan_keys.json | 2 ++ star_lock/images/lan/lan_zh.json | 2 ++ .../markedHouseState_logic.dart | 3 +- .../lockSet/motorPower/motorPower_logic.dart | 29 +++++++-------- .../normallyOpenMode_logic.dart | 36 ++++++++----------- .../normallyOpenMode_page.dart | 8 ++--- 7 files changed, 36 insertions(+), 46 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 40fea4fd..013187ce 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -685,6 +685,8 @@ "近距离": "Short distance", "锁时间更新成功": "Lock time update success", "锁用户": "Lock user", + "请选择常开日期": "Please select the open date", + "结束时间不能小于开始时间哦": "The end time cannot be less than the start time", "相机": "camera", "相册": "photos", diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index b44fa73b..c66f61df 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -684,6 +684,8 @@ "近距离": "近距离", "锁时间更新成功": "锁时间更新成功", "锁用户": "锁用户", + "请选择常开日期": "请选择常开日期", + "结束时间不能小于开始时间哦": "结束时间不能小于开始时间哦", "相机": "相机", "相册": "相册", diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 63c2fc7d..a271abe9 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -686,6 +686,8 @@ "近距离": "近距离", "锁时间更新成功": "锁时间更新成功", "锁用户": "锁用户", + "请选择常开日期": "请选择常开日期", + "结束时间不能小于开始时间哦": "结束时间不能小于开始时间哦", "相机": "相机", "相册": "相册", diff --git a/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart index fa871e63..7e1fb1f0 100644 --- a/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/markedHouseState/markedHouseState_logic.dart @@ -1,4 +1,5 @@ +import 'package:get/get.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../network/api_repository.dart'; @@ -19,7 +20,7 @@ class MarkedHouseStateLogic extends BaseGetXController{ state.lockSetInfoData.value.lockStatus!.roomStatus = state.roomStatus.value; eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); - showToast("操作成功"); + showToast("操作成功".tr); }else if(entity.errorCode! == 1){ // 跳转到高级功能界面 需要开通高级功能 diff --git a/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart index d4beaa98..7d5a3b28 100644 --- a/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/motorPower/motorPower_logic.dart @@ -4,6 +4,7 @@ import 'dart:async'; // import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:get/get.dart'; import '../../../../blue/blue_manage.dart'; import '../../../../blue/io_protocol/io_setSupportFunctionsNoParameters.dart'; @@ -30,7 +31,7 @@ class MotorPowerLogic extends BaseGetXController { state.lockSetInfoData.value.lockSettingInfo!.openDirectionValue = state.motorTorsion.value; eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value)); - showToast("操作成功"); + showToast("操作成功".tr); } } @@ -82,29 +83,25 @@ class MotorPowerLogic extends BaseGetXController { int status = reply.data[2]; switch(status){ case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); + //成功 + Get.log("${reply.commandType}数据解析成功"); _setLockSetGeneralSetting(); break; case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - + //无权限 + Get.log("${reply.commandType}需要鉴权"); break; case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - + //无权限 + Get.log("${reply.commandType}用户无权限"); break; case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - + // 权限校验错误 + Get.log("${reply.commandType}权限校验错误"); break; default: - //失败 - print("${reply.commandType}失败"); - + //失败 + Get.log("${reply.commandType}失败"); break; } } @@ -166,7 +163,6 @@ class MotorPowerLogic extends BaseGetXController { void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); _initReplySubscription(); } @@ -175,7 +171,6 @@ class MotorPowerLogic extends BaseGetXController { void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); _readSupportFunctionsNoParameters(); } diff --git a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart index c8ecb09a..1ea1c686 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_logic.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:get/get.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../../blue/blue_manage.dart'; @@ -21,12 +22,12 @@ class NormallyOpenModeLogic extends BaseGetXController{ // 配置锁的常开模式设置 void configPassageMode() async{ if(state.weekDays.value.isEmpty){ - showToast("请选择常开日期"); + showToast("请选择常开日期".tr); return; } if(state.endTimeMinute.value < state.beginTimeMinute.value){ - showToast("结束时间不能小于开始时间哦"); + showToast("结束时间不能小于开始时间哦".tr); return; } @@ -46,7 +47,7 @@ class NormallyOpenModeLogic extends BaseGetXController{ passageModeConfig: passageModeConfig, ); if(entity.errorCode!.codeIsSuccessful){ - showToast("操作成功", something: (){ + showToast("操作成功".tr, something: (){ eventBus.fire(RefreshLockListInfoDataEvent()); state.lockSetInfoData.value.lockSettingInfo!.passageMode = state.isOpenNormallyOpenMode.value == true ? 1:0; @@ -109,32 +110,28 @@ class NormallyOpenModeLogic extends BaseGetXController{ int status = reply.data[2]; switch(status){ case 0x00: - //成功 - print("${reply.commandType}数据解析成功"); + //成功 + Get.log("${reply.commandType}数据解析成功"); state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); configPassageMode(); break; case 0x06: - //无权限 - print("${reply.commandType}需要鉴权"); - + //无权限 + Get.log("${reply.commandType}需要鉴权"); break; case 0x07: - //无权限 - print("${reply.commandType}用户无权限"); - + //无权限 + Get.log("${reply.commandType}用户无权限"); break; case 0x09: - // 权限校验错误 - print("${reply.commandType}权限校验错误"); - + // 权限校验错误 + Get.log("${reply.commandType}权限校验错误"); break; default: - //失败 - print("${reply.commandType}失败"); - + //失败 + Get.log("${reply.commandType}失败"); break; } } @@ -167,7 +164,6 @@ class NormallyOpenModeLogic extends BaseGetXController{ int index = day % 7; // 将周日的索引转换为 0 weekStr = '${weekStr.substring(0, index)}1${weekStr.substring(index + 1)}'; } - // print("weekStrweekStrweekStr:$weekStr"); int number = int.parse(weekStr, radix: 2); List list = []; @@ -187,12 +183,10 @@ class NormallyOpenModeLogic extends BaseGetXController{ int end2 = endTime % 256; list.add(end1); list.add(end2); - // list.add(state.endTimeMinute.value); list.add(state.isAllDay.value == 1 ? 1:0); list.add(number); list.add(0); - // print("listlistlistlist:$list"); IoSenderManage.setSupportFunctionsWithParametersCommand( keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), @@ -219,7 +213,6 @@ class NormallyOpenModeLogic extends BaseGetXController{ void onReady() { // TODO: implement onReady super.onReady(); - print("onReady()"); _initReplySubscription(); } @@ -228,7 +221,6 @@ class NormallyOpenModeLogic extends BaseGetXController{ void onInit() { // TODO: implement onInit super.onInit(); - print("onInit()"); // _readSupportFunctionsWithParameters(); } diff --git a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart index fd488b7e..5d39c337 100644 --- a/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/normallyOpenMode/normallyOpenMode_page.dart @@ -341,14 +341,14 @@ class _NormallyOpenModePageState extends State with RouteA // TODO: implement didChangeDependencies super.didChangeDependencies(); - /// 路由订阅 + // 路由订阅 AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!); } @override void dispose() { // TODO: implement dispose - /// 取消路由订阅 + // 取消路由订阅 AppRouteObserver().routeObserver.unsubscribe(this); super.dispose(); } @@ -357,7 +357,6 @@ class _NormallyOpenModePageState extends State with RouteA @override void didPush() { super.didPush(); - print("lockSet===didPush"); state.ifCurrentScreen.value = true; } @@ -365,7 +364,6 @@ class _NormallyOpenModePageState extends State with RouteA @override void didPop() { super.didPop(); - print("lockSet===didPop"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); BlueManage().stopScan(); @@ -377,7 +375,6 @@ class _NormallyOpenModePageState extends State with RouteA @override void didPopNext() { super.didPopNext(); - print("lockSet===didPopNext"); state.ifCurrentScreen.value = true; } @@ -385,7 +382,6 @@ class _NormallyOpenModePageState extends State with RouteA @override void didPushNext() { super.didPushNext(); - print("lockSet===didPushNext"); logic.cancelBlueConnetctToastTimer(); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); BlueManage().stopScan();