From ce6128a8274f95df5d1e0c7c7429aad0ac1cebd2 Mon Sep 17 00:00:00 2001
From: fuenmao <980740792@qq.com>
Date: Wed, 11 Dec 2024 16:17:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BF=9B=E5=85=A5APP=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96=202.=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=94=80=E6=AF=81dialog=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wgshare/lib/main.dart                         |  2 +-
 wgshare/lib/pages/loginPage/login_logic.dart  | 34 +++++++++++--------
 .../lib/pages/metting/meeting_main_logic.dart | 18 +++++-----
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/wgshare/lib/main.dart b/wgshare/lib/main.dart
index c88e509..36293bb 100644
--- a/wgshare/lib/main.dart
+++ b/wgshare/lib/main.dart
@@ -79,7 +79,7 @@ class MyApp extends StatelessWidget {
             //默认专场动画
             defaultTransition: Transition.fade,
             //初始化路由页面
-            initialRoute: Routes.startPage,
+            initialRoute: (UserStore.to.token?.isNotEmpty ?? false) && UserStore.to.userInfoEntity.value != null ? Routes.startPage : Routes.loginPage,
 
             /// 路由表
             getPages: AppPages.pages,
diff --git a/wgshare/lib/pages/loginPage/login_logic.dart b/wgshare/lib/pages/loginPage/login_logic.dart
index 2d79f50..7d2aa93 100644
--- a/wgshare/lib/pages/loginPage/login_logic.dart
+++ b/wgshare/lib/pages/loginPage/login_logic.dart
@@ -46,13 +46,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
     }else if(state.checkAgreementBool.value != true){
       ToastUtils.showError("请阅读并勾选相关协议");
     }else{
-      ToastUtils.showLoading();
-      BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString());
-      ToastUtils.dismiss();
-      if (null != res.data) {
-        UserStore.to.setToken(res.data!.token);
-        UserStore.to.setUserDetailInfo(res.data!);
-        Get.toNamed(Routes.startPage);
+      try{
+        ToastUtils.showLoading();
+        BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString());
+        if (null != res.data) {
+          UserStore.to.setToken(res.data!.token);
+          UserStore.to.setUserDetailInfo(res.data!);
+          Get.toNamed(Routes.startPage);
+        }
+      }finally{
+        ToastUtils.dismiss();
       }
     }
   }
@@ -68,13 +71,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
     }else if(state.checkAgreementBool != true){
       ToastUtils.showError("请阅读并勾选相关协议");
     }else{
-      ToastUtils.showLoading();
-      BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text);
-      ToastUtils.dismiss();
-      if (null != res.data) {
-        UserStore.to.setToken(res.data!.token);
-        UserStore.to.setUserDetailInfo(res.data!);
-        Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text});
+      try{
+        ToastUtils.showLoading();
+        BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text);
+        if (null != res.data) {
+          UserStore.to.setToken(res.data!.token);
+          UserStore.to.setUserDetailInfo(res.data!);
+          Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text});
+        }
+      }finally{
+        ToastUtils.dismiss();
       }
     }
   }
diff --git a/wgshare/lib/pages/metting/meeting_main_logic.dart b/wgshare/lib/pages/metting/meeting_main_logic.dart
index 78a6b38..8c7c46d 100644
--- a/wgshare/lib/pages/metting/meeting_main_logic.dart
+++ b/wgshare/lib/pages/metting/meeting_main_logic.dart
@@ -58,16 +58,18 @@ class MeetingMainLogic extends GetxController with RequestToolMixin{
   /// 1.获取会议室信息
   /// 2.获取会议室所有用户
   Future<void> mergeFetch() async {
-    ToastUtils.showLoading();
+    try{
+      ToastUtils.showLoading();
 
-    var results = await Future.wait([
-      getClient().getMeetingRoomInfo(state.roomNumber.value),
-      getClient().getMeetingRoomAllUser(state.roomNumber.value)]);
+      var results = await Future.wait([
+        getClient().getMeetingRoomInfo(state.roomNumber.value),
+        getClient().getMeetingRoomAllUser(state.roomNumber.value)]);
 
-    getMeetingRoomInfo(results[0].data as MeetingRoomInfo);
-    getMeetingRoomAllUser(results[1].data as List<MeetingRoomUser>);
-
-    ToastUtils.dismiss();
+      getMeetingRoomInfo(results[0].data as MeetingRoomInfo);
+      getMeetingRoomAllUser(results[1].data as List<MeetingRoomUser>);
+    }finally{
+      ToastUtils.dismiss();
+    }
   }
 
   /// 改变会议信息浮层显示状态