HI-VPN/hi-client
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 尚未购买的弹窗

Browse Source
This commit is contained in:
speakeloudest
2025-11-27 22:58:42 -08:00
parent adcde623c7
commit 55d7508807
7 changed files with 403 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/app/modules/hi_user_info/views/hi_user_info_view.dart
+84 -100
View File
@@ -19,13 +19,14 @@ import 'package:kaer_with_panels/app/common/app_run_data.dart';
import 'package:kaer_with_panels/app/modules/kr_home/controllers/kr_home_controller.dart';
import 'package:kaer_with_panels/app/widgets/dialogs/hi_dialog.dart';
import 'package:kaer_with_panels/app/common/app_config.dart';
import 'package:kaer_with_panels/app/widgets/kr_subscription_expiry_text.dart';
class HIUserInfoView extends GetView<HIUserInfoController> {
const HIUserInfoView({super.key});
@override
Widget build(BuildContext context) {
final isDeviceLogin = KRAppRunData.getInstance().isDeviceLogin();
final isDeviceLogin = KRAppRunData.getInstance().isDeviceLogin();
return HIBaseScaffold(
child: Stack(
children: [
@@ -69,9 +70,14 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Obx(() {
final account = KRAppRunData.getInstance().kr_account.value;
final isDeviceLogin = account != null && account.startsWith('9000');
final accountText = isDeviceLogin ? '待绑定' : 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}';
final account = KRAppRunData.getInstance()
.kr_account
.value;
final isDeviceLogin = account != null &&
account.startsWith('9000');
final accountText = isDeviceLogin
? '待绑定'
: 'ID: ${KRAppRunData.getInstance().kr_account.value.toString()}';
return Text(
accountText,
style: TextStyle(
@@ -84,51 +90,13 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
overflow: TextOverflow.ellipsis,
);
}),
Obx(() {
final currentSubscribe =
controller.kr_subscribeService.kr_currentSubscribe.value;
String expiryText;
if (currentSubscribe == null) {
expiryText = '尚未购买套餐';
} else {
final now = DateTime.now();
DateTime? expireDateTime;
try {
expireDateTime =
DateTime.parse(currentSubscribe.expireTime);
} catch (e) {
expireDateTime = null;
}
if (expireDateTime == null) {
expiryText = '套餐信息无效';
} else if (expireDateTime.isBefore(now)) {
final formattedExpireDate =
'${expireDateTime.year}/${expireDateTime.month.toString().padLeft(2, '0')}/${expireDateTime.day.toString().padLeft(2, '0')}';
expiryText = '已于 $formattedExpireDate 到期';
} else {
final year = expireDateTime.year;
final month = expireDateTime.month.toString().padLeft(2, '0');
final day = expireDateTime.day.toString().padLeft(2, '0');
final hour = expireDateTime.hour.toString().padLeft(2, '0');
final minute = expireDateTime.minute.toString().padLeft(2, '0');
final second = expireDateTime.second.toString().padLeft(2, '0');
// 2. 拼接成最终的字符串
final formattedDateTime = '$year/$month/$day $hour:$minute:$second';
expiryText = '到期时间：$formattedDateTime';
}
}
return Text(
expiryText,
style: TextStyle(
color: Colors.white,
fontSize: 12.sp,
),
);
}),
KRSubscriptionExpiryText(
expireTimeProvider: () => controller
.kr_subscribeService
.kr_currentSubscribe
.value
?.expireTime,
),
],
),
),
@@ -138,7 +106,8 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
SizedBox(height: 12.w),
// 动态：如果已有账号，显示“修改密码”，否则显示“绑定邮箱”
Obx(() {
final isDeviceLogin = KRAppRunData.getInstance().isDeviceLogin();
final isDeviceLogin =
KRAppRunData.getInstance().isDeviceLogin();
if (!isDeviceLogin) return SizedBox.shrink();
return InkWell(
onTap: () {
@@ -155,14 +124,18 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
}
},
child: Container(
margin: EdgeInsets.symmetric(horizontal: 0).copyWith(bottom: 10), // 在这里增加底部间距
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 10),
margin: EdgeInsets.symmetric(horizontal: 0)
.copyWith(bottom: 10), // 在这里增加底部间距
padding: EdgeInsets.symmetric(
horizontal: 16, vertical: 10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
border: Border.all(color: Colors.white, width: 2),
border:
Border.all(color: Colors.white, width: 2),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
isDeviceLogin ? '绑定邮箱' : '修改密码',
@@ -203,7 +176,8 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
// 2. 让 GridView 根据内容自动调整高度
shrinkWrap: true,
// 3. 设置网格的配置
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2, // 强制两列
crossAxisSpacing: 10, // 水平间距
mainAxisSpacing: 10, // 垂直间距
@@ -226,8 +200,10 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
child: Text(
'请确认是否移除此设备？',
style: KrAppTextStyle(
color:
Theme.of(context).textTheme.bodyMedium?.color,
color: Theme.of(context)
.textTheme
.bodyMedium
?.color,
fontSize: 14,
fontWeight: FontWeight.w600,
),
@@ -240,8 +216,7 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
},
onCancel: () {
controller.deleteDevice(id);
}
);
});
},
);
} else {
@@ -261,9 +236,11 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
),
// 👇 核心改动 3: 将固定在底部的按钮放在 Expanded 外部
Obx(() {
if((KRAppRunData.getInstance().kr_account.value != null &&
KRAppRunData.getInstance().kr_account.value!.startsWith('9000')))
return SizedBox.shrink();
if ((KRAppRunData.getInstance().kr_account.value != null &&
KRAppRunData.getInstance()
.kr_account
.value!
.startsWith('9000'))) return SizedBox.shrink();
return Padding(
padding: EdgeInsets.symmetric(horizontal: 40.w),
child: Column(
@@ -278,7 +255,10 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
'注销账号后，所有此账号内的剩余套餐和账户数据将被清空，无法找回。', // 1. 修改为正确的提示信息
textAlign: TextAlign.left, // 文本居中
style: KrAppTextStyle(
color: Theme.of(context).textTheme.bodyMedium?.color,
color: Theme.of(context)
.textTheme
.bodyMedium
?.color,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
@@ -292,8 +272,7 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
Get.toNamed(Routes.KR_DELETE_ACCOUNT);
},
// 4. onConfirm 对应“返回”按钮的点击事件
onConfirm: () {
},
onConfirm: () {},
);
},
child: Container(
@@ -301,7 +280,8 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
padding: EdgeInsets.symmetric(vertical: 12.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24.w),
border: Border.all(color: const Color(0xFFFF2ED1), width: 2),
border: Border.all(
color: const Color(0xFFFF2ED1), width: 2),
),
alignment: Alignment.center,
child: Text(
@@ -324,7 +304,10 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
'确认要退出您的账号？', // 1. 修改为正确的提示信息
textAlign: TextAlign.center, // 文本居中
style: KrAppTextStyle(
color: Theme.of(context).textTheme.bodyMedium?.color,
color: Theme.of(context)
.textTheme
.bodyMedium
?.color,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
@@ -333,15 +316,14 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
cancelText: '确认',
confirmText: '返回',
onCancel: () async {
final currentDevice = controller.devices.firstWhere(
(device) => device['is_current'] == true,
final currentDevice =
controller.devices.firstWhere(
(device) => device['is_current'] == true,
);
final deviceId = currentDevice['id'] as String;
await controller.deleteDevice(deviceId);
},
onConfirm: () {
},
onConfirm: () {},
);
},
child: Container(
@@ -376,6 +358,7 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
),
);
}
/// 构建“当前设备信息卡”的私有方法
Widget _buildDeviceCard({
required BuildContext context,
@@ -396,7 +379,8 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
final deviceType = deviceInfo['type'] as String;
final iconName = deviceInfo['icon'] as String;
return Stack( // 使用 Stack 来放置删除按钮
return Stack(
// 使用 Stack 来放置删除按钮
children: [
// 主体内容容器
Container(
@@ -486,31 +470,31 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
// 在这里处理点击“添加设备”的逻辑
final device_limit = AppConfig.getInstance().device_limit;
HIDialog.show(
customMessageWidget: Padding(
padding: EdgeInsets.only(top: 16.w, bottom: 16.w),
child: Column(
mainAxisSize: MainAxisSize.min, // 让 Column 高度包裹内容
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// 2. 第一个 Text 组件
Text(
'请使用绑定邮箱登录新设备',
style: KrAppTextStyle(
color: Colors.black, // 可以使用稍浅
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
customMessageWidget: Padding(
padding: EdgeInsets.only(top: 16.w, bottom: 16.w),
child: Column(
mainAxisSize: MainAxisSize.min, // 让 Column 高度包裹内容
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// 2. 第一个 Text 组件
Text(
'请使用绑定邮箱登录新设备',
style: KrAppTextStyle(
color: Colors.black, // 可以使用稍浅
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
SizedBox(height: 20.w),
Text(
"每个账号最多允许同时使用${device_limit}台设备同时在线",
style: KrAppTextStyle(
color: Colors.black,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
)
/*Obx(() {
),
SizedBox(height: 20.w),
Text(
"每个账号最多允许同时使用${device_limit}台设备同时在线",
style: KrAppTextStyle(
color: Colors.black,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
)
/*Obx(() {
// final current = controller.kr_subscribeService.kr_currentSubscribe.value;
// 如果 current 为 null，显示默认值 0
@@ -518,9 +502,9 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
return
}),*/
],
),
],
),
),
confirmText: KRAppRunData.getInstance().isDeviceLogin() ? '前往' : null,
cancelText: '取消',
onConfirm: () {
@@ -591,7 +575,7 @@ class HIUserInfoView extends GetView<HIUserInfoController> {
final RegExp regExp = RegExp(r'\((.*?)\)');
final Match? match = regExp.firstMatch(deviceName);
if (match != null && match.groupCount >= 1 ) {
if (match != null && match.groupCount >= 1) {
// 获取括号内内容
final inside = match.group(1)!; // "Android; google Pixel 9; 15"