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] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=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 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug-xhj"
+      buildConfiguration = "Release-xhj"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart
index 2ae26de4..64d60678 100755
--- a/lib/main/lockMian/lockList/lockList_logic.dart
+++ b/lib/main/lockMian/lockList/lockList_logic.dart
@@ -41,7 +41,7 @@ class LockListLogic extends BaseGetXController {
             !(element.lockAlias?.contains(state.searchStr.value) ?? true));
       });
     }
-    AppLog.log('lockList!.length:${_groupDataList[0].lockList!.length}');
+    // AppLog.log('lockList!.length:${_groupDataList[0].lockList!.length}');
     return list;
   }
 
diff --git a/lib/main/lockMian/lockList/lockList_xhj_page.dart b/lib/main/lockMian/lockList/lockList_xhj_page.dart
index 192cae6e..4d826a24 100755
--- a/lib/main/lockMian/lockList/lockList_xhj_page.dart
+++ b/lib/main/lockMian/lockList/lockList_xhj_page.dart
@@ -126,7 +126,7 @@ class _LockListXHJPageState extends State<LockListXHJPage> 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<LockListLogic>()) {
       //设置控制器数据并刷新
-      AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
+      // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
       Get.find<LockListLogic>().setLockListInfoGroupEntity(entity);
     } else {
       //延迟加载
       Future<dynamic>.delayed(200.milliseconds, () {
         if (Get.isRegistered<LockListLogic>()) {
           //设置控制器数据并刷新
-          AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
+          // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
           Get.find<LockListLogic>().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<NearbyLockPage> 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