Merge branch 'master' into release

lib/app.dart

@@ -148,7 +148,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
         // AppLog.log('App--->进入前台');
         if (Get.isRegistered<LockMainLogic>()) {
           //进入前台刷新如果存在锁列表则刷新，顺便判断 token 是否过期
-          Get.find<LockMainLogic>().getStarLockInfo();
+          Get.find<LockMainLogic>().getStarLockInfo(isUnShowLoading: true);
         }
         break;
       case AppLifecycleState.detached:

lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_logic.dart

@@ -38,7 +38,7 @@ class AppUnlockNeedMobileNetworkingLockLogic extends BaseGetXController {
 
       //刷新锁列表，更新锁详情--手机需联网标识
       if (Get.isRegistered<LockMainLogic>()) {
-        Get.find<LockMainLogic>().getStarLockInfo();
+        Get.find<LockMainLogic>().getStarLockInfo(isUnShowLoading: true);
       }
     }
   }

pubspec.yaml

@@ -76,7 +76,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 1.0.66+2024061802：xhj 线上环境，提交测试:回归 bug
 # 1.0.67+2024062501：xhj 线上环境，提交测试:回归 测试部门bug
 
-version: 1.0.67+2024062501
+version: 1.0.68+2024062601
 
 environment:
   sdk: '>=2.12.0 <3.0.0'