Skip to content

Commit 7d3ec16

Browse files
committed
Fix proxy card delay view issues
1 parent eada271 commit 7d3ec16

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

lib/controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class AppController {
220220
}
221221

222222
getRealProxyName(proxyName) {
223-
return _ref.read(getRealTestUrlProvider(proxyName));
223+
return _ref.read(getRealProxyNameProvider(proxyName));
224224
}
225225

226226
getSelectedProxyName(groupName) {

lib/providers/generated/state.g.dart

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/providers/state.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ GroupsState currentGroupsState(Ref ref) {
2929
@riverpod
3030
NavigationItemsState navigationsState(Ref ref) {
3131
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));
3334
return NavigationItemsState(
3435
value: navigation.getItems(
3536
openLogs: openLogs,
@@ -79,7 +80,7 @@ ClashConfigState clashConfigState(Ref ref) {
7980

8081
@riverpod
8182
ProxyState proxyState(Ref ref) {
82-
final isStart = ref.watch(runTimeProvider.select((state)=>state != null));
83+
final isStart = ref.watch(runTimeProvider.select((state) => state != null));
8384
final networkProps = ref.watch(networkSettingProvider);
8485
final mixedPort = ref.watch(
8586
patchClashConfigProvider.select((state) => state.mixedPort),
@@ -94,7 +95,7 @@ ProxyState proxyState(Ref ref) {
9495

9596
@riverpod
9697
TrayState trayState(Ref ref) {
97-
final isStart = ref.watch(runTimeProvider.select((state)=>state != null));
98+
final isStart = ref.watch(runTimeProvider.select((state) => state != null));
9899
final networkProps = ref.watch(networkSettingProvider);
99100
final clashConfig = ref.watch(
100101
patchClashConfigProvider,
@@ -338,11 +339,13 @@ int? getDelay(
338339
String? testUrl,
339340
}) {
340341
final currentTestUrl = ref.watch(getRealTestUrlProvider(testUrl));
341-
return ref.watch(
342+
final realProxyName = ref.watch(getRealProxyNameProvider(proxyName));
343+
final delay = ref.watch(
342344
delayDataSourceProvider.select(
343-
(state) => state[currentTestUrl]?[proxyName],
345+
(state) => state[currentTestUrl]?[realProxyName],
344346
),
345347
);
348+
return delay;
346349
}
347350

348351
@riverpod
@@ -407,7 +410,7 @@ String _getRealProxyName(
407410
return _getRealProxyName(
408411
groups,
409412
selectedMap,
410-
proxyName,
413+
currentSelectedName,
411414
);
412415
}
413416

@@ -445,6 +448,7 @@ String getProxyDesc(Ref ref, Proxy proxy) {
445448
final groups = ref.watch(groupsProvider);
446449
final index = groups.indexWhere((element) => element.name == proxy.name);
447450
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 : '*'})";
449453
}
450454
}

lib/widgets/input.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ class ListPage<T> extends StatelessWidget {
320320

321321
@override
322322
Widget build(BuildContext context) {
323-
print("daad===>$items");
324323
return FloatLayout(
325324
floatingWidget: FloatWrapper(
326325
child: FloatingActionButton(

0 commit comments

Comments
 (0)