1. /lib/app/common/app_config.dart

- P0: 限制递归重试次数(最多5次)
    - P1: 减少超时时间(3s→2s, 6s→4s)
    - P1: 移除重复域名配置
  2.  /lib/app/services/kr_site_config_service.dart
    - P1: 减少网络超时(10s→5s)
  3.  /lib/app/modules/kr_splash/controllers/kr_splash_controller.dart
    - P0: 总体超时保护(30秒)
    - P2: 非阻塞初始化
    - P2: 后台任务超时保护(网站配置10s, 设备登录8s)
    - P2: 完善错误处理(区分超时/网络/HTTP错误)
    - P3: 跳过初始化功能
  4.  /lib/app/modules/kr_splash/views/kr_splash_view.dart
    - P3: 添加"跳过"按钮

(cherry picked from commit 0a9fe429919fe9ae85b7769df123b72d7e33c6b1)
This commit is contained in:
Rust 2025-10-31 01:50:25 -07:00 committed by speakeloudest
parent c5715f77e2
commit 442ea458b7
4 changed files with 282 additions and 123 deletions

View File

@ -53,8 +53,9 @@ class KRDomain {
static Timer? _retryTimer;
static const int kr_retryInterval = 2; //
static const int kr_maxRetryCount = 2; //
static const int kr_domainTimeout = 3; //
static const int kr_totalTimeout = 6; //
// 🔧 P1修复
static const int kr_domainTimeout = 2; // 32
static const int kr_totalTimeout = 4; // 64
static Set<String> _triedDomains = {}; //
static Map<String, int> _domainResponseTimes = {}; //
static Map<String, DateTime> _domainLastCheck = {}; //
@ -1057,6 +1058,7 @@ class AppConfig {
///
/// url
///
// static String baseUrl = "http://103.112.98.72:8088";
///
@ -1146,9 +1148,23 @@ class AppConfig {
Future<void> _startAutoRetry(Future<void> Function()? onSuccess) async {
_retryTimer?.cancel();
int currentRetryCount = 0;
// 🔧 P0修复
int totalAttempts = 0;
const int maxTotalAttempts = 5; // 5
Future<void> executeConfigRequest() async {
try {
// 🔧 P0修复
totalAttempts++;
if (totalAttempts > maxTotalAttempts) {
KRLogUtil.kr_e('❌ 超过最大总尝试次数($maxTotalAttempts),停止重试', tag: 'AppConfig');
// 使
if (onSuccess != null) {
await onSuccess();
}
return;
}
//
if (currentRetryCount >= kr_maxRetryCount) {
KRLogUtil.kr_w('达到最大重试次数,尝试使用备用域名', tag: 'AppConfig');
@ -1158,8 +1174,16 @@ class AppConfig {
KRDomain.kr_currentDomain = newDomain;
await KRDomain.kr_saveCurrentDomain();
KRLogUtil.kr_i('✅ 最终切换到备用域名: $newDomain', tag: 'AppConfig');
//
currentRetryCount = 0;
//
await executeConfigRequest();
} else {
KRLogUtil.kr_e('❌ 备用域名切换失败,使用默认配置继续', tag: 'AppConfig');
// 使
if (onSuccess != null) {
await onSuccess();
}
}
return;
}

View File

@ -1,8 +1,10 @@
import 'package:get/get.dart';
import 'dart:convert';
import 'dart:io' show Platform;
import 'dart:io' show Platform, SocketException;
import 'dart:math';
import 'dart:async';
import 'package:dio/dio.dart';
import 'package:kaer_with_panels/app/utils/kr_network_check.dart';
import 'package:kaer_with_panels/app/utils/kr_log_util.dart';
import 'package:kaer_with_panels/app/routes/app_pages.dart';
@ -66,11 +68,14 @@ class KRSplashController extends GetxController {
KRLogUtil.kr_i('[SPLASH_TIMING] 🎬 启动页控制器 onInit', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] ═══════════════════════════════════════', tag: 'SplashController');
//
_kr_initSiteConfig().then((_) {
print('🔧 网站配置完成,开始调用 _kr_initialize...');
// 🔧 P2优化
print('🌐 启动后台任务:网站配置加载...');
KRLogUtil.kr_i('🌐 后台任务:网站配置和设备登录', tag: 'SplashController');
_kr_initSiteConfig(); //
//
print('🔧 立即开始主初始化流程...');
_kr_initialize();
});
}
//
@ -87,7 +92,7 @@ class KRSplashController extends GetxController {
_stepStartTime = now; //
}
///
///
Future<void> _kr_initSiteConfig() async {
print('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
print('[SPLASH_TIMING] 🌐 开始初始化网站配置...');
@ -98,6 +103,27 @@ class KRSplashController extends GetxController {
KRLogUtil.kr_i('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
try {
// 🔧 P2优化10
await Future.any([
_executeSiteConfigInit(),
Future.delayed(const Duration(seconds: 10), () {
throw TimeoutException('网站配置加载超时10秒');
}),
]);
} on TimeoutException catch (e) {
print('⏱️ 网站配置加载超时,应用将使用默认配置: $e');
KRLogUtil.kr_w('⏱️ 网站配置加载超时: $e', tag: 'SplashController');
} catch (e) {
print('❌ 网站配置初始化异常: $e');
KRLogUtil.kr_e('❌ 网站配置初始化异常: $e', tag: 'SplashController');
}
print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
}
///
Future<void> _executeSiteConfigInit() async {
print('📞 准备调用 KRSiteConfigService().initialize()...');
final success = await KRSiteConfigService().initialize();
final crispId = await KRSiteConfigService().getCrispId();
@ -110,108 +136,201 @@ class KRSplashController extends GetxController {
print('AppConfig website_id 已更新为: ${config.kr_website_id}');
print('[SPLASH_TIMING] ✅ 网站配置初始化成功');
KRLogUtil.kr_i('[SPLASH_TIMING] ✅ 网站配置初始化成功', tag: 'SplashController');
await _kr_checkAndPerformDeviceLogin();
} else {
print('⚠️ 网站配置初始化失败,将使用默认配置');
KRLogUtil.kr_w('⚠️ 网站配置初始化失败,将使用默认配置', tag: 'SplashController');
}
} catch (e) {
print('❌ 网站配置初始化异常: $e');
KRLogUtil.kr_e('❌ 网站配置初始化异常: $e', tag: 'SplashController');
}
///
Future<void> _kr_checkAndPerformDeviceLogin() async {
try {
print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
print('🔍 检查是否支持设备登录...');
print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
final siteConfigService = KRSiteConfigService();
//
final isDeviceLoginEnabled = siteConfigService.isDeviceLoginEnabled();
print('📱 设备登录状态: ${isDeviceLoginEnabled ? "已启用" : "未启用"}');
KRLogUtil.kr_i('📱 设备登录状态: $isDeviceLoginEnabled', tag: 'SplashController');
if (!isDeviceLoginEnabled) {
print('⚠️ 设备登录未启用,跳过自动登录');
KRLogUtil.kr_w('⚠️ 设备登录未启用', tag: 'SplashController');
return;
}
print('✅ 设备登录已启用,开始初始化设备信息...');
// 🔧 P2优化8
await Future.any([
_executeDeviceLogin(),
Future.delayed(const Duration(seconds: 8), () {
throw TimeoutException('设备登录超时8秒');
}),
]);
print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
} on TimeoutException catch (e) {
print('⏱️ 设备登录超时,应用将继续启动: $e');
KRLogUtil.kr_w('⏱️ 设备登录超时: $e', tag: 'SplashController');
} catch (e, stackTrace) {
print('❌ 设备登录检查异常: $e');
print('📚 堆栈跟踪: $stackTrace');
KRLogUtil.kr_e('❌ 设备登录检查异常: $e', tag: 'SplashController');
}
}
///
Future<void> _executeDeviceLogin() async {
//
await KRDeviceInfoService().initialize();
print('🔐 开始执行设备登录...');
KRLogUtil.kr_i('🔐 开始执行设备登录', tag: 'SplashController');
//
final authApi = KRAuthApi();
final result = await authApi.kr_deviceLogin();
result.fold(
(error) {
print('❌ 设备登录失败: ${error.msg}');
KRLogUtil.kr_e('❌ 设备登录失败: ${error.msg}', tag: 'SplashController');
},
(token) async {
print('✅ 设备登录成功!');
print('🎫 Token: ${token.substring(0, min(20, token.length))}...');
KRLogUtil.kr_i('✅ 设备登录成功', tag: 'SplashController');
// 使 saveUserInfo
// 使
final deviceId = KRDeviceInfoService().deviceId ?? 'unknown';
await KRAppRunData.getInstance().kr_saveUserInfo(
token,
'device_$deviceId', // 使ID作为临时账号
KRLoginType.kr_email, //
null, //
);
print('💾 用户信息已保存包括Token');
print('✅ 已标记为登录状态');
KRLogUtil.kr_i('✅ 设备登录流程完成', tag: 'SplashController');
},
);
}
Future<void> _kr_initialize() async {
try {
_logStepTiming('开始主要初始化流程');
KRLogUtil.kr_i('[SPLASH_TIMING] 🔧 开始执行 _kr_initialize', tag: 'SplashController');
KRLogUtil.kr_i('🔧 开始执行 _kr_initialize', tag: 'SplashController');
// 🔧 P0修复30
await Future.any([
_executeInitialization(),
Future.delayed(const Duration(seconds: 30), () {
throw TimeoutException('初始化超时30秒内未完成');
}),
]);
} on TimeoutException catch (e) {
// 🔧 P2优化
KRLogUtil.kr_e('⏱️ 初始化超时: $e', tag: 'SplashController');
print('⏱️ 初始化超时,直接跳转到主页');
//
Get.offAllNamed(Routes.KR_MAIN);
} on SocketException catch (e) {
// 🔧 P2优化
KRLogUtil.kr_e('❌ 网络连接错误: $e', tag: 'SplashController');
_handleError('网络连接失败', '请检查您的网络连接是否正常,然后重试。');
} on DioException catch (e) {
// 🔧 P2优化HTTP请求错误
KRLogUtil.kr_e('❌ HTTP请求错误: ${e.type} - ${e.message}', tag: 'SplashController');
final errorMsg = _getDioErrorMessage(e);
_handleError('服务请求失败', errorMsg);
} catch (e) {
// 🔧 P2优化
KRLogUtil.kr_e('❌ 未知初始化异常: $e', tag: 'SplashController');
_handleError('初始化失败', '应用启动时发生错误,请尝试重启应用或清除缓存。');
}
}
///
void _handleError(String title, String message) {
kr_hasError.value = true;
kr_errorMessage.value = '$title\n\n$message';
}
/// Dio错误的友好提示
String _getDioErrorMessage(DioException e) {
switch (e.type) {
case DioExceptionType.connectionTimeout:
case DioExceptionType.sendTimeout:
case DioExceptionType.receiveTimeout:
return '请求超时,请检查网络连接后重试。';
case DioExceptionType.badResponse:
final statusCode = e.response?.statusCode;
if (statusCode == 404) {
return '服务地址未找到404请联系管理员。';
} else if (statusCode == 500) {
return '服务器内部错误500请稍后重试。';
} else if (statusCode == 401 || statusCode == 403) {
return '访问被拒绝($statusCode),请检查配置。';
}
return '服务器返回错误($statusCode),请稍后重试。';
case DioExceptionType.cancel:
return '请求已取消';
case DioExceptionType.connectionError:
return '无法连接到服务器,请检查网络设置。';
default:
return '网络请求失败,请检查网络后重试。';
}
}
// 🔧 P0修复
Future<void> _executeInitialization() async {
//
if (Platform.isIOS || Platform.isAndroid) {
_logStepTiming('开始网络权限检查');
KRLogUtil.kr_i('[SPLASH_TIMING] 📱 移动平台,检查网络权限...', tag: 'SplashController');
KRLogUtil.kr_i('📱 移动平台,检查网络权限...', tag: 'SplashController');
final bool hasNetworkPermission = await KRNetworkCheck.kr_initialize(
Get.context!,
onPermissionGranted: () async {
_logStepTiming('网络权限检查完成');
await _kr_continueInitialization();
},
);
if (!hasNetworkPermission) {
//
final endTime = DateTime.now();
final totalDuration = endTime.difference(_startTime);
final totalMs = totalDuration.inMilliseconds;
print('❌ 网络权限失败时间: ${endTime.toIso8601String()}');
print('🕐 网络权限失败总耗时: ${totalMs}ms (${totalDuration.inSeconds}.${(totalMs % 1000).toString().padLeft(3, '0')}s)');
kr_hasError.value = true;
kr_errorMessage.value = AppTranslations.kr_splash.kr_networkPermissionFailed;
KRLogUtil.kr_e('❌ 网络权限检查失败', tag: 'SplashController');
KRLogUtil.kr_e('⏰ 网络权限失败总耗时: ${totalMs}ms', tag: 'SplashController');
return;
}
} else {
//
_logStepTiming('桌面平台跳过权限检查');
KRLogUtil.kr_i('[SPLASH_TIMING] 💻 桌面平台,直接执行初始化', tag: 'SplashController');
KRLogUtil.kr_i('💻 桌面平台,直接执行初始化', tag: 'SplashController');
await _kr_continueInitialization();
}
} catch (e) {
//
final endTime = DateTime.now();
final totalDuration = endTime.difference(_startTime);
final totalMs = totalDuration.inMilliseconds;
print('❌ 初始化异常时间: ${endTime.toIso8601String()}');
print('🕐 初始化异常总耗时: ${totalMs}ms (${totalDuration.inSeconds}.${(totalMs % 1000).toString().padLeft(3, '0')}s)');
KRLogUtil.kr_e('❌ _kr_initialize 异常: $e', tag: 'SplashController');
KRLogUtil.kr_e('⏰ 初始化异常总耗时: ${totalMs}ms', tag: 'SplashController');
kr_hasError.value = true;
kr_errorMessage.value = '${AppTranslations.kr_splash.kr_initializationFailed}$e';
}
}
Future<void> _kr_continueInitialization() async {
try {
_logStepTiming('开始继续初始化流程');
KRLogUtil.kr_i('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] 🚀 启动页主流程开始...', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('🚀 启动页主流程开始...', tag: 'SplashController');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
//
if (Platform.isIOS || Platform.isAndroid) {
_logStepTiming('开始网络连接检查');
KRLogUtil.kr_i('[SPLASH_TIMING] 📱 检查网络连接...', tag: 'SplashController');
KRLogUtil.kr_i('📱 检查网络连接...', tag: 'SplashController');
final bool isConnected = await KRNetworkCheck.kr_checkNetworkConnection();
if (!isConnected) {
//
final endTime = DateTime.now();
final totalDuration = endTime.difference(_startTime);
final totalMs = totalDuration.inMilliseconds;
print('❌ 网络连接失败时间: ${endTime.toIso8601String()}');
print('🕐 网络连接失败总耗时: ${totalMs}ms (${totalDuration.inSeconds}.${(totalMs % 1000).toString().padLeft(3, '0')}s)');
kr_hasError.value = true;
kr_errorMessage.value = AppTranslations.kr_splash.kr_networkConnectionFailed;
KRLogUtil.kr_e('❌ 网络连接失败', tag: 'SplashController');
KRLogUtil.kr_e('⏰ 网络连接失败总耗时: ${totalMs}ms', tag: 'SplashController');
return;
}
_logStepTiming('网络连接检查完成');
KRLogUtil.kr_i('[SPLASH_TIMING] ✅ 网络连接正常', tag: 'SplashController');
KRLogUtil.kr_i('✅ 网络连接正常', tag: 'SplashController');
} else {
_logStepTiming('桌面平台跳过网络检查');
KRLogUtil.kr_i('[SPLASH_TIMING] 💻 桌面平台,跳过网络连接检查', tag: 'SplashController');
KRLogUtil.kr_i('💻 桌面平台,跳过网络连接检查', tag: 'SplashController');
}
//
@ -234,25 +353,17 @@ class KRSplashController extends GetxController {
_logStepTiming('设备登录检查完成');
//
KRLogUtil.kr_i('⚙️ 开始初始化应用配置...', tag: 'SplashController');
await AppConfig().initConfig(
onSuccess: () async {
// ,
KRLogUtil.kr_i('[SPLASH_TIMING] ⚙️ 初始化应用配置...', tag: 'SplashController');
//
KRLogUtil.kr_i('✅ 应用配置初始化成功,继续后续步骤', tag: 'SplashController');
await _kr_continueAfterConfig();
},
);
} catch (e) {
//
final endTime = DateTime.now();
final totalDuration = endTime.difference(_startTime);
final totalMs = totalDuration.inMilliseconds;
print('❌ 配置初始化异常时间: ${endTime.toIso8601String()}');
print('🕐 配置初始化异常总耗时: ${totalMs}ms (${totalDuration.inSeconds}.${(totalMs % 1000).toString().padLeft(3, '0')}s)');
//
KRLogUtil.kr_e('❌ 启动页初始化异常: $e', tag: 'SplashController');
KRLogUtil.kr_e('⏰ 配置初始化异常总耗时: ${totalMs}ms', tag: 'SplashController');
kr_hasError.value = true;
kr_errorMessage.value = '${AppTranslations.kr_splash.kr_initializationFailed}$e';
}
@ -285,20 +396,11 @@ class KRSplashController extends GetxController {
}
print('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
//
final endTime = DateTime.now();
final totalDuration = endTime.difference(_startTime);
final totalMs = totalDuration.inMilliseconds;
print('[SPLASH_TIMING] ⏰ 启动结束时间: ${endTime.toIso8601String()}');
print('[SPLASH_TIMING] 🕐 启动总耗时: ${totalMs}ms (${totalDuration.inSeconds}.${(totalMs % 1000).toString().padLeft(3, '0')}s)');
KRLogUtil.kr_i('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] 🎯 准备进入主页', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] 📊 最终登录状态: $loginStatus', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] 🎫 Token存在: $hasToken', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] ⏰ 启动总耗时: ${totalMs}ms', tag: 'SplashController');
KRLogUtil.kr_i('[SPLASH_TIMING] ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
KRLogUtil.kr_i('🎯 准备进入主页', tag: 'SplashController');
KRLogUtil.kr_i('📊 最终登录状态: $loginStatus', tag: 'SplashController');
KRLogUtil.kr_i('🎫 Token存在: $hasToken', tag: 'SplashController');
KRLogUtil.kr_i('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━', tag: 'SplashController');
//
_logStepTiming('开始页面导航');
@ -377,6 +479,20 @@ class KRSplashController extends GetxController {
_kr_initialize();
}
// 🔧 P3优化
void kr_skipInitialization() {
KRLogUtil.kr_i('⏭️ 用户选择跳过初始化', tag: 'SplashController');
print('⏭️ 用户跳过初始化,直接进入主页');
//
kr_hasError.value = false;
kr_errorMessage.value = '';
kr_isLoading.value = false;
//
Get.offAllNamed(Routes.KR_MAIN);
}
@override
void onReady() {
super.onReady();

View File

@ -89,6 +89,25 @@ class KRSplashView extends GetView<KRSplashController> {
color: Theme.of(context).primaryColor,
),
),
SizedBox(height: 16.h),
// 🔧 P3优化
TextButton(
onPressed: controller.kr_skipInitialization,
style: TextButton.styleFrom(
foregroundColor: Colors.grey,
padding: EdgeInsets.symmetric(
horizontal: 24.w,
vertical: 8.h,
),
),
child: Text(
'跳过',
style: KrAppTextStyle(
fontSize: 14,
color: Colors.grey,
),
),
),
],
);
}

View File

@ -12,10 +12,10 @@ class KRSiteConfigService extends ChangeNotifier {
static final KRSiteConfigService _instance = KRSiteConfigService._internal();
factory KRSiteConfigService() => _instance;
KRSiteConfigService._internal() {
// Dio
_dio.options.connectTimeout = const Duration(seconds: 10);
_dio.options.sendTimeout = const Duration(seconds: 10);
_dio.options.receiveTimeout = const Duration(seconds: 10);
// 🔧 P1修复 10 5
_dio.options.connectTimeout = const Duration(seconds: 5);
_dio.options.sendTimeout = const Duration(seconds: 5);
_dio.options.receiveTimeout = const Duration(seconds: 5);
// 🔧 HttpClientAdapter使用sing-box的mixed代理
_dio.httpClientAdapter = IOHttpClientAdapter(