From 961d419c4d67f4e2c413dddcc65a99ab26e31084 Mon Sep 17 00:00:00 2001 From: speakeloudest Date: Mon, 1 Dec 2025 22:34:37 -0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=96=87=E6=A1=88=E5=92=8Cnull=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/modules/hi_menu/views/hi_menu_view.dart | 2 +- .../hi_user_info/views/hi_user_info_view.dart | 2 +- .../views/kr_delete_account_view.dart | 2 +- .../modules/kr_invite/views/kr_invite_view.dart | 16 ++++++++-------- .../controllers/kr_login_controller.dart | 1 + .../modules/kr_login/views/kr_login_view.dart | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/app/modules/hi_menu/views/hi_menu_view.dart b/lib/app/modules/hi_menu/views/hi_menu_view.dart index 8dc50df..33d410f 100755 --- a/lib/app/modules/hi_menu/views/hi_menu_view.dart +++ b/lib/app/modules/hi_menu/views/hi_menu_view.dart @@ -39,7 +39,7 @@ class HIMenuView extends GetView { Obx(() { final account = KRAppRunData.getInstance().kr_account.value; final isDeviceLogin = account != null && account.startsWith('9000'); - final accountText = isDeviceLogin ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}'; + final accountText = (account ==null || isDeviceLogin) ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return UserInfoCard( controller: controller, userId: accountText, diff --git a/lib/app/modules/hi_user_info/views/hi_user_info_view.dart b/lib/app/modules/hi_user_info/views/hi_user_info_view.dart index 6d89c19..97f6571 100755 --- a/lib/app/modules/hi_user_info/views/hi_user_info_view.dart +++ b/lib/app/modules/hi_user_info/views/hi_user_info_view.dart @@ -75,7 +75,7 @@ class HIUserInfoView extends GetView { .value; final isDeviceLogin = account != null && account.startsWith('9000'); - final accountText = isDeviceLogin + final accountText = (account ==null || isDeviceLogin) ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return Text( diff --git a/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart b/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart index 23719d5..0d1738c 100755 --- a/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart +++ b/lib/app/modules/kr_delete_account/views/kr_delete_account_view.dart @@ -139,7 +139,7 @@ class KRDeleteAccountView extends GetView { final account = KRAppRunData.getInstance().kr_account.value; final isDeviceLogin = account != null && account.startsWith('9000'); - final accountText = isDeviceLogin + final accountText = (account ==null || isDeviceLogin) ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}'; return Text( diff --git a/lib/app/modules/kr_invite/views/kr_invite_view.dart b/lib/app/modules/kr_invite/views/kr_invite_view.dart index 3ccaf37..f82bf48 100755 --- a/lib/app/modules/kr_invite/views/kr_invite_view.dart +++ b/lib/app/modules/kr_invite/views/kr_invite_view.dart @@ -115,14 +115,14 @@ class KRInviteView extends GetView { ), onPressed: () { if (controller.kr_referCode.value.isNotEmpty) { + final code = controller.kr_referCode.value; + final text = '#您的好友邀请您使用Hi快网络加速器\n' + '安装完毕后，在软件内<邀请好友>页面粘贴以下邀请码\n' + '$code\n' + '您和您的好友将会分别获得3天免费时长\n\n' + '点击此处进入下载页面\n' + '或在浏览器输入hifastvpn.com下载#'; if (GetPlatform.isIOS) { - final code = controller.kr_referCode.value; - final text = '#您的好友邀请您使用Hi快网络加速器\n' - '安装完毕后，在软件内<邀请好友>页面粘贴以下邀请码\n' - '$code\n' - '您和您的好友将会分别获得3天免费时长\n\n' - '点击此处进入下载页面\n' - '或在浏览器输入hifastvpn.com下载#'; Share.share( text, subject: '直接分享Hi快VPN邀请链接', @@ -130,7 +130,7 @@ class KRInviteView extends GetView { } else { Clipboard.setData( ClipboardData( - text: controller.kr_referCode.value), + text: text), ); KRCommonUtil.kr_showToast( AppTranslations.kr_invite.inviteCodeCopied, diff --git a/lib/app/modules/kr_login/controllers/kr_login_controller.dart b/lib/app/modules/kr_login/controllers/kr_login_controller.dart index 008f157..5654b95 100755 --- a/lib/app/modules/kr_login/controllers/kr_login_controller.dart +++ b/lib/app/modules/kr_login/controllers/kr_login_controller.dart @@ -400,6 +400,7 @@ class KRLoginController extends GetxController preventBackDismiss: true, confirmText: '确定', ); + return; }, (r) async { _saveLoginData(r); diff --git a/lib/app/modules/kr_login/views/kr_login_view.dart b/lib/app/modules/kr_login/views/kr_login_view.dart index ccb0128..2f9cf6c 100755 --- a/lib/app/modules/kr_login/views/kr_login_view.dart +++ b/lib/app/modules/kr_login/views/kr_login_view.dart @@ -89,7 +89,7 @@ class KRLoginView extends GetView { final account = KRAppRunData.getInstance().kr_account.value; final isDeviceLogin = account != null && account.startsWith('9000'); - final accountText = isDeviceLogin + final accountText = (account ==null || isDeviceLogin) ? '待绑定' : '${KRAppRunData.getInstance().kr_account.value.toString()}';