From d63d07a1a938f810917782db2fe917ff846d67ab Mon Sep 17 00:00:00 2001 From: xkeyC <3334969096@qq.com> Date: Sat, 28 Oct 2023 19:15:13 +0800 Subject: [PATCH] fix --- lib/common/conf.dart | 9 +++-- lib/ui/home/home_ui.dart | 4 +-- lib/ui/home/login/login_dialog_ui.dart | 38 ++++++++++---------- lib/ui/home/login/login_dialog_ui_model.dart | 36 ++++++++----------- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/lib/common/conf.dart b/lib/common/conf.dart index 7a2db2a..c306305 100644 --- a/lib/common/conf.dart +++ b/lib/common/conf.dart @@ -35,8 +35,10 @@ class AppConf { WidgetsFlutterBinding.ensureInitialized(); /// init device info - DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); - windowsDeviceInfo = await deviceInfo.windowsInfo; + try { + DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); + windowsDeviceInfo = await deviceInfo.windowsInfo; + }catch (_){} /// init Data applicationSupportDir = @@ -85,7 +87,8 @@ class AppConf { try { networkVersionData = await Api.getAppVersion(); dPrint( - "lastVersion=${networkVersionData?.lastVersion} ${networkVersionData?.lastVersionCode}"); + "lastVersion=${networkVersionData?.lastVersion} ${networkVersionData + ?.lastVersionCode}"); } catch (e) { dPrint("_checkUpdate Error:$e"); } diff --git a/lib/ui/home/home_ui.dart b/lib/ui/home/home_ui.dart index a728cf0..d1e4543 100644 --- a/lib/ui/home/home_ui.dart +++ b/lib/ui/home/home_ui.dart @@ -133,8 +133,8 @@ class HomeUI extends BaseUI { const SizedBox(width: 12), ], ), - name: "DPSCalculator 汉化", - webTitle: "DPSCalculatorLIVE 汉化", + name: "DPS计算器汉化", + webTitle: "DPS计算器汉化", webURL: "https://www.erkul.games/live/calculator", info: "在线改船,查询伤害数值和配件购买地点", useLocalization: true, diff --git a/lib/ui/home/login/login_dialog_ui.dart b/lib/ui/home/login/login_dialog_ui.dart index 7e6363c..b2198d8 100644 --- a/lib/ui/home/login/login_dialog_ui.dart +++ b/lib/ui/home/login/login_dialog_ui.dart @@ -32,7 +32,7 @@ class LoginDialog extends BaseUI { Text("请输入RSI账户 [${model.nickname}] 的邮箱,以保存登录状态(输入错误会导致无法进入游戏!)"), const SizedBox(height: 12), TextFormBox( - controller: model.emailCtrl, + // controller: model.emailCtrl, ), const SizedBox(height: 6), Text( @@ -79,24 +79,24 @@ class LoginDialog extends BaseUI { ], ), ), - actions: [ - if (model.loginStatus == 1) ...[ - Button( - child: const Padding( - padding: EdgeInsets.all(4), - child: Text("取消"), - ), - onPressed: () { - Navigator.pop(context); - }), - const SizedBox(width: 80), - FilledButton( - child: const Padding( - padding: EdgeInsets.all(4), - child: Text("保存"), - ), - onPressed: () => model.onSaveEmail()), - ], + actions: const [ + // if (model.loginStatus == 1) ...[ + // Button( + // child: const Padding( + // padding: EdgeInsets.all(4), + // child: Text("取消"), + // ), + // onPressed: () { + // Navigator.pop(context); + // }), + // const SizedBox(width: 80), + // FilledButton( + // child: const Padding( + // padding: EdgeInsets.all(4), + // child: Text("保存"), + // ), + // onPressed: () => model.onSaveEmail()), + // ], ], ); } diff --git a/lib/ui/home/login/login_dialog_ui_model.dart b/lib/ui/home/login/login_dialog_ui_model.dart index cdb5b43..22c468d 100644 --- a/lib/ui/home/login/login_dialog_ui_model.dart +++ b/lib/ui/home/login/login_dialog_ui_model.dart @@ -23,7 +23,7 @@ class LoginDialogModel extends BaseUIModel { final HomeUIModel homeUIModel; - TextEditingController emailCtrl = TextEditingController(); + // TextEditingController emailCtrl = TextEditingController(); LoginDialogModel(this.installPath, this.homeUIModel); @@ -42,7 +42,7 @@ class LoginDialogModel extends BaseUIModel { Navigator.pop(context!); return; } - final emailBox = await Hive.openBox("quick_login_email"); + // final emailBox = await Hive.openBox("quick_login_email"); final data = message["data"]; authToken = data["authToken"]; webToken = data["webToken"]; @@ -53,13 +53,7 @@ class LoginDialogModel extends BaseUIModel { .replaceAll("\")", ""); Map payload = Jwt.parseJwt(authToken!); nickname = payload["nickname"] ?? ""; - if (emailBox.get(nickname, defaultValue: "") == "") { - loginStatus = 1; - notifyListeners(); - } else { - emailCtrl.text = emailBox.get(nickname, defaultValue: ""); - _readyForLaunch(); - } + _readyForLaunch(); }, useLocalization: true); } @@ -114,23 +108,23 @@ class LoginDialogModel extends BaseUIModel { notifyListeners(); } - onSaveEmail() async { - final RegExp emailRegex = RegExp(r'^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$'); - if (!emailRegex.hasMatch(emailCtrl.text.trim())) { - showToast(context!, "邮箱输入有误!"); - return; - } - final emailBox = await Hive.openBox("quick_login_email"); - await emailBox.put(nickname, emailCtrl.text.trim()); - _readyForLaunch(); - notifyListeners(); - } + // onSaveEmail() async { + // final RegExp emailRegex = RegExp(r'^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$'); + // if (!emailRegex.hasMatch(emailCtrl.text.trim())) { + // showToast(context!, "邮箱输入有误!"); + // return; + // } + // final emailBox = await Hive.openBox("quick_login_email"); + // await emailBox.put(nickname, emailCtrl.text.trim()); + // _readyForLaunch(); + // notifyListeners(); + // } Future _readyForLaunch() async { loginStatus = 2; notifyListeners(); final launchData = { - "username": emailCtrl.text.trim(), + "username": "", "token": webToken, "auth_token": authToken, "star_network": {