Compare commits

..

No commits in common. "7a223d614b9bf80a80bc78d800ddb32d1dfcca49" and "b8d0417d0f490d6d182f75a36fbc247672090b61" have entirely different histories.

17 changed files with 202 additions and 395 deletions

View File

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx4048m -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xlint:-options
android.useAndroidX=true
android.enableJetifier=true
# org.gradle.java.home=/Users/mac/Library/Java/JavaVirtualMachines/ms-17.0.16/Contents/Home

Binary file not shown.

Binary file not shown.

View File

@ -75,7 +75,7 @@
"codeSentCountdown": "验证码已发送 {seconds}s",
"and": "和",
"enterInviteCode": "请输入邀请码",
"registerSuccess": "注册成功",
"registerSuccess": "注册成功"
"search": "搜索",
"selectOtherRegion": "选择其他地区"
},

View File

@ -1255,7 +1255,7 @@ class AppConfig {
///
/// - Beta true
/// - false
static const bool enableInitLogCollection = false;
static const bool enableInitLogCollection = true;
///
///

View File

@ -528,7 +528,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
//
ever(KRSingBoxImp.instance.kr_status, (status) {
if (kDebugMode) {
}
print('🔵 Controller 收到状态变化: ${status.runtimeType}');
}
KRLogUtil.kr_i('🔄 连接状态变化: $status', tag: 'HomeController');
KRLogUtil.kr_i('📊 当前状态类型: ${status.runtimeType}', tag: 'HomeController');
@ -557,7 +558,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
case SingboxStarted():
KRLogUtil.kr_i('🟢 状态: 已启动', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 状态变为 Started, 当前延迟=${kr_currentNodeLatency.value}');
}
//
_cancelConnectionTimeout();
@ -570,11 +572,13 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
// 🔧 -1(),0()
if (kr_currentNodeLatency.value == -1) {
if (kDebugMode) {
}
print('🔵 强制将延迟从 -1 更新为 0');
}
kr_currentNodeLatency.value = 0;
kr_currentNodeLatency.refresh(); //
if (kDebugMode) {
}
print('🔵 延迟值已刷新');
}
}
// 🔧
@ -585,7 +589,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
// UI
update();
if (kDebugMode) {
}
print('🔵 状态更新完成,当前延迟=${kr_currentNodeLatency.value}');
}
break;
case SingboxStopping():
KRLogUtil.kr_i('🟠 状态: 正在停止', tag: 'HomeController');
@ -672,13 +677,15 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
KRLogUtil.kr_i('🔵 toggleSwitch 被调用: value=$value, currentStatus=$currentStatus', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 toggleSwitch: value=$value, currentStatus=$currentStatus');
}
// 🔧 : hiddify-app "switching status, debounce"
if (currentStatus is SingboxStarting || currentStatus is SingboxStopping) {
KRLogUtil.kr_i('🔄 正在切换中,忽略本次操作 (当前状态: $currentStatus)', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 忽略操作:正在切换中');
}
return;
}
@ -687,11 +694,13 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
//
KRLogUtil.kr_i('🔄 开始连接...', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 执行 kr_start()');
}
await KRSingBoxImp.instance.kr_start();
KRLogUtil.kr_i('✅ 连接命令已发送', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 kr_start() 完成');
}
// 🔧 : 3
await _waitForStatus(SingboxStarted, maxSeconds: 3);
@ -699,7 +708,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
//
KRLogUtil.kr_i('🛑 开始断开连接...', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 执行 kr_stop()');
}
await KRSingBoxImp.instance.kr_stop().timeout(
const Duration(seconds: 10),
onTimeout: () {
@ -709,7 +719,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
);
KRLogUtil.kr_i('✅ 断开命令已发送', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 kr_stop() 完成');
}
// 🔧 : 2
await _waitForStatus(SingboxStopped, maxSeconds: 2);
@ -717,29 +728,34 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
} catch (e) {
KRLogUtil.kr_e('❌ 切换失败: $e', tag: 'HomeController');
if (kDebugMode) {
}
print('🔵 切换失败: $e');
}
//
kr_forceSyncConnectionStatus();
}
if (kDebugMode) {
}
print('🔵 toggleSwitch 完成,当前 kr_isConnected=${kr_isConnected.value}');
}
}
/// 🔧
Future<void> _waitForStatus(Type expectedType, {int maxSeconds = 3}) async {
if (kDebugMode) {
}
print('🔵 等待状态变为: $expectedType');
}
final startTime = DateTime.now();
while (DateTime.now().difference(startTime).inSeconds < maxSeconds) {
final currentStatus = KRSingBoxImp.instance.kr_status.value;
if (kDebugMode) {
}
print('🔵 当前状态: ${currentStatus.runtimeType}');
}
if (currentStatus.runtimeType == expectedType) {
if (kDebugMode) {
}
print('🔵 状态已达到: $expectedType');
}
// kr_isConnected
kr_forceSyncConnectionStatus();
return;
@ -749,7 +765,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
}
if (kDebugMode) {
}
print('🔵 等待超时,强制同步状态');
}
kr_forceSyncConnectionStatus();
}

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../../localization/app_translations.dart';
import '../../../widgets/kr_app_text_style.dart';
import '../../../widgets/kr_loading_animation.dart';
@ -106,7 +107,6 @@ class KRHomeBottomPanel extends GetView<KRHomeController> {
//
Builder(builder: (context) {
KRLogUtil.kr_i('🔹 渲染订阅卡片margin: top=${12}, left=${12}, right=${12}', tag: 'HomeBottomPanel');
return Container(
margin: EdgeInsets.only(top: 12, left: 12, right: 12),
child: const KRSubscriptionCard(),
@ -160,7 +160,7 @@ class KRHomeBottomPanel extends GetView<KRHomeController> {
padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Get.context!.theme.cardColor,
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.r),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
@ -180,7 +180,7 @@ class KRHomeBottomPanel extends GetView<KRHomeController> {
Text(
'正在加载...',
style: TextStyle(
fontSize: 14,
fontSize: 14.sp,
color: Get.context!.theme.textTheme.bodyMedium?.color,
),
),
@ -233,7 +233,7 @@ class KRHomeBottomPanel extends GetView<KRHomeController> {
foregroundColor: Theme.of(context).colorScheme.onPrimary,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
borderRadius: BorderRadius.circular(8.r),
),
),
child: Text(

View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../../widgets/kr_simple_loading.dart';
import 'package:kaer_with_panels/app/widgets/kr_country_flag.dart';
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
import 'package:kaer_with_panels/app/widgets/kr_local_image.dart';

View File

@ -1,6 +1,7 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'package:kaer_with_panels/app/widgets/kr_app_text_style.dart';
import 'package:kaer_with_panels/app/widgets/kr_country_flag.dart';
@ -70,20 +71,20 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
///
Widget _buildServerList(BuildContext context) {
return Container(
width: MediaQuery.of(context).size.width,
height: 360, //
width: ScreenUtil().screenWidth,
height: 360.h, //
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
topLeft: Radius.circular(20.w),
topRight: Radius.circular(20.w),
),
),
child: Column(
children: [
//
Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 12.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -102,7 +103,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
},
child: Icon(
Icons.close,
size: 24,
size: 24.w,
color: Theme.of(context).textTheme.bodyMedium?.color,
),
),
@ -124,19 +125,19 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
);
}
return ListView.builder(
padding: EdgeInsets.symmetric(horizontal: 16),
padding: EdgeInsets.symmetric(horizontal: 16.w),
itemCount: controller.kr_subscribeService.groupOutboundList.length,
itemBuilder: (context, index) {
final group =
controller.kr_subscribeService.groupOutboundList[index];
return Container(
margin: EdgeInsets.only(bottom: 8),
margin: EdgeInsets.only(bottom: 8.w),
decoration: BoxDecoration(
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.w),
border: Border.all(
color: Theme.of(context).dividerColor.withOpacity(0.1),
width: 1,
width: 1.w,
),
),
child: InkWell(
@ -145,18 +146,18 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
controller.kr_currentListStatus.value =
KRHomeViewsListStatus.kr_serverSubscribeList;
},
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.w),
child: Padding(
padding: EdgeInsets.all(12),
padding: EdgeInsets.all(12.w),
child: Row(
children: [
KRNetworkImage(
kr_imageUrl: group.icon,
kr_width: 32,
kr_height: 32,
kr_width: 32.w,
kr_height: 32.w,
kr_fit: BoxFit.cover,
),
SizedBox(width: 12),
SizedBox(width: 12.w),
Expanded(
child: Text(
group.tag,
@ -170,7 +171,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
Icon(
Icons.arrow_forward_ios,
size: 16,
size: 16.w,
color: Theme.of(context).textTheme.bodySmall?.color,
),
],
@ -207,7 +208,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
return _kr_buildListContainer(
context,
child: ListView.builder(
padding: EdgeInsets.fromLTRB(16, 8, 16, 0),
padding: EdgeInsets.fromLTRB(16.w, 8.w, 16.w, 0),
itemCount:
controller.kr_subscribeService.countryOutboundList.length,
itemBuilder: (context, index) {
@ -221,15 +222,15 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
country.isExpand.value = !country.isExpand.value;
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 12),
padding: EdgeInsets.symmetric(vertical: 12.h),
child: Row(
children: [
KRCountryFlag(
countryCode: country.country,
width: 40,
height: 40,
width: 40.w,
height: 40.w,
),
SizedBox(width: 12),
SizedBox(width: 12.w),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -254,7 +255,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
country.isExpand.value
? Icons.keyboard_arrow_down
: Icons.arrow_forward_ios,
size: 16,
size: 16.w,
color:
Theme.of(context).textTheme.bodySmall?.color,
);
@ -271,7 +272,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
return ListView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(left: 24),
padding: EdgeInsets.only(left: 24.w),
itemCount: country.outboundList.length,
itemBuilder: (context, index) {
final server = country.outboundList[index];
@ -310,13 +311,13 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
vertical: 8.h,
horizontal: 16.w,
),
decoration: BoxDecoration(
//
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(8),
borderRadius: BorderRadius.circular(8.w),
),
child: _kr_buildNodeListItem(
context,
@ -327,9 +328,9 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
// 线
if (index < country.outboundList.length - 1)
Divider(
height: 1,
indent: 16,
endIndent: 16,
height: 1.w,
indent: 16.w,
endIndent: 16.w,
color: Theme.of(context)
.dividerColor
.withOpacity(0.1),
@ -340,7 +341,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
);
}),
Divider(
height: 1,
height: 1.w,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
],
@ -376,7 +377,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
return _kr_buildListContainer(
context,
child: ListView.builder(
padding: EdgeInsets.fromLTRB(16, 16, 16, 0),
padding: EdgeInsets.fromLTRB(16.w, 16.w, 16.w, 0),
itemCount: servers.length,
itemBuilder: (context, index) {
final server = servers[index];
@ -405,7 +406,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 4),
padding: EdgeInsets.symmetric(vertical: 4.h),
child: _kr_buildNodeListItem(
context,
item: server,
@ -414,7 +415,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
if (index < servers.length - 1)
Divider(
height: 1,
height: 1.w,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
],
@ -434,12 +435,12 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
required Widget listContent,
}) {
return Container(
width: MediaQuery.of(context).size.width,
width: ScreenUtil().screenWidth,
decoration: BoxDecoration(
color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
topLeft: Radius.circular(20.w),
topRight: Radius.circular(20.w),
),
),
child: Column(
@ -452,13 +453,13 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
onClose: () =>
controller.kr_currentListStatus.value = KRHomeViewsListStatus.kr_none,
),
SizedBox(height: 16),
SizedBox(height: 16.h),
Expanded(
child: Column(
children: [
Expanded(child: listContent),
//
SizedBox(height: 12),
SizedBox(height: 12.h),
],
),
),
@ -475,7 +476,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
VoidCallback? onClose,
}) {
return Padding(
padding: EdgeInsets.only(left: 16, right: 16, top: 16),
padding: EdgeInsets.only(left: 16.w, right: 16.w, top: 16.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -486,11 +487,11 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
onTap: onBack,
child: Icon(
Icons.arrow_back_ios,
size: 20,
size: 20.w,
color: Theme.of(context).textTheme.bodyMedium?.color,
),
),
SizedBox(width: 8),
SizedBox(width: 8.w),
],
Text(
title,
@ -507,7 +508,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
onTap: onClose,
child: Icon(
Icons.close,
size: 24,
size: 24.w,
color: Theme.of(context).textTheme.bodyMedium?.color,
),
),
@ -523,10 +524,10 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
required Widget child,
}) {
return Container(
margin: EdgeInsets.symmetric(horizontal: 16),
margin: EdgeInsets.symmetric(horizontal: 16.w),
decoration: BoxDecoration(
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.w),
),
child: child,
);
@ -552,17 +553,17 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
return Container(
key: ValueKey(item.id),
padding: EdgeInsets.symmetric(vertical: 8),
padding: EdgeInsets.symmetric(vertical: 8.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// 🔧
KRCountryFlag(
countryCode: item.country,
width: 36,
height: 36,
width: 36.w,
height: 36.w,
),
SizedBox(width: 8),
SizedBox(width: 8.w),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -581,12 +582,12 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
Obx(
() => controller.kr_cutTag.value == item.tag
? Container(
margin: EdgeInsets.only(left: 4),
margin: EdgeInsets.only(left: 4.w),
padding: EdgeInsets.symmetric(
horizontal: 4, vertical: 1),
horizontal: 4.w, vertical: 1.h),
decoration: BoxDecoration(
color: krModernGreenLight.withOpacity(0.1),
borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(4.w),
),
child: Text(
AppTranslations.kr_home.selected,
@ -601,7 +602,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
],
),
SizedBox(height: 2),
SizedBox(height: 2.h),
Text(
item.city,
style: KrAppTextStyle(
@ -668,20 +669,20 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
return _kr_buildListContainer(
context,
child: ListView(
padding: EdgeInsets.fromLTRB(16, 0, 16, 0),
padding: EdgeInsets.fromLTRB(16.w, 0, 16.w, 0),
children: [
//
InkWell(
onTap: () => controller.kr_urlTest(),
child: Container(
padding: EdgeInsets.symmetric(vertical: 8),
margin: EdgeInsets.only(top: 8), //
padding: EdgeInsets.symmetric(vertical: 8.h),
margin: EdgeInsets.only(top: 8.w), //
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 36,
height: 36,
width: 36.w,
height: 36.w,
decoration: BoxDecoration(
color: krModernGreenLight.withOpacity(0.1),
shape: BoxShape.circle,
@ -690,17 +691,17 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
child: controller.kr_isLatency.value
? KRSimpleLoading(
color: krModernGreen,
size: 24,
size: 24.w,
duration: const Duration(milliseconds: 800),
)
: Icon(
Icons.speed,
size: 24,
size: 24.w,
color: krModernGreen,
),
),
),
SizedBox(width: 8),
SizedBox(width: 8.w),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@ -727,7 +728,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
),
if (!controller.kr_isLatency.value) ...[
SizedBox(height: 2),
SizedBox(height: 2.h),
Text(
AppTranslations.kr_home.refreshLatencyDesc,
style: KrAppTextStyle(
@ -745,7 +746,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
if (!controller.kr_isLatency.value)
Icon(
Icons.arrow_forward_ios,
size: 12,
size: 12.w,
color: Theme.of(context).textTheme.bodySmall?.color,
),
],
@ -754,7 +755,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
// 线
Divider(
height: 16,
height: 16.w,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
// Auto
@ -774,19 +775,19 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 8),
padding: EdgeInsets.symmetric(vertical: 8.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
KrLocalImage(
imageName: "home_list_location",
width: 36,
height: 36,
width: 36.w,
height: 36.w,
color: controller.kr_cutTag.value == 'auto'
? Colors.green
: null,
),
SizedBox(width: 8),
SizedBox(width: 8.w),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -807,13 +808,13 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
if (controller.kr_cutTag.value == 'auto')
Container(
margin: EdgeInsets.only(left: 4),
margin: EdgeInsets.only(left: 4.w),
padding: EdgeInsets.symmetric(
horizontal: 4, vertical: 1),
horizontal: 4.w, vertical: 1.h),
decoration: BoxDecoration(
color:
krModernGreenLight.withOpacity(0.1),
borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(4.w),
),
child: Text(
AppTranslations.kr_home.selected,
@ -826,7 +827,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
],
),
SizedBox(height: 2),
SizedBox(height: 2.h),
Obx(() {
//
String selectedNode =
@ -902,7 +903,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
),
// 线
Divider(
height: 16,
height: 16.w,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
//
@ -928,7 +929,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 4),
padding: EdgeInsets.symmetric(vertical: 4.h),
child: _kr_buildNodeListItem(
context,
item: node,
@ -938,7 +939,7 @@ class KRHomeNodeListView extends GetView<KRHomeController> {
if (node !=
controller.kr_subscribeService.allList.last)
Divider(
height: 1,
height: 1.w,
color: Theme.of(context)
.dividerColor
.withOpacity(0.1),

View File

@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'package:kaer_with_panels/app/routes/app_pages.dart';
import 'package:kaer_with_panels/app/utils/kr_subscribe_navigation_util.dart';
import '../../../widgets/kr_app_text_style.dart';
///
@ -21,6 +24,13 @@ class KRSubscriptionCard extends StatelessWidget {
//
Widget _kr_buildSubscriptionCard(BuildContext context) {
// 🔧
print('🎴 [SubscriptionCard] 开始构建订阅卡片');
print('🎴 [SubscriptionCard] 卡片颜色: ${Theme.of(context).cardColor}');
print('🎴 [SubscriptionCard] 主题亮度: ${Theme.of(context).brightness}');
print('🎴 [SubscriptionCard] 文本颜色: ${Theme.of(context).textTheme.bodyMedium?.color}');
print('🎴 [SubscriptionCard] ScreenUtil 测试 - 12.w=${12.w}, 16.h=${16.h}, 44.w=${44.w}');
// 🔧 ScreenUtil使
return Container(
//
@ -72,6 +82,7 @@ class KRSubscriptionCard extends StatelessWidget {
height: 46,
child: ElevatedButton(
onPressed: () {
print('🎴 [SubscriptionCard] 订阅按钮被点击');
KRSubscribeNavigationUtil.navigateToPurchase(tag: 'SubscriptionCard');
},
style: ElevatedButton.styleFrom(
@ -103,10 +114,10 @@ class KRSubscriptionCard extends StatelessWidget {
bool addBottomPadding = true,
}) {
return Container(
margin: margin ?? EdgeInsets.symmetric(horizontal: 16),
margin: margin ?? EdgeInsets.symmetric(horizontal: 16.w),
decoration: BoxDecoration(
color: Theme.of(context).cardColor,
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.w),
),
child: IntrinsicWidth(
child: child,

View File

@ -5,8 +5,6 @@ import 'package:kaer_with_panels/app/utils/kr_common_util.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'package:kaer_with_panels/app/utils/kr_log_util.dart';
import 'package:url_launcher/url_launcher.dart';
import 'dart:io';
import 'package:path_provider/path_provider.dart';
import '../../../common/app_run_data.dart';
import '../../../common/app_config.dart';
@ -15,7 +13,6 @@ import '../../../model/response/kr_payment_methods.dart';
import '../../../routes/app_pages.dart';
import '../../../services/api_service/kr_api.user.dart';
import '../../../utils/kr_event_bus.dart';
import '../../../network/http_util.dart';
import 'package:flutter/foundation.dart';
///
@ -50,28 +47,8 @@ class KRPurchaseMembershipController extends GetxController {
RxInt _kr_balance = 0.obs;
@override
void onInit() async {
void onInit() {
super.onInit();
print('💳 [PurchaseMembership] ========== Controller.onInit 被调用 ==========');
print('💳 [PurchaseMembership] 当前时间: ${DateTime.now()}');
// 🔧 Controller被初始化
try {
final dir = await getApplicationDocumentsDirectory();
final debugFile = File('${dir.path}/PURCHASE_CONTROLLER_DEBUG.txt');
await debugFile.writeAsString(
'=' * 60 + '\n'
'💳 PurchaseMembershipController.onInit 被调用!\n'
'时间: ${DateTime.now()}\n'
'版本标识: Android15_Fix_v6_Final\n'
'=' * 60 + '\n',
mode: FileMode.append,
);
print('💳 [PurchaseMembership] ✅ 调试日志已写入文件: ${debugFile.path}');
} catch (e) {
print('💳 [PurchaseMembership] ❌ 写入调试日志失败: $e');
}
kr_initializeData();
}
@ -83,24 +60,14 @@ class KRPurchaseMembershipController extends GetxController {
///
Future<void> kr_initializeData() async {
print('💳 [PurchaseMembership] initializeData 开始');
kr_userEmail.value = KRAppRunData.getInstance().kr_account.toString();
print('💳 [PurchaseMembership] 用户邮箱: ${kr_userEmail.value}');
// 🔧 onInit await
// API
print('💳 [PurchaseMembership] 开始异步加载套餐数据...');
kr_getPackageList().catchError((e) {
print('💳 [PurchaseMembership] ❌ 加载套餐数据异常: $e');
KRLogUtil.kr_e('加载套餐数据失败: $e', tag: 'PurchaseMembership');
});
await kr_getPackageList();
//
_kr_eventWorker = KREventBus().kr_listenMessages(
[KRMessageType.kr_payment, KRMessageType.kr_subscribe_update],
_kr_handleMessage,
);
print('💳 [PurchaseMembership] initializeData 完成');
}
///
@ -127,102 +94,23 @@ class KRPurchaseMembershipController extends GetxController {
///
Future<void> kr_getPackageList() async {
print('💳 [PurchaseMembership] ========== 开始获取套餐列表 ==========');
print('💳 [PurchaseMembership] 当前时间: ${DateTime.now()}');
kr_isLoading.value = true;
kr_selectedPlanIndex.value = 0; //
kr_selectedDiscountIndex.value = -1; //
kr_selectedPaymentMethodIndex.value = -1; //
try {
// 🔧 API
print('💳 [PurchaseMembership] 步骤1: 开始初始化用户信息...');
await _iniUserInfo().timeout(
const Duration(seconds: 5),
onTimeout: () {
print('💳 [PurchaseMembership] ⚠️ 初始化用户信息超时');
KRLogUtil.kr_w('初始化用户信息超时', tag: 'PurchaseMembership');
},
);
print('💳 [PurchaseMembership] ✓ 步骤1完成');
await _iniUserInfo();
await kr_getAlreadySubscribe();
await kr_fetchPackages();
// await kr_fetchPaymentMethods(); // /v1/app/payment/methods
print('💳 [PurchaseMembership] 步骤2: 开始获取已订阅套餐...');
await kr_getAlreadySubscribe().timeout(
const Duration(seconds: 5),
onTimeout: () {
print('💳 [PurchaseMembership] ⚠️ 获取已订阅套餐超时');
KRLogUtil.kr_w('获取已订阅套餐超时', tag: 'PurchaseMembership');
},
);
print('💳 [PurchaseMembership] ✓ 步骤2完成');
//
await _kr_fetchPublicPaymentMethods();
print('💳 [PurchaseMembership] 步骤3: 开始获取套餐列表...');
await kr_fetchPackages().timeout(
const Duration(seconds: 8),
onTimeout: () {
print('💳 [PurchaseMembership] ❌ 获取套餐列表超时');
KRLogUtil.kr_e('获取套餐列表超时', tag: 'PurchaseMembership');
KRCommonUtil.kr_showToast('获取套餐列表超时,请检查网络');
},
);
print('💳 [PurchaseMembership] ✓ 步骤3完成套餐数量: ${kr_plans.length}');
//
kr_showPlanSelector.value = kr_plans.length > 1;
//
print('💳 [PurchaseMembership] 步骤4: 开始获取支付方式...');
await _kr_fetchPublicPaymentMethods().timeout(
const Duration(seconds: 5),
onTimeout: () {
print('💳 [PurchaseMembership] ⚠️ 获取支付方式超时');
KRLogUtil.kr_w('获取支付方式超时', tag: 'PurchaseMembership');
},
);
print('💳 [PurchaseMembership] ✓ 步骤4完成支付方式数量: ${kr_paymentMethods.length}');
//
kr_showPlanSelector.value = kr_plans.length > 1;
print('💳 [PurchaseMembership] ========== 所有步骤完成 ==========');
} catch (e, stackTrace) {
print('💳 [PurchaseMembership] ❌❌❌ 获取套餐数据失败: $e');
print('💳 [PurchaseMembership] StackTrace: $stackTrace');
KRLogUtil.kr_e('获取套餐数据失败: $e', tag: 'PurchaseMembership');
// 🔧 API失败时,
print('💳 [PurchaseMembership] 🔄 尝试切换域名并重试...');
bool domainSwitched = await KRDomain.kr_switchToNextDomain();
if (domainSwitched) {
print('💳 [PurchaseMembership] ✓ 域名切换成功,当前域名: ${KRDomain.kr_currentDomain}');
print('💳 [PurchaseMembership] 🔄 使用新域名重试...');
// HttpUtil baseUrl
HttpUtil.getInstance().updateBaseUrl();
// 500ms让域名生效
await Future.delayed(const Duration(milliseconds: 500));
//
try {
await kr_fetchPackages().timeout(
const Duration(seconds: 8),
onTimeout: () {
print('💳 [PurchaseMembership] ❌ 使用新域名后仍然超时');
KRLogUtil.kr_e('使用新域名后仍然超时', tag: 'PurchaseMembership');
},
);
print('💳 [PurchaseMembership] ✓ 使用新域名重试成功,套餐数量: ${kr_plans.length}');
} catch (retryError) {
print('💳 [PurchaseMembership] ❌ 使用新域名重试仍然失败: $retryError');
kr_errorMessage.value = '网络连接失败,请检查网络设置';
}
} else {
print('💳 [PurchaseMembership] ❌ 域名切换失败,所有域名都不可用');
kr_errorMessage.value = '无法连接服务器,请稍后重试';
}
} finally {
kr_isLoading.value = false;
print('💳 [PurchaseMembership] 加载状态设置为: false');
}
kr_isLoading.value = false;
}
///

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'dart:io' show Platform;
import 'package:flutter/foundation.dart' show kIsWeb;

View File

@ -28,7 +28,7 @@ import 'package:kaer_with_panels/app/modules/kr_home/controllers/kr_home_control
import 'package:kaer_with_panels/app/modules/kr_home/models/kr_home_views_status.dart';
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:kaer_with_panels/app/utils/kr_init_log_collector.dart';
// import 'package:kaer_with_panels/app/utils/kr_init_log_collector.dart';
class KRSplashController extends GetxController {
// 🔧
@ -311,115 +311,6 @@ class KRSplashController extends GetxController {
}
}
/// 🔧 Android 15
/// 使
Future<void> _executeMinimalInitialization() async {
try {
_initLog.logPhaseStart('降级初始化Minimal Initialization');
_initLog.logWarning('网络初始化失败,执行降级策略', tag: 'Splash');
KRLogUtil.kr_i('🛡️ 执行最小化初始化(降级模式)', tag: 'SplashController');
if (kDebugMode) {
print('🛡️ 执行最小化初始化(降级模式)');
}
// 1.
try {
_initLog.log('步骤1: 设置默认域名', tag: 'Minimal');
if (KRDomain.kr_currentDomain.isEmpty && KRDomain.kr_baseDomains.isNotEmpty) {
KRDomain.kr_currentDomain = KRDomain.kr_baseDomains[0];
_initLog.logSuccess('设置默认域名: ${KRDomain.kr_currentDomain}', tag: 'Minimal');
KRLogUtil.kr_i('✅ 设置默认域名: ${KRDomain.kr_currentDomain}', tag: 'SplashController');
if (kDebugMode) {
print('✅ 设置默认域名: ${KRDomain.kr_currentDomain}');
}
} else {
_initLog.log('当前域名: ${KRDomain.kr_currentDomain}', tag: 'Minimal');
}
} catch (e) {
_initLog.logError('设置默认域名失败', tag: 'Minimal', error: e);
KRLogUtil.kr_w('⚠️ 设置默认域名失败: $e', tag: 'SplashController');
}
// 2. SingBox
try {
_initLog.log('步骤2: 初始化 SingBox', tag: 'Minimal');
await KRSingBoxImp.instance.init().timeout(
const Duration(seconds: 3),
onTimeout: () {
_initLog.logWarning('SingBox 初始化超时(3秒)', tag: 'Minimal');
KRLogUtil.kr_w('SingBox 初始化超时', tag: 'SplashController');
if (kDebugMode) {
print('⏱️ SingBox 初始化超时');
}
},
);
_initLog.logSuccess('SingBox 初始化完成', tag: 'Minimal');
KRLogUtil.kr_i('✅ SingBox 初始化完成', tag: 'SplashController');
if (kDebugMode) {
print('✅ SingBox 初始化完成');
}
} catch (e) {
_initLog.logError('SingBox 初始化失败', tag: 'Minimal', error: e);
KRLogUtil.kr_w('⚠️ SingBox 初始化失败: $e', tag: 'SplashController');
if (kDebugMode) {
print('⚠️ SingBox 初始化失败: $e');
}
}
// 3.
try {
_initLog.log('步骤3: 加载本地用户信息', tag: 'Minimal');
await KRAppRunData.getInstance().kr_initializeUserInfo().timeout(
const Duration(seconds: 2),
onTimeout: () {
_initLog.logWarning('用户信息加载超时(2秒)', tag: 'Minimal');
KRLogUtil.kr_w('用户信息加载超时', tag: 'SplashController');
if (kDebugMode) {
print('⏱️ 用户信息加载超时');
}
},
);
_initLog.logSuccess('本地用户信息加载完成', tag: 'Minimal');
KRLogUtil.kr_i('✅ 本地用户信息加载完成', tag: 'SplashController');
if (kDebugMode) {
print('✅ 本地用户信息加载完成');
}
} catch (e) {
_initLog.logError('用户信息加载失败', tag: 'Minimal', error: e);
KRLogUtil.kr_w('⚠️ 用户信息加载失败: $e', tag: 'SplashController');
if (kDebugMode) {
print('⚠️ 用户信息加载失败: $e');
}
}
_initLog.logPhaseEnd('降级初始化Minimal Initialization', success: true);
_initLog.log('应用将以降级模式启动用户将看到基本UI', tag: 'Minimal');
_initLog.log('预期显示:订阅卡片 + 连接选项', tag: 'Minimal');
KRLogUtil.kr_i('✅ 最小化初始化完成,应用将以降级模式启动', tag: 'SplashController');
if (kDebugMode) {
print('✅ 最小化初始化完成,应用将以降级模式启动');
}
if (kDebugMode) {
print('📱 用户将看到基本UI订阅卡片 + 连接选项)');
}
// 🔧
// await _initLog.finalize(); //
if (kDebugMode && _initLog.getLogFilePath() != null) {
print('📁 初始化日志文件(保持打开): ${_initLog.getLogFilePath()}');
}
} catch (e) {
_initLog.logError('最小化初始化也失败', tag: 'Minimal', error: e);
KRLogUtil.kr_e('❌ 最小化初始化也失败: $e', tag: 'SplashController');
if (kDebugMode) {
print('❌ 最小化初始化也失败: $e');
}
// 使
// await _initLog.finalize(); //
}
}
///
void _handleError(String title, String message) {
kr_hasError.value = true;

View File

@ -2,20 +2,16 @@ import 'package:flutter/foundation.dart';
import 'package:loggy/loggy.dart';
///
/// 🔧 Android 15 Release
/// 🔒 Release模式下所有日志都不会输出
class KRLogUtil {
static final KRLogUtil _instance = KRLogUtil._internal();
factory KRLogUtil() => _instance;
KRLogUtil._internal();
/// 🔧 Release Android 15
/// false
static const bool _forceEnableReleaseLogging = true;
///
static void kr_init() {
// Debug
if (kDebugMode || _forceEnableReleaseLogging) {
// Debug
if (kDebugMode) {
Loggy.initLoggy(
logPrinter: PrettyPrinter(),
);
@ -23,49 +19,49 @@ class KRLogUtil {
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_d(String message, {String? tag}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'KRLogUtil'}').debug(message);
}
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_i(String message, {String? tag}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'KRLogUtil'}').info(message);
}
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_w(String message, {String? tag}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'KRLogUtil'}').warning(message);
}
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_e(String message, {String? tag, Object? error, StackTrace? stackTrace}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'KRLogUtil'}').error(message, error, stackTrace);
}
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_network(String message, {String? tag}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'Network'}').info(message);
}
}
///
/// 🔧 Debug
/// 🔒 Debug
static void kr_performance(String message, {String? tag}) {
if (kDebugMode || _forceEnableReleaseLogging) {
if (kDebugMode) {
Loggy('${tag ?? 'Performance'}').info(message);
}
}

View File

@ -23,30 +23,31 @@ class KRSubscribeNavigationUtil {
KRLogUtil.kr_i('是否设备登录: $isDeviceLogin', tag: tag);
if (isDeviceLogin) {
// -
KRLogUtil.kr_i('设备登录用户,显示绑定提示', tag: tag);
try {
KRDialog.show(
title: AppTranslations.kr_dialog.deviceLoginBindingTitle,
message: AppTranslations.kr_dialog.deviceLoginBindingMessage,
confirmText: AppTranslations.kr_dialog.kr_ok,
onConfirm: () {
//
KRLogUtil.kr_i('检测到设备登录,显示绑定提示', tag: tag);
KRDialog.show(
title: AppTranslations.kr_dialog.deviceLoginBindingTitle,
message: AppTranslations.kr_dialog.deviceLoginBindingMessage,
confirmText: AppTranslations.kr_dialog.kr_ok,
cancelText: AppTranslations.kr_dialog.kr_cancel,
onConfirm: () {
Get.back(); //
//
Future.delayed(const Duration(milliseconds: 300), () {
Get.toNamed(Routes.MR_LOGIN);
},
);
} catch (e) {
KRLogUtil.kr_e('显示绑定提示对话框失败: $e', tag: tag);
}
});
},
onCancel: () => Get.back(),
);
} else {
// -
// -
KRLogUtil.kr_i('普通用户,跳转到购买页面', tag: tag);
try {
// 🔧
Get.toNamed(Routes.KR_PURCHASE_MEMBERSHIP);
} catch (e) {
KRLogUtil.kr_e('跳转购买页面失败: $e', tag: tag);
//
KRDialog.show(
title: AppTranslations.kr_dialog.error,

View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
@ -50,36 +51,35 @@ class KRDialog extends StatelessWidget {
}
Widget _buildConfirmButton() {
// 🔧 Android 15 ScreenUtil使
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(23),
borderRadius: BorderRadius.circular(23.r),
boxShadow: [
BoxShadow(
color: const Color(0xFF1797FF).withOpacity(0.25),
blurRadius: 8,
offset: const Offset(0, 2),
blurRadius: 8.r,
offset: Offset(0, 2.w),
),
],
),
child: TextButton(
onPressed: () {
Get.back();
Get.back();
onConfirm?.call();
},
style: TextButton.styleFrom(
backgroundColor: const Color(0xFF1797FF),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(23),
borderRadius: BorderRadius.circular(23.r),
),
padding: EdgeInsets.zero,
minimumSize: const Size.fromHeight(46),
minimumSize: Size.fromHeight(46.w),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
child: Text(
confirmText ?? AppTranslations.kr_dialog.kr_confirm,
style: const TextStyle(
fontSize: 15,
style: TextStyle(
fontSize: 15.sp,
fontWeight: FontWeight.w500,
color: Colors.white,
fontFamily: 'AlibabaPuHuiTi-Medium',
@ -94,27 +94,26 @@ class KRDialog extends StatelessWidget {
final theme = Theme.of(context);
final isDark = theme.brightness == Brightness.dark;
// 🔧 Android 15 ScreenUtil使
return Dialog(
backgroundColor: theme.cardColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(12.r),
),
child: Container(
width: 280,
padding: const EdgeInsets.all(24),
width: 280.w,
padding: EdgeInsets.all(24.w),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
if (icon != null) ...[
icon!,
const SizedBox(height: 20),
SizedBox(height: 20.h),
],
if (title != null) ...[
Text(
title!,
style: TextStyle(
fontSize: 17,
fontSize: 17.sp,
fontWeight: FontWeight.w600,
color: isDark ? Colors.white : const Color(0xFF333333),
fontFamily: 'AlibabaPuHuiTi-Medium',
@ -122,17 +121,17 @@ class KRDialog extends StatelessWidget {
),
textAlign: TextAlign.center,
),
const SizedBox(height: 12),
SizedBox(height: 12.h),
],
if (message != null || customMessageWidget != null) ...[
Container(
constraints: const BoxConstraints(maxHeight: 200),
constraints: BoxConstraints(maxHeight: 200.h),
child: SingleChildScrollView(
child: customMessageWidget ?? Text(
message!,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 14,
fontSize: 14.sp,
color: isDark ? const Color(0xFFCCCCCC) : const Color(0xFF666666),
fontFamily: 'AlibabaPuHuiTi-Regular',
height: 1.4,
@ -140,7 +139,7 @@ class KRDialog extends StatelessWidget {
),
),
),
const SizedBox(height: 28),
SizedBox(height: 28.h),
],
if (cancelText != null) ...[
Row(
@ -148,33 +147,33 @@ class KRDialog extends StatelessWidget {
Expanded(
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(23),
borderRadius: BorderRadius.circular(23.r),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.03),
blurRadius: 4,
offset: const Offset(0, 2),
blurRadius: 4.r,
offset: Offset(0, 2.w),
),
],
),
child: TextButton(
onPressed: () {
Get.back();
Get.back();
onCancel?.call();
},
style: TextButton.styleFrom(
backgroundColor: isDark ? const Color(0xFF222222) : const Color(0xFFEEEEEE),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(23),
borderRadius: BorderRadius.circular(23.r),
),
padding: EdgeInsets.zero,
minimumSize: const Size.fromHeight(46),
minimumSize: Size.fromHeight(46.w),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
child: Text(
cancelText ?? AppTranslations.kr_dialog.kr_cancel,
style: TextStyle(
fontSize: 15,
fontSize: 15.sp,
fontWeight: FontWeight.w500,
color: isDark ? const Color(0xFFBBBBBB) : const Color(0xFF666666),
fontFamily: 'AlibabaPuHuiTi-Medium',
@ -183,7 +182,7 @@ class KRDialog extends StatelessWidget {
),
),
),
const SizedBox(width: 12),
SizedBox(width: 12.w),
Expanded(child: _buildConfirmButton()),
],
),