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

feat: 1.调整项目初始化，不用等待site/config接口，仅在hi_user_info中调用；将site_config_service拆成loadDomain和获取配置，在splash中只做loadDomain

Browse Source 
2. 优化接口拦截的解密日志
3. 调整获取订阅到kr_home，与源版一致
4. 修复闪连抖动问题，增加套餐有效期判断
This commit is contained in:
speakeloudest
2026-01-13 18:07:11 -08:00
parent 1d2a89a80a
commit ccf9a76de9
22 changed files with 737 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/app/modules/hi_user_info/controllers/hi_user_info_controller.dart
+61 -35
View File
@@ -12,8 +12,10 @@ import 'package:kaer_with_panels/app/model/enum/kr_request_type.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'dart:io';
import 'dart:math';
import 'dart:convert';
import 'package:kaer_with_panels/utils/snackbar_util.dart';
import 'package:kaer_with_panels/app/routes/app_pages.dart';
import 'package:kaer_with_panels/app/common/app_config.dart';
class HIUserInfoController extends GetxController {
/// 订阅服务
@@ -32,6 +34,7 @@ class HIUserInfoController extends GetxController {
void onInit() {
super.onInit();
_initDeviceId();
_initDeviceLimit();
loadDeviceList();
}
@@ -55,13 +58,13 @@ class HIUserInfoController extends GetxController {
final result = await KRUserApi().kr_getUserDevices();
result.fold(
(error) {
(error) {
KRLogUtil.kr_e('加载设备列表失败: ${error.msg}', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, error.msg);
},
(deviceList) {
KRLogUtil.kr_i('获取到 ${deviceList.length} 个设备', tag: 'DeviceManagement');
(deviceList) {
KRLogUtil.kr_i('获取到 ${deviceList.length} 个设备',
tag: 'DeviceManagement');
// 转换设备数据格式
devices.value = deviceList.map((device) {
@@ -89,7 +92,8 @@ class HIUserInfoController extends GetxController {
} catch (e, stackTrace) {
KRLogUtil.kr_e('加载设备列表异常: $e', tag: 'DeviceManagement');
KRLogUtil.kr_e('堆栈跟踪: $stackTrace', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, AppTranslations.kr_deviceManagement.loadDeviceListFailed);
KRSnackBarUtil.show(AppTranslations.kr_dialog.error,
AppTranslations.kr_deviceManagement.loadDeviceListFailed);
} finally {
isLoading.value = false;
}
@@ -99,24 +103,26 @@ class HIUserInfoController extends GetxController {
Future<bool> deleteDevice(String id) async {
try {
final device = devices.firstWhere(
(d) => d['id'] == id,
(d) => d['id'] == id,
orElse: () => {},
);
if (device.isEmpty) return false;
final isCurrent = device['is_current'] ?? false;
KRLogUtil.kr_i('开始解绑设备 - id: $id, isCurrent: $isCurrent', tag: 'DeviceManagement');
KRLogUtil.kr_i('开始解绑设备 - id: $id, isCurrent: $isCurrent',
tag: 'DeviceManagement');
final result = await KRUserApi().kr_unbindUserDevice(id);
bool success = false;
result.fold(
(error) {
(error) {
KRLogUtil.kr_e('删除设备失败: ${error.msg}', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, AppTranslations.kr_deviceManagement.deleteFailed(error.msg));
KRSnackBarUtil.show(AppTranslations.kr_dialog.error,
AppTranslations.kr_deviceManagement.deleteFailed(error.msg));
},
(_) async {
(_) async {
KRLogUtil.kr_i('设备删除成功', tag: 'DeviceManagement');
success = true;
@@ -127,7 +133,8 @@ class HIUserInfoController extends GetxController {
await _reloginWithDevice();
} else {
devices.removeWhere((device) => device['id'] == id);
KRSnackBarUtil.show(AppTranslations.kr_dialog.success, AppTranslations.kr_deviceManagement.deleteSuccess);
KRSnackBarUtil.show(AppTranslations.kr_dialog.success,
AppTranslations.kr_deviceManagement.deleteSuccess);
}
},
);
@@ -136,18 +143,20 @@ class HIUserInfoController extends GetxController {
} catch (e, stackTrace) {
KRLogUtil.kr_e('删除设备异常: $e', tag: 'DeviceManagement');
KRLogUtil.kr_e('堆栈跟踪: $stackTrace', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, AppTranslations.kr_deviceManagement.deleteFailed(e.toString()));
KRSnackBarUtil.show(AppTranslations.kr_dialog.error,
AppTranslations.kr_deviceManagement.deleteFailed(e.toString()));
return false;
}
}
/// 重新使用设备登录
Future<void> _reloginWithDevice() async {
try {
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'DeviceManagement');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━',
tag: 'DeviceManagement');
KRLogUtil.kr_i('开始重新进行设备登录', tag: 'DeviceManagement');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'DeviceManagement');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━',
tag: 'DeviceManagement');
// 先清除当前的用户信息（但不调用 kr_loginOut，避免显示登录界面）
final appRunData = KRAppRunData.getInstance();
@@ -166,26 +175,27 @@ class HIUserInfoController extends GetxController {
final result = await authApi.kr_deviceLogin();
result.fold(
(error) {
(error) {
// 设备登录失败
KRLogUtil.kr_e('设备登录失败: ${error.msg}', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, AppTranslations.kr_deviceManagement.reloginFailed(error.msg));
KRSnackBarUtil.show(AppTranslations.kr_dialog.error,
AppTranslations.kr_deviceManagement.reloginFailed(error.msg));
// 执行完整退出登录，显示登录界面
appRunData.kr_loginOut();
},
(token) async {
(token) async {
// 设备登录成功
KRLogUtil.kr_i('✅ 设备登录成功！', tag: 'DeviceManagement');
KRLogUtil.kr_i('🎫 Token: ${token.substring(0, min(20, token.length))}...', tag: 'DeviceManagement');
KRLogUtil.kr_i(
'🎫 Token: ${token.substring(0, min(20, token.length))}...',
tag: 'DeviceManagement');
// 保存新的用户信息
final deviceId = KRDeviceInfoService().deviceId ?? 'unknown';
await appRunData.kr_saveUserInfo(
token,
'device_$deviceId',
KRLoginType.kr_email,
null,
);
KRLogUtil.kr_i('✅ 设备重新登录成功，已更新用户信息', tag: 'DeviceManagement');
@@ -209,35 +219,53 @@ class HIUserInfoController extends GetxController {
} catch (e, stackTrace) {
KRLogUtil.kr_e('设备重新登录异常: $e', tag: 'DeviceManagement');
KRLogUtil.kr_e('堆栈跟踪: $stackTrace', tag: 'DeviceManagement');
KRSnackBarUtil.show(AppTranslations.kr_dialog.error, AppTranslations.kr_deviceManagement.reloginFailedGeneric);
KRSnackBarUtil.show(AppTranslations.kr_dialog.error,
AppTranslations.kr_deviceManagement.reloginFailedGeneric);
// 发生异常，执行完整退出登录
await KRAppRunData.getInstance().kr_loginOut();
}
}
Future<void> _initDeviceLimit() async {
await KRSiteConfigService().fetchSiteConfig();
}
/// 获取设备类型和图标
Map<String, dynamic> getDeviceTypeInfo(String userAgent) {
String deviceType = AppTranslations.kr_deviceManagement.deviceTypeUnknown;
String iconName = 'devices';
if (userAgent.contains('Android') || userAgent.toLowerCase().contains('android')) {
deviceType = 'Android' ;// AppTranslations.kr_deviceManagement.deviceTypeAndroid;
if (userAgent.contains('Android') ||
userAgent.toLowerCase().contains('android')) {
deviceType =
'Android'; // AppTranslations.kr_deviceManagement.deviceTypeAndroid;
iconName = 'phone_android';
} else if (userAgent.contains('iOS') || userAgent.contains('iPhone') || userAgent.toLowerCase().contains('ios')) {
deviceType = 'iPhone'; // AppTranslations.kr_deviceManagement.deviceTypeIos;
} else if (userAgent.contains('iOS') ||
userAgent.contains('iPhone') ||
userAgent.toLowerCase().contains('ios')) {
deviceType =
'iPhone'; // AppTranslations.kr_deviceManagement.deviceTypeIos;
iconName = 'phone_iphone';
} else if (userAgent.contains('iPad')) {
deviceType = 'iPad';// AppTranslations.kr_deviceManagement.deviceTypeIpad;
deviceType =
'iPad'; // AppTranslations.kr_deviceManagement.deviceTypeIpad;
iconName = 'tablet';
} else if (userAgent.contains('macOS') || userAgent.contains('Mac') || userAgent.toLowerCase().contains('mac')) {
deviceType = 'Mac';// AppTranslations.kr_deviceManagement.deviceTypeMacos;
} else if (userAgent.contains('macOS') ||
userAgent.contains('Mac') ||
userAgent.toLowerCase().contains('mac')) {
deviceType =
'Mac'; // AppTranslations.kr_deviceManagement.deviceTypeMacos;
iconName = 'desktop_mac';
} else if (userAgent.contains('Windows') || userAgent.toLowerCase().contains('windows')) {
deviceType = 'Windows'; //AppTranslations.kr_deviceManagement.deviceTypeWindows;
} else if (userAgent.contains('Windows') ||
userAgent.toLowerCase().contains('windows')) {
deviceType =
'Windows'; //AppTranslations.kr_deviceManagement.deviceTypeWindows;
iconName = 'computer';
} else if (userAgent.contains('Linux') || userAgent.toLowerCase().contains('linux')) {
deviceType = 'Linux';//AppTranslations.kr_deviceManagement.deviceTypeLinux;
} else if (userAgent.contains('Linux') ||
userAgent.toLowerCase().contains('linux')) {
deviceType =
'Linux'; //AppTranslations.kr_deviceManagement.deviceTypeLinux;
iconName = 'computer';
}
@@ -247,8 +275,6 @@ class HIUserInfoController extends GetxController {
};
}
@override
void onReady() {
super.onReady();