@@ -29,7 +29,8 @@ GroupsState currentGroupsState(Ref ref) {
29
29
@riverpod
30
30
NavigationItemsState navigationsState (Ref ref) {
31
31
final openLogs = ref.watch (appSettingProvider).openLogs;
32
- final hasProxies = ref.watch (currentGroupsStateProvider.select ((state)=> state.value.isNotEmpty));
32
+ final hasProxies = ref.watch (
33
+ currentGroupsStateProvider.select ((state) => state.value.isNotEmpty));
33
34
return NavigationItemsState (
34
35
value: navigation.getItems (
35
36
openLogs: openLogs,
@@ -79,7 +80,7 @@ ClashConfigState clashConfigState(Ref ref) {
79
80
80
81
@riverpod
81
82
ProxyState proxyState (Ref ref) {
82
- final isStart = ref.watch (runTimeProvider.select ((state)=> state != null ));
83
+ final isStart = ref.watch (runTimeProvider.select ((state) => state != null ));
83
84
final networkProps = ref.watch (networkSettingProvider);
84
85
final mixedPort = ref.watch (
85
86
patchClashConfigProvider.select ((state) => state.mixedPort),
@@ -94,7 +95,7 @@ ProxyState proxyState(Ref ref) {
94
95
95
96
@riverpod
96
97
TrayState trayState (Ref ref) {
97
- final isStart = ref.watch (runTimeProvider.select ((state)=> state != null ));
98
+ final isStart = ref.watch (runTimeProvider.select ((state) => state != null ));
98
99
final networkProps = ref.watch (networkSettingProvider);
99
100
final clashConfig = ref.watch (
100
101
patchClashConfigProvider,
@@ -338,11 +339,13 @@ int? getDelay(
338
339
String ? testUrl,
339
340
}) {
340
341
final currentTestUrl = ref.watch (getRealTestUrlProvider (testUrl));
341
- return ref.watch (
342
+ final realProxyName = ref.watch (getRealProxyNameProvider (proxyName));
343
+ final delay = ref.watch (
342
344
delayDataSourceProvider.select (
343
- (state) => state[currentTestUrl]? [proxyName ],
345
+ (state) => state[currentTestUrl]? [realProxyName ],
344
346
),
345
347
);
348
+ return delay;
346
349
}
347
350
348
351
@riverpod
@@ -407,7 +410,7 @@ String _getRealProxyName(
407
410
return _getRealProxyName (
408
411
groups,
409
412
selectedMap,
410
- proxyName ,
413
+ currentSelectedName ,
411
414
);
412
415
}
413
416
@@ -445,6 +448,7 @@ String getProxyDesc(Ref ref, Proxy proxy) {
445
448
final groups = ref.watch (groupsProvider);
446
449
final index = groups.indexWhere ((element) => element.name == proxy.name);
447
450
if (index == - 1 ) return proxy.type;
448
- return "${proxy .type }(${groups [index ].now ?? '*' })" ;
451
+ final realProxyName = ref.watch (getRealProxyNameProvider (proxy.name));
452
+ return "${proxy .type }(${realProxyName .isNotEmpty ? realProxyName : '*' })" ;
449
453
}
450
454
}
0 commit comments