marking
/
WGShare.Mobile.Flutter
19
0
Fork 0
Code Pull Requests Actions Releases Activity

1.进入APP判断登录优化 

2.请求网络销毁dialog优化
This commit is contained in:
fuenmao 2024-12-11 16:17:49 +08:00
parent 0e6d484e52
commit ce6128a827
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgshare/lib/main.dart
View File

@ -79,7 +79,7 @@ class MyApp extends StatelessWidget {
//默认专场动画 //默认专场动画
defaultTransition: Transition.fade, defaultTransition: Transition.fade,
//初始化路由页面 //初始化路由页面
initialRoute: Routes.startPage, initialRoute: (UserStore.to.token?.isNotEmpty ?? false) && UserStore.to.userInfoEntity.value != null ? Routes.startPage : Routes.loginPage,
/// 路由表 /// 路由表
getPages: AppPages.pages, getPages: AppPages.pages,

34
wgshare/lib/pages/loginPage/login_logic.dart
View File

@ -46,13 +46,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
}else if(state.checkAgreementBool.value != true){ }else if(state.checkAgreementBool.value != true){
ToastUtils.showError("请阅读并勾选相关协议"); ToastUtils.showError("请阅读并勾选相关协议");
}else{ }else{
ToastUtils.showLoading(); try{
BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString()); ToastUtils.showLoading();
ToastUtils.dismiss(); BaseStructureResult<UserInfoEntity> res = await getClient().login(state.userNameController.text, md5.convert(utf8.encode(state.passwordController.text)).toString());
if (null != res.data) { if (null != res.data) {
UserStore.to.setToken(res.data!.token); UserStore.to.setToken(res.data!.token);
UserStore.to.setUserDetailInfo(res.data!); UserStore.to.setUserDetailInfo(res.data!);
Get.toNamed(Routes.startPage); Get.toNamed(Routes.startPage);
}
}finally{
ToastUtils.dismiss();
} }
} }
} }
@ -68,13 +71,16 @@ class LoginLogic extends GetxController with RequestToolMixin {
}else if(state.checkAgreementBool != true){ }else if(state.checkAgreementBool != true){
ToastUtils.showError("请阅读并勾选相关协议"); ToastUtils.showError("请阅读并勾选相关协议");
}else{ }else{
ToastUtils.showLoading(); try{
BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text); ToastUtils.showLoading();
ToastUtils.dismiss(); BaseStructureResult<UserInfoEntity> res = await getClient().anonLogin(await DeviceInfo.getDeviceId(),state.nickNameCodeController.text, state.meetingCodeController.text);
if (null != res.data) { if (null != res.data) {
UserStore.to.setToken(res.data!.token); UserStore.to.setToken(res.data!.token);
UserStore.to.setUserDetailInfo(res.data!); UserStore.to.setUserDetailInfo(res.data!);
Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text}); Get.toNamed(Routes.meetingMainPage, arguments: {"roomNumber": state.meetingCodeController.text});
}
}finally{
ToastUtils.dismiss();
} }
} }
} }

18
wgshare/lib/pages/metting/meeting_main_logic.dart
View File

@ -58,16 +58,18 @@ class MeetingMainLogic extends GetxController with RequestToolMixin{
/// 1.获取会议室信息 /// 1.获取会议室信息
/// 2.获取会议室所有用户 /// 2.获取会议室所有用户
Future<void> mergeFetch() async { Future<void> mergeFetch() async {
ToastUtils.showLoading(); try{
ToastUtils.showLoading();
var results = await Future.wait([ var results = await Future.wait([
getClient().getMeetingRoomInfo(state.roomNumber.value), getClient().getMeetingRoomInfo(state.roomNumber.value),
getClient().getMeetingRoomAllUser(state.roomNumber.value)]); getClient().getMeetingRoomAllUser(state.roomNumber.value)]);
getMeetingRoomInfo(results[0].data as MeetingRoomInfo); getMeetingRoomInfo(results[0].data as MeetingRoomInfo);
getMeetingRoomAllUser(results[1].data as List<MeetingRoomUser>); getMeetingRoomAllUser(results[1].data as List<MeetingRoomUser>);
}finally{
ToastUtils.dismiss(); ToastUtils.dismiss();
}
} }
/// 改变会议信息浮层显示状态 /// 改变会议信息浮层显示状态