From 86f98e25e2fbab49c043f41c4d723ae29d9b20a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Wed, 24 Jul 2024 17:33:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8C=85=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/xcshareddata/xcschemes/xhj.xcscheme | 2 +- lib/main/lockMian/lockList/lockList_logic.dart | 2 +- lib/main/lockMian/lockList/lockList_xhj_page.dart | 2 +- lib/main/lockMian/lockMain/lockMain_logic.dart | 7 ++++--- lib/mine/addLock/nearbyLock/nearbyLock_page.dart | 3 +-- pubspec.yaml | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/xhj.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/xhj.xcscheme index 2767a19f..9cae57e2 100755 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/xhj.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/xhj.xcscheme @@ -24,7 +24,7 @@ with RouteAware { ), Expanded( child: Obx(() { - AppLog.log('logic.groupDataList[0].lockList!.length:${logic.groupDataList[0].lockList!.length}'); + // AppLog.log('logic.groupDataList[0].lockList!.length:${logic.groupDataList[0].lockList!.length}'); return ListView.builder( itemCount: logic.groupDataList.length ?? 0, itemBuilder: (BuildContext context, int index) { diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 28c01899..7c59b8c5 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -40,6 +40,7 @@ class LockMainLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { AppLog.log('请求列表调用 loadMainDataLogic'); await loadMainDataLogic(entity.data!); + updateZoneOffsetsAndLanguages(); } return entity; } @@ -76,14 +77,14 @@ class LockMainLogic extends BaseGetXController { //检测控制器是否存在 if (Get.isRegistered()) { //设置控制器数据并刷新 - AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity'); + // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity'); Get.find().setLockListInfoGroupEntity(entity); } else { //延迟加载 Future.delayed(200.milliseconds, () { if (Get.isRegistered()) { //设置控制器数据并刷新 - AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity'); + // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity'); Get.find().setLockListInfoGroupEntity(entity); } }); @@ -301,7 +302,7 @@ class LockMainLogic extends BaseGetXController { connectListener(); // AppLog.log('onInit() updateZoneOffsetsAndLanguages'); - updateZoneOffsetsAndLanguages(); + // updateZoneOffsetsAndLanguages(); } @override diff --git a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index 25af5c88..32d252ca 100755 --- a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -66,8 +66,7 @@ class _NearbyLockPageState extends State with RouteAware { child: ListView.separated( itemCount: state.devices.length, itemBuilder: (c, index) { - return nearbyLockItem( - 'images/icon_lockGroup_item.png', state.devices[index], () { + return nearbyLockItem('images/icon_lockGroup_item.png', state.devices[index], () { String advName = state.devices[index].advertisementData.advName; state.selectLockName.value = advName; logic.getServerDatetime(); diff --git a/pubspec.yaml b/pubspec.yaml index a2f8c037..f7dfdfcc 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -77,7 +77,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.67+2024062501：xhj 线上环境，提交测试:回归 测试部门bug # 1.0.69+2024070301：xhj 线上环境，提交测试:周常 bug 修复 # 1.0.69+2024070302：xhj 线上环境，提交测试:周常 bug 修复 -# 1.0.70+2024072401：xhj 线上环境，提交测试:周常 bug 修复 +# 1.0.70+2024072401：xhj 线上环境，提交测试:回归 bug +# 1.0.70+2024072402：xhj 线上环境，提交测试:回归 bug version: 1.0.70+2024072402 From 8d6276e22f94d5b01e7626eee862a35409b6f570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Wed, 24 Jul 2024 18:12:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E5=8F=98lan=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {images/lan => lan}/lan_en.json | 0 {images/lan => lan}/lan_keys.json | 0 {images/lan => lan}/lan_zh.json | 0 lib/main.dart | 6 +++--- pubspec.yaml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {images/lan => lan}/lan_en.json (100%) rename {images/lan => lan}/lan_keys.json (100%) rename {images/lan => lan}/lan_zh.json (100%) diff --git a/images/lan/lan_en.json b/lan/lan_en.json similarity index 100% rename from images/lan/lan_en.json rename to lan/lan_en.json diff --git a/images/lan/lan_keys.json b/lan/lan_keys.json similarity index 100% rename from images/lan/lan_keys.json rename to lan/lan_keys.json diff --git a/images/lan/lan_zh.json b/lan/lan_zh.json similarity index 100% rename from images/lan/lan_zh.json rename to lan/lan_zh.json diff --git a/lib/main.dart b/lib/main.dart index ef02f5bc..f25dbcfd 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -60,9 +60,9 @@ FutureOr main() async { // 设置国际化信息 Future _initTranslation() async => TranslationLoader.loadTranslation( - zhSource: 'images/lan/lan_zh.json', - enSource: 'images/lan/lan_en.json', - keySource: 'images/lan/lan_keys.json', + zhSource: 'lan/lan_zh.json', + enSource: 'lan/lan_en.json', + keySource: 'lan/lan_keys.json', ); // 设置包名服务设备信息 diff --git a/pubspec.yaml b/pubspec.yaml index f7dfdfcc..3af6170d 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -260,10 +260,10 @@ flutter: - images/ - images/tabbar/ - images/main/ - - images/lan/ - images/mine/ - images/lockType/ - assets/ + - lan/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware From fbbefab330464f13f4a0eb3114f10598e777a699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Thu, 25 Jul 2024 10:38:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=A2=E5=AE=B9?= =?UTF-8?q?=E5=BC=80=E9=94=81=E8=AE=BE=E7=BD=AE=E8=BF=91=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E8=B7=9F=E8=BF=9C=E8=B7=9D=E7=A6=BB=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart | 4 ++-- lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart b/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart index 1f065db9..0d1b1b44 100755 --- a/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart +++ b/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart @@ -36,7 +36,7 @@ class FaceUnlockLogic extends BaseGetXController { Future updateFaceSenseDistance() async { int faceInductionDistance = 0; if(state.senseDistance.value == '远距离'.tr){ - faceInductionDistance = 1; + faceInductionDistance = 3; } if(state.senseDistance.value == '中距离'.tr){ @@ -44,7 +44,7 @@ class FaceUnlockLogic extends BaseGetXController { } if(state.senseDistance.value == '近距离'.tr){ - faceInductionDistance = 3; + faceInductionDistance = 1; } if(state.senseDistance.value == '关闭'.tr){ diff --git a/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart b/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart index fb959b4b..3dc43c85 100755 --- a/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart +++ b/lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_state.dart @@ -18,13 +18,13 @@ class FaceUnlockState { switch(lockSetInfoData.value.lockSettingInfo!.faceInductionDistance!){ case 1: - senseDistance.value = '远距离'; + senseDistance.value = '近距离'; break; case 2: senseDistance.value = '中距离'; break; case 3: - senseDistance.value = '近距离'; + senseDistance.value = '远距离'; break; case 0: senseDistance.value = '关闭';