From 7135b7767ed4f377c470b4229298d0ebcf1fc075 Mon Sep 17 00:00:00 2001 From: fuenmao <980740792@qq.com> Date: Tue, 24 Dec 2024 09:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95/=E5=8A=A0=E5=85=A5=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wgshare/lib/pages/loginPage/login_logic.dart | 34 +++++++------------- wgshare/lib/pages/userPage/user_view.dart | 2 +- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/wgshare/lib/pages/loginPage/login_logic.dart b/wgshare/lib/pages/loginPage/login_logic.dart index decd1d0..97cf83a 100644 --- a/wgshare/lib/pages/loginPage/login_logic.dart +++ b/wgshare/lib/pages/loginPage/login_logic.dart @@ -46,17 +46,12 @@ class LoginLogic extends GetxController with RequestToolMixin { }else if(state.checkAgreementBool.value != true){ ToastUtils.showError("请阅读并勾选相关协议"); }else{ - try{ - ToastUtils.showLoading(); - BaseStructureResult 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); - Get.offAllNamed(Routes.startPage); - } - }finally{ - ToastUtils.dismiss(); + BaseStructureResult 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); + Get.offAllNamed(Routes.startPage); } } } @@ -72,17 +67,12 @@ class LoginLogic extends GetxController with RequestToolMixin { }else if(state.checkAgreementBool != true){ ToastUtils.showError("请阅读并勾选相关协议"); }else{ - try{ - ToastUtils.showLoading(); - BaseStructureResult 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}); - Get.offAllNamed(Routes.startPage, arguments: {"roomNumber": state.meetingCodeController.text}); - } - }finally{ - ToastUtils.dismiss(); + BaseStructureResult 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}); + Get.offAllNamed(Routes.startPage, arguments: {"roomNumber": state.meetingCodeController.text}); } } } diff --git a/wgshare/lib/pages/userPage/user_view.dart b/wgshare/lib/pages/userPage/user_view.dart index cf1c8f0..9d97033 100644 --- a/wgshare/lib/pages/userPage/user_view.dart +++ b/wgshare/lib/pages/userPage/user_view.dart @@ -77,7 +77,7 @@ class UserPageState extends State { alignment: Alignment.center, child: Text( UserStore.to.userInfoEntity.value!.userName.length >= 3 - ? UserStore.to.userInfoEntity.value!.userName.substring(1,UserStore.to.userInfoEntity.value!.userName.length) + ? UserStore.to.userInfoEntity.value!.userName.substring(UserStore.to.userInfoEntity.value!.userName.length - 2,UserStore.to.userInfoEntity.value!.userName.length) : UserStore.to.userInfoEntity.value!.userName, style: TextStyle( fontSize: 30.sp,