Merge remote-tracking branch 'origin/release' into release

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"

lib/main.dart

@@ -60,9 +60,9 @@ FutureOr<void> main() async {
 
 // 设置国际化信息
 Future<void> _initTranslation() async => TranslationLoader.loadTranslation(
-      zhSource: 'images/lan/lan_zh.json',
+      zhSource: 'lan/lan_zh.json',
-      enSource: 'images/lan/lan_en.json',
+      enSource: 'lan/lan_en.json',
-      keySource: 'images/lan/lan_keys.json',
+      keySource: 'lan/lan_keys.json',
     );
 
 // 设置包名服务设备信息

lib/main/lockDetail/lockSet/faceUnlock/faceUnlock_logic.dart

@@ -36,7 +36,7 @@ class FaceUnlockLogic extends BaseGetXController {
   Future<void> 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){

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 = '关闭';

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;
   }
 

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) {

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

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(
+              return nearbyLockItem('images/icon_lockGroup_item.png', state.devices[index], () {
-                  'images/icon_lockGroup_item.png', state.devices[index], () {
                 String advName = state.devices[index].advertisementData.advName;
                 state.selectLockName.value = advName;
                 logic.getServerDatetime();

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
 
@@ -259,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