diff --git a/lib/main/lockMian/lockList/lockList_page.dart b/lib/main/lockMian/lockList/lockList_page.dart
index 53717840..ccfc714d 100755
--- a/lib/main/lockMian/lockList/lockList_page.dart
+++ b/lib/main/lockMian/lockList/lockList_page.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/flavors.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_state.dart';
 
 import '../../../appRouters.dart';
diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart
index 3be70607..0171aedb 100755
--- a/lib/main/lockMian/lockMain/lockMain_page.dart
+++ b/lib/main/lockMian/lockMain/lockMain_page.dart
@@ -44,13 +44,13 @@ class _StarLockMainPageState extends State<StarLockMainPage>
     LockListInfoGroupEntity? lockListInfoGroupEntity =
         await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
-      logic.loadMainDataLogic(lockListInfoGroupEntity);
+      await logic.loadMainDataLogic(lockListInfoGroupEntity);
       setState(() {});
     }
     lockListInfoGroupEntity =
         (await logic.getStarLockInfo(isUnShowLoading: isUnShowLoading)).data;
     if (lockListInfoGroupEntity != null) {
-      logic.loadMainDataLogic(lockListInfoGroupEntity);
+      await logic.loadMainDataLogic(lockListInfoGroupEntity);
       setState(() {});
     }
     if (clearScanDevices) {
@@ -62,7 +62,7 @@ class _StarLockMainPageState extends State<StarLockMainPage>
   void initState() {
     super.initState();
     logic.pageNo = 1;
-    getHttpData();
+    getHttpData(isUnShowLoading:true,);
     _initLoadDataAction();
   }
 
diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
index 55aefff1..87232bd4 100755
--- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
+++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
@@ -1,7 +1,4 @@
-import 'dart:async';
-import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_colors.dart';
@@ -9,13 +6,8 @@ import 'package:star_lock/baseWidget.dart';
 import 'package:star_lock/main/lockMian/lockMain/lockMain_page.dart';
 import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart';
 import 'package:star_lock/mine/mall/lockMall_page.dart';
-import 'package:star_lock/mine/message/messageList/messageList_page.dart';
 import 'package:star_lock/mine/message/messageList/messageList_xhj_page.dart';
-import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart';
 import 'package:star_lock/mine/mineSet/mineSet/mineSet_page.dart';
-import 'package:star_lock/tools/noData.dart';
-import 'package:star_lock/tools/submitBtn.dart';
-import 'package:star_lock/translations/trans_lib.dart';
 
 class StarLockMainXHJPage extends StatefulWidget {
   const StarLockMainXHJPage({Key? key}) : super(key: key);
@@ -26,7 +18,7 @@ class StarLockMainXHJPage extends StatefulWidget {
 
 class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
     with BaseWidget {
-  PageController _pageController = PageController();
+  final PageController _pageController = PageController();
 
   @override
   void initState() {
diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart
index 12eff33d..2f4688d9 100755
--- a/lib/network/api_provider.dart
+++ b/lib/network/api_provider.dart
@@ -446,7 +446,7 @@ class ApiProvider extends BaseProvider {
 
   // 获取Wifi锁服务器
   Future<Response> getWifiLockServiceIpAndPort() =>
-      post(getWifiServiceIpURL.toUrl, jsonEncode({}));
+      post(getWifiServiceIpURL.toUrl, jsonEncode({}), isUnShowLoading: true);
 
   Future<Response> passwordKeyList(String keyStatus, String lockId,
           String pageNo, String pageSize, String searchStr) =>
@@ -1605,8 +1605,7 @@ class ApiProvider extends BaseProvider {
           int endTime,
           int remoteUnlockSwitch,
           int keyRight,
-          bool isShowNetworkErrorMsg
-      ) =>
+          bool isShowNetworkErrorMsg) =>
       post(
           batchSendKeyURL.toUrl,
           jsonEncode({
@@ -1624,8 +1623,7 @@ class ApiProvider extends BaseProvider {
             'remoteUnlockSwitch': remoteUnlockSwitch,
             'keyRight': keyRight,
           }),
-          isShowNetworkErrorMsg: isShowNetworkErrorMsg
-      );
+          isShowNetworkErrorMsg: isShowNetworkErrorMsg);
 
   Future<Response> addAuthorizedAdmin(
           String createUser,
@@ -1669,7 +1667,8 @@ class ApiProvider extends BaseProvider {
 
   // 获取个人信息
   Future<Response> getUserInfo(String operatorUid) =>
-      post(getUserInfoURL.toUrl, jsonEncode({'operatorUid': operatorUid}));
+      post(getUserInfoURL.toUrl, jsonEncode({'operatorUid': operatorUid}),
+          isUnShowLoading: true);
 
   // 重置密码钥匙
   Future<Response> keyboardPwdReset(String lockId, List passwordKey) => post(
@@ -2178,7 +2177,7 @@ class ApiProvider extends BaseProvider {
   //  获取App基本信息
   Future<Response<dynamic>> getAppInfo() =>
       post(appGetAppInfoURL.toUrl, jsonEncode(<String, int>{}),
-          isShowErrMsg: false);
+          isShowErrMsg: false, isUnShowLoading: true);
 
   //  获取App固件信息
   Future<Response<dynamic>> getFwVersion(String model, String currentVersion) =>