解决kr_start() 方法中缺少对分组数据流的订阅
Some checks failed
Build Android APK / 编译 libcore.aar (push) Has been cancelled
Build Android APK / 编译 Android APK (release) (push) Has been cancelled
Build Android APK / 创建 GitHub Release (push) Has been cancelled
Build Multi-Platform / 编译 libcore (iOS/tvOS) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Android) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Windows) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (macOS) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Linux) (push) Has been cancelled
Build Multi-Platform / 构建 Android APK (push) Has been cancelled
Build Multi-Platform / 构建 Windows (push) Has been cancelled
Build Multi-Platform / 构建 macOS (push) Has been cancelled
Build Multi-Platform / 构建 Linux (push) Has been cancelled
Build Multi-Platform / 构建 iOS (push) Has been cancelled
Build Multi-Platform / 创建 Release (push) Has been cancelled
Build Windows / 编译 libcore (Windows) (push) Has been cancelled
Build Windows / build (push) Has been cancelled
Some checks failed
Build Android APK / 编译 libcore.aar (push) Has been cancelled
Build Android APK / 编译 Android APK (release) (push) Has been cancelled
Build Android APK / 创建 GitHub Release (push) Has been cancelled
Build Multi-Platform / 编译 libcore (iOS/tvOS) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Android) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Windows) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (macOS) (push) Has been cancelled
Build Multi-Platform / 编译 libcore (Linux) (push) Has been cancelled
Build Multi-Platform / 构建 Android APK (push) Has been cancelled
Build Multi-Platform / 构建 Windows (push) Has been cancelled
Build Multi-Platform / 构建 macOS (push) Has been cancelled
Build Multi-Platform / 构建 Linux (push) Has been cancelled
Build Multi-Platform / 构建 iOS (push) Has been cancelled
Build Multi-Platform / 创建 Release (push) Has been cancelled
Build Windows / 编译 libcore (Windows) (push) Has been cancelled
Build Windows / build (push) Has been cancelled
This commit is contained in:
parent
7cd022093b
commit
c7b77c1ad8
@ -530,8 +530,6 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
void _bindConnectionStatus() {
|
void _bindConnectionStatus() {
|
||||||
// 添加更详细的状态监听
|
// 添加更详细的状态监听
|
||||||
ever(KRSingBoxImp.instance.kr_status, (status) {
|
ever(KRSingBoxImp.instance.kr_status, (status) {
|
||||||
if (kDebugMode) {
|
|
||||||
}
|
|
||||||
KRLogUtil.kr_i('🔄 连接状态变化: $status', tag: 'HomeController');
|
KRLogUtil.kr_i('🔄 连接状态变化: $status', tag: 'HomeController');
|
||||||
KRLogUtil.kr_i('📊 当前状态类型: ${status.runtimeType}', tag: 'HomeController');
|
KRLogUtil.kr_i('📊 当前状态类型: ${status.runtimeType}', tag: 'HomeController');
|
||||||
|
|
||||||
@ -1159,50 +1157,110 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 获取当前节点国家
|
/// 获取当前节点国家
|
||||||
/// 🔧 修复:使用 kr_cutTag 而不是 kr_cutSeletedTag,确保UI立即响应
|
/// 🔧 修复:优先使用 kr_cutSeletedTag,避免依赖可能为空的 kr_activeGroups
|
||||||
/// 🔧 修复:处理 "auto" 等特殊标签,从活动组中获取实际选中的节点
|
/// 策略:
|
||||||
|
/// 1. 如果 kr_cutTag 不是 auto,直接使用(用户手动选择的节点)
|
||||||
|
/// 2. 如果是 auto,优先使用 kr_cutSeletedTag(保存了实际选中的节点)
|
||||||
|
/// 3. 如果 kr_cutSeletedTag 也是 auto 或空,再尝试从 kr_activeGroups 获取
|
||||||
String kr_getCurrentNodeCountry() {
|
String kr_getCurrentNodeCountry() {
|
||||||
KRLogUtil.kr_i('========== 开始获取国家代码 ==========', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('========== 开始获取国家代码 ==========', tag: 'getCurrentNodeCountry');
|
||||||
KRLogUtil.kr_i('kr_cutTag: ${kr_cutTag.value}', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('kr_cutTag: ${kr_cutTag.value}', tag: 'getCurrentNodeCountry');
|
||||||
KRLogUtil.kr_i('kr_cutSeletedTag: ${kr_cutSeletedTag.value}', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('kr_cutSeletedTag: ${kr_cutSeletedTag.value}', tag: 'getCurrentNodeCountry');
|
||||||
KRLogUtil.kr_i('keyList 节点总数: ${kr_subscribeService.keyList.length}', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('keyList 节点总数: ${kr_subscribeService.keyList.length}', tag: 'getCurrentNodeCountry');
|
||||||
|
|
||||||
if (kr_cutTag.isEmpty) {
|
String actualTag;
|
||||||
KRLogUtil.kr_w('kr_cutTag 为空,返回空字符串', tag: 'getCurrentNodeCountry');
|
|
||||||
return '';
|
// 🔧 优先策略:
|
||||||
|
// 1. 如果 kr_cutTag 不是 auto,直接使用(用户手动选择的节点)
|
||||||
|
if (kr_cutTag.value != 'auto' && kr_cutTag.value != 'select' && kr_cutTag.value.isNotEmpty) {
|
||||||
|
// 用户手动选择了具体节点
|
||||||
|
actualTag = kr_cutTag.value;
|
||||||
|
KRLogUtil.kr_i('✅ 使用手动选择的节点: $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
}
|
}
|
||||||
|
// 2. 如果是 auto,优先使用 kr_cutSeletedTag(保存了实际选中的节点)
|
||||||
String actualTag = kr_cutTag.value;
|
else if (kr_cutSeletedTag.value.isNotEmpty &&
|
||||||
|
kr_cutSeletedTag.value != 'auto' &&
|
||||||
// 🔧 修复:如果是 "auto" 或其他选择器组,从活动组中获取实际选中的节点
|
kr_cutSeletedTag.value != 'select') {
|
||||||
if (actualTag == 'auto' || actualTag == 'select') {
|
// auto 模式下,使用保存的实际节点
|
||||||
|
actualTag = kr_cutSeletedTag.value;
|
||||||
|
KRLogUtil.kr_i('✅ 使用 auto 模式下的实际节点 (kr_cutSeletedTag): $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
|
}
|
||||||
|
// 3. 降级:尝试从活动组获取
|
||||||
|
else {
|
||||||
try {
|
try {
|
||||||
KRLogUtil.kr_i('检测到特殊标签: $actualTag,尝试从活动组获取实际节点', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('⚠️ 尝试从活动组获取实际节点', tag: 'getCurrentNodeCountry');
|
||||||
KRLogUtil.kr_i('活动组数量: ${KRSingBoxImp.instance.kr_activeGroups.length}', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('活动组数量: ${KRSingBoxImp.instance.kr_activeGroups.length}', tag: 'getCurrentNodeCountry');
|
||||||
|
|
||||||
// 从 SingBox 活动组中找到 "select" 选择器组
|
// 🔧 修复:活动组为空时,尝试使用 allGroups
|
||||||
final selectGroup = KRSingBoxImp.instance.kr_activeGroups.firstWhere(
|
if (KRSingBoxImp.instance.kr_activeGroups.isEmpty) {
|
||||||
(group) => group.tag == 'select',
|
print('[getCurrentNodeCountry] ⚠️ 活动组为空,尝试使用 allGroups');
|
||||||
orElse: () => throw Exception('未找到 select 组'),
|
KRLogUtil.kr_w('⚠️ 活动组为空,尝试使用 allGroups', tag: 'getCurrentNodeCountry');
|
||||||
);
|
|
||||||
|
|
||||||
KRLogUtil.kr_i('找到 select 组,当前选中: ${selectGroup.selected}', tag: 'getCurrentNodeCountry');
|
final allGroups = KRSingBoxImp.instance.kr_allGroups;
|
||||||
|
print('[getCurrentNodeCountry] allGroups 数量: ${allGroups.length}');
|
||||||
|
if (allGroups.isEmpty) {
|
||||||
|
print('[getCurrentNodeCountry] ❌ allGroups 也为空,返回空字符串');
|
||||||
|
KRLogUtil.kr_w('❌ allGroups 也为空,返回空字符串', tag: 'getCurrentNodeCountry');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// 从 allGroups 中查找 select 组
|
||||||
|
final selectGroup = allGroups.firstWhere(
|
||||||
|
(group) => group.tag == 'select',
|
||||||
|
orElse: () => throw Exception('未找到 select 组'),
|
||||||
|
);
|
||||||
|
print('[getCurrentNodeCountry] selectGroup.selected: ${selectGroup.selected}');
|
||||||
|
|
||||||
|
if (selectGroup.selected.isEmpty || selectGroup.selected == 'auto' || selectGroup.selected == 'select') {
|
||||||
|
print('[getCurrentNodeCountry] select 组选中的是 auto,查找 urltest 组');
|
||||||
|
// 如果 select 组选中的是 auto,从 urltest 组获取
|
||||||
|
final urlTestGroup = allGroups.firstWhere(
|
||||||
|
(group) => group.type == ProxyType.urltest,
|
||||||
|
orElse: () => throw Exception('未找到 urltest 组'),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (urlTestGroup.selected.isNotEmpty) {
|
||||||
|
actualTag = urlTestGroup.selected;
|
||||||
|
print('[getCurrentNodeCountry] ✅ 从 allGroups 的 urltest 组获取节点: $actualTag');
|
||||||
|
KRLogUtil.kr_i('✅ 从 allGroups 的 urltest 组获取节点: $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
|
} else {
|
||||||
|
print('[getCurrentNodeCountry] ❌ urltest 组的 selected 也为空');
|
||||||
|
KRLogUtil.kr_w('❌ urltest 组的 selected 也为空', tag: 'getCurrentNodeCountry');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
actualTag = selectGroup.selected;
|
||||||
|
print('[getCurrentNodeCountry] ✅ 从 allGroups 的 select 组获取节点: $actualTag');
|
||||||
|
KRLogUtil.kr_i('✅ 从 allGroups 的 select 组获取节点: $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 活动组不为空,从活动组获取
|
||||||
|
// 从 SingBox 活动组中找到 "select" 选择器组
|
||||||
|
final selectGroup = KRSingBoxImp.instance.kr_activeGroups.firstWhere(
|
||||||
|
(group) => group.tag == 'select',
|
||||||
|
orElse: () => throw Exception('未找到 select 组'),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (selectGroup.selected.isEmpty) {
|
||||||
|
KRLogUtil.kr_w('❌ select 组的 selected 为空', tag: 'getCurrentNodeCountry');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
// 获取该组当前选中的实际节点标签
|
|
||||||
if (selectGroup.selected.isNotEmpty) {
|
|
||||||
actualTag = selectGroup.selected;
|
actualTag = selectGroup.selected;
|
||||||
KRLogUtil.kr_i('从 select 组获取实际节点: $actualTag', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('✅ 从活动组获取节点: $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
KRLogUtil.kr_w('获取实际节点失败: $e', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_e('❌ 从活动组获取节点失败: $e', tag: 'getCurrentNodeCountry');
|
||||||
// 失败时使用 kr_cutSeletedTag 作为备选
|
return '';
|
||||||
if (kr_cutSeletedTag.value.isNotEmpty && kr_cutSeletedTag.value != 'auto') {
|
|
||||||
actualTag = kr_cutSeletedTag.value;
|
|
||||||
KRLogUtil.kr_i('使用 kr_cutSeletedTag 作为备选: $actualTag', tag: 'getCurrentNodeCountry');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 验证 actualTag 是否有效
|
||||||
|
if (actualTag.isEmpty) {
|
||||||
|
KRLogUtil.kr_w('❌ 节点标签为空', tag: 'getCurrentNodeCountry');
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
// 使用实际节点标签查找国家代码
|
// 使用实际节点标签查找国家代码
|
||||||
KRLogUtil.kr_i('查找节点: $actualTag', tag: 'getCurrentNodeCountry');
|
KRLogUtil.kr_i('查找节点: $actualTag', tag: 'getCurrentNodeCountry');
|
||||||
final node = kr_subscribeService.keyList[actualTag];
|
final node = kr_subscribeService.keyList[actualTag];
|
||||||
@ -1232,6 +1290,7 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
return node.country;
|
return node.country;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// 获取真实连接的节点信息(auto 模式下获取实际连接的节点)
|
/// 获取真实连接的节点信息(auto 模式下获取实际连接的节点)
|
||||||
Map<String, dynamic> kr_getRealConnectedNodeInfo() {
|
Map<String, dynamic> kr_getRealConnectedNodeInfo() {
|
||||||
// 如果不是 auto 模式,直接返回当前选中的节点信息
|
// 如果不是 auto 模式,直接返回当前选中的节点信息
|
||||||
@ -1284,6 +1343,8 @@ class KRHomeController extends GetxController with WidgetsBindingObserver {
|
|||||||
String kr_getRealConnectedNodeCountry() {
|
String kr_getRealConnectedNodeCountry() {
|
||||||
final info = kr_getRealConnectedNodeInfo();
|
final info = kr_getRealConnectedNodeInfo();
|
||||||
final delay = kr_currentNodeLatency.value;
|
final delay = kr_currentNodeLatency.value;
|
||||||
|
final country1 = kr_getCurrentNodeCountry();
|
||||||
|
print('country----$country1');
|
||||||
final country = kr_getCountryFullName(info['country']);
|
final country = kr_getCountryFullName(info['country']);
|
||||||
if (delay == -2) {
|
if (delay == -2) {
|
||||||
return '--';
|
return '--';
|
||||||
|
|||||||
@ -77,8 +77,6 @@ class KRSingBoxImp {
|
|||||||
/// 是否自动自动选择线路
|
/// 是否自动自动选择线路
|
||||||
final kr_isAutoOutbound = false.obs;
|
final kr_isAutoOutbound = false.obs;
|
||||||
|
|
||||||
bool _initialized = false;
|
|
||||||
|
|
||||||
/// 连接类型
|
/// 连接类型
|
||||||
final kr_connectionType = KRConnectionType.rule.obs;
|
final kr_connectionType = KRConnectionType.rule.obs;
|
||||||
|
|
||||||
@ -148,12 +146,6 @@ class KRSingBoxImp {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (_initialized) {
|
|
||||||
KRLogUtil.kr_i('SingBox 已经初始化,跳过重复初始化');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
_initialized = true;
|
|
||||||
|
|
||||||
KRLogUtil.kr_i('开始初始化 SingBox');
|
KRLogUtil.kr_i('开始初始化 SingBox');
|
||||||
// 在应用启动时初始化
|
// 在应用启动时初始化
|
||||||
await KRCountryUtil.kr_init();
|
await KRCountryUtil.kr_init();
|
||||||
@ -620,8 +612,7 @@ class KRSingBoxImp {
|
|||||||
|
|
||||||
/// 订阅分组数据流
|
/// 订阅分组数据流
|
||||||
void _kr_subscribeToGroups() {
|
void _kr_subscribeToGroups() {
|
||||||
KRLogUtil.kr_i('🛰 启动分组监听 watchActiveGroups / watchGroups', tag: 'SingBox');
|
print('[_kr_subscribeToGroups] 🚀 开始订阅分组数据流');
|
||||||
|
|
||||||
// 取消之前的分组订阅
|
// 取消之前的分组订阅
|
||||||
for (var sub in _kr_subscriptions) {
|
for (var sub in _kr_subscriptions) {
|
||||||
if (sub.hashCode.toString().contains('Groups')) {
|
if (sub.hashCode.toString().contains('Groups')) {
|
||||||
@ -634,6 +625,7 @@ class KRSingBoxImp {
|
|||||||
_kr_subscriptions.add(
|
_kr_subscriptions.add(
|
||||||
kr_singBox.watchActiveGroups().listen(
|
kr_singBox.watchActiveGroups().listen(
|
||||||
(groups) {
|
(groups) {
|
||||||
|
print('[watchActiveGroups] 📡 收到活动组更新,数量: ${groups.length}');
|
||||||
KRLogUtil.kr_i('📡 收到活动组更新,数量: ${groups.length}', tag: 'SingBox');
|
KRLogUtil.kr_i('📡 收到活动组更新,数量: ${groups.length}', tag: 'SingBox');
|
||||||
kr_activeGroups.value = groups;
|
kr_activeGroups.value = groups;
|
||||||
|
|
||||||
@ -650,6 +642,7 @@ class KRSingBoxImp {
|
|||||||
KRLogUtil.kr_i('✅ 活动组处理完成', tag: 'SingBox');
|
KRLogUtil.kr_i('✅ 活动组处理完成', tag: 'SingBox');
|
||||||
},
|
},
|
||||||
onError: (error) {
|
onError: (error) {
|
||||||
|
print('[watchActiveGroups] ❌ 活动分组监听错误: $error');
|
||||||
KRLogUtil.kr_e('❌ 活动分组监听错误: $error', tag: 'SingBox');
|
KRLogUtil.kr_e('❌ 活动分组监听错误: $error', tag: 'SingBox');
|
||||||
},
|
},
|
||||||
cancelOnError: false,
|
cancelOnError: false,
|
||||||
@ -659,14 +652,22 @@ class KRSingBoxImp {
|
|||||||
_kr_subscriptions.add(
|
_kr_subscriptions.add(
|
||||||
kr_singBox.watchGroups().listen(
|
kr_singBox.watchGroups().listen(
|
||||||
(groups) {
|
(groups) {
|
||||||
|
print('[watchGroups] 📡 收到所有组更新,数量: ${groups.length}');
|
||||||
kr_allGroups.value = groups;
|
kr_allGroups.value = groups;
|
||||||
|
// 打印每个组的基本信息
|
||||||
|
for (int i = 0; i < groups.length; i++) {
|
||||||
|
final group = groups[i];
|
||||||
|
print('[watchGroups] 组[$i]: tag=${group.tag}, type=${group.type}, selected=${group.selected}');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onError: (error) {
|
onError: (error) {
|
||||||
|
print('[watchGroups] ❌ 所有分组监听错误: $error');
|
||||||
KRLogUtil.kr_e('所有分组监听错误: $error');
|
KRLogUtil.kr_e('所有分组监听错误: $error');
|
||||||
},
|
},
|
||||||
cancelOnError: false,
|
cancelOnError: false,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
print('[_kr_subscribeToGroups] ✅ 分组数据流订阅完成,当前订阅数: ${_kr_subscriptions.length}');
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 验证节点选择是否生效
|
/// 验证节点选择是否生效
|
||||||
@ -1128,7 +1129,7 @@ class KRSingBoxImp {
|
|||||||
|
|
||||||
KRLogUtil.kr_i('✅ SingBox 核心已启动,开始初始化 command client', tag: 'SingBox');
|
KRLogUtil.kr_i('✅ SingBox 核心已启动,开始初始化 command client', tag: 'SingBox');
|
||||||
|
|
||||||
// 🔑 在后台延迟订阅统计流,避免阻塞 UI
|
// 🔑 在后台延迟订阅统计流和分组流,避免阻塞 UI
|
||||||
Future.delayed(const Duration(milliseconds: 1000), () async {
|
Future.delayed(const Duration(milliseconds: 1000), () async {
|
||||||
try {
|
try {
|
||||||
KRLogUtil.kr_i('📊 开始订阅统计数据流...', tag: 'SingBox');
|
KRLogUtil.kr_i('📊 开始订阅统计数据流...', tag: 'SingBox');
|
||||||
@ -1147,6 +1148,24 @@ class KRSingBoxImp {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 🔧 关键修复:订阅分组数据流
|
||||||
|
try {
|
||||||
|
KRLogUtil.kr_i('📋 开始订阅分组数据流...', tag: 'SingBox');
|
||||||
|
_kr_subscribeToGroups();
|
||||||
|
KRLogUtil.kr_i('✅ 分组数据流订阅成功', tag: 'SingBox');
|
||||||
|
} catch (e) {
|
||||||
|
KRLogUtil.kr_w('⚠️ 分组数据流订阅失败(稍后重试): $e', tag: 'SingBox');
|
||||||
|
// 如果第一次失败,再等待一段时间重试
|
||||||
|
Future.delayed(const Duration(milliseconds: 2000), () {
|
||||||
|
try {
|
||||||
|
_kr_subscribeToGroups();
|
||||||
|
KRLogUtil.kr_i('✅ 分组数据流重试订阅成功', tag: 'SingBox');
|
||||||
|
} catch (e2) {
|
||||||
|
KRLogUtil.kr_e('❌ 分组数据流重试订阅失败: $e2', tag: 'SingBox');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// 🔧 关键修复:恢复用户选择的节点
|
// 🔧 关键修复:恢复用户选择的节点
|
||||||
try {
|
try {
|
||||||
final selectedNode = await KRSecureStorage().kr_readData(key: _keySelectedNode);
|
final selectedNode = await KRSecureStorage().kr_readData(key: _keySelectedNode);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user