From b7da72a1ce875716a434257da6d007259c17d2ff Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Thu, 12 Dec 2024 16:29:41 +0800
Subject: [PATCH] =?UTF-8?q?style:=E5=8F=96=E6=B6=88=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/login/login/starLock_login_page.dart      | 16 ---------
 lib/main/lockMian/lockMain/lockMain_page.dart | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart
index 87a8f764..45ff45cb 100755
--- a/lib/login/login/starLock_login_page.dart
+++ b/lib/login/login/starLock_login_page.dart
@@ -235,22 +235,6 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                         }
                       }
                     : null)),
-            // SubmitBtn(
-            //   btnName: '发送回声测试消息',
-            //   onClick: () {
-            //     StartChartManage().sendEchoMessage(
-            //         ToPeerId: '3phX8Ng2cZHz5NtP8xAf6nYy2z1BYytoejgjoHrWMGhH');
-            //   },
-            // ),
-            // SubmitBtn(
-            //   btnName: '发送对讲请求1',
-            //   onClick: () {
-            //     StartChartManage().sendCallRequestMessage(
-            //       ToPeerId: 'CqKJUADeUZsHrSD4SEVnPBr73fbsHNUXCEq9kyCtE3wp',
-            //     );
-            //   },
-            // ),
-
             SubmitBtn(
               btnName: '跳转至html',
               onClick: () {
diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart
index 24aef551..b4e92804 100755
--- a/lib/main/lockMian/lockMain/lockMain_page.dart
+++ b/lib/main/lockMian/lockMain/lockMain_page.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
@@ -8,6 +7,7 @@ import 'package:star_lock/app_settings/app_colors.dart';
 import 'package:star_lock/blue/blue_manage.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_xhj_page.dart';
 import 'package:star_lock/main/lockMian/lockMain/lockMain_state.dart';
+import 'package:star_lock/talk/startChart/start_chart_manage.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/submitBtn.dart';
 
@@ -34,13 +34,15 @@ class StarLockMainPage extends StatefulWidget {
   State<StarLockMainPage> createState() => _StarLockMainPageState();
 }
 
-class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget, AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
+class _StarLockMainPageState extends State<StarLockMainPage>
+    with BaseWidget, AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
   final LockMainLogic logic = Get.put(LockMainLogic());
   final LockMainState state = Get.find<LockMainLogic>().state;
 
   Future<void> getHttpData(
       {bool clearScanDevices = false, bool isUnShowLoading = false}) async {
-    LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
+    LockListInfoGroupEntity? lockListInfoGroupEntity =
+        await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
       await logic.loadMainDataLogic(lockListInfoGroupEntity);
       setState(() {});
@@ -60,7 +62,9 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget, Au
   void initState() {
     super.initState();
     logic.pageNo = 1;
-    getHttpData(isUnShowLoading:true,);
+    getHttpData(
+      isUnShowLoading: true,
+    );
     _initLoadDataAction();
   }
 
@@ -203,15 +207,15 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget, Au
               ],
             ),
             Container(
-                padding: EdgeInsets.only(left:30.w, right: 30.w),
+                padding: EdgeInsets.only(left: 30.w, right: 30.w),
                 child: Text(
-              '添加锁时，手机必须在锁旁边'.tr,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                  fontSize: 26.sp,
-                  // fontWeight: FontWeight.w800,
-                  color: Colors.black),
-            )),
+                  '添加锁时，手机必须在锁旁边'.tr,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                      fontSize: 26.sp,
+                      // fontWeight: FontWeight.w800,
+                      color: Colors.black),
+                )),
             SizedBox(
               height: 160.h,
             ),
@@ -249,10 +253,10 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget, Au
     // AppLog.log('App--->state：$state');
     switch (state) {
       case AppLifecycleState.inactive:
-      // AppLog.log('App--->进入非活动状态');
+        // AppLog.log('App--->进入非活动状态');
         break;
       case AppLifecycleState.paused:
-      // AppLog.log('App--->进入后台');
+        // AppLog.log('App--->进入后台');
         BlueManage().disconnect();
         break;
       case AppLifecycleState.resumed:
@@ -261,10 +265,10 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget, Au
         getHttpData();
         break;
       case AppLifecycleState.detached:
-      // AppLog.log('App--->挂起');
+        // AppLog.log('App--->挂起');
         break;
       case AppLifecycleState.hidden:
-      // AppLog.log('App--->隐藏');
+        // AppLog.log('App--->隐藏');
         break;
     }
   }