diff --git a/client/lib/state/account_providers.dart b/client/lib/state/account_providers.dart index 8cf5fe0..42e9e3d 100644 --- a/client/lib/state/account_providers.dart +++ b/client/lib/state/account_providers.dart @@ -40,11 +40,19 @@ class MeNotifier extends AsyncNotifier { return ref.read(accountApiProvider).me(); } - /// 手动刷新(如连接/兑换后)。 + /// 手动刷新(如兑换后 / 下拉刷新)。会短暂进 loading 态(触发整页转圈)。 Future refresh() async { state = const AsyncLoading(); state = await AsyncValue.guard(() => ref.read(accountApiProvider).me()); } + + /// 静默刷新:不进 loading 态、成功才替换。供连接期/断开后刷新「今日剩余」用, + /// 避免 refresh() 的 AsyncLoading 让连接页整页闪 spinner(meLoadingProvider)。 + Future silentRefresh() async { + if (!ref.read(authProvider).isLoggedIn) return; + final next = await AsyncValue.guard(() => ref.read(accountApiProvider).me()); + if (next is AsyncData) state = next; + } } final meProvider = AsyncNotifierProvider(MeNotifier.new); diff --git a/client/lib/state/connection_provider.dart b/client/lib/state/connection_provider.dart index 560cdf0..a134f0f 100644 --- a/client/lib/state/connection_provider.dart +++ b/client/lib/state/connection_provider.dart @@ -19,6 +19,7 @@ import '../services/api_config.dart'; import '../services/auth_api.dart'; import '../services/connect_api.dart'; import '../services/device_identity.dart'; +import 'account_providers.dart'; import 'app_providers.dart'; import 'auth_provider.dart'; import 'nodes_provider.dart'; @@ -278,12 +279,26 @@ class ConnectionController extends StateNotifier { } catch (_) {} // 携带 _offNotice(节点异常/null);与 kernel off 读同一字段,不互相覆盖。 if (mounted) state = ConnectionState(phase: VpnPhase.off, error: _offNotice); + _refreshQuota(); // 会话结束 → 刷新「今日剩余」反映本次消耗 + } + + // 静默刷新 /me(不闪整页 spinner),让免费额度「今日剩余」跨会话/跨设备更新。 + void _refreshQuota() { + if (_ref.read(authProvider).isLoggedIn && _ref.read(isFreePlanProvider)) { + unawaited(_ref.read(meProvider.notifier).silentRefresh()); + } } void _onKernelStatus(VpnStatus s) { if (!mounted) return; switch (s) { case VpnStatus.on: + // 免费版:若本次「on」不是经 _connect 而来(如 Android 常驻隧道、app 重启后 + // 自动同步到已在跑的隧道),_freeRemainingSec 还是 null → 倒计时不启。这里兜底 + // 按当前额度补锁定,保证连接页显示的是倒计时(会变)而非静态「今日剩余」。 + if (_freeRemainingSec == null && _ref.read(isFreePlanProvider)) { + _freeRemainingSec = _ref.read(quotaProvider).remainingMinutes * 60; + } state = state.copyWith(phase: VpnPhase.on); _startElapsed(); _startWatchdog(); @@ -306,6 +321,7 @@ class ConnectionController extends StateNotifier { _userDisconnect = false; _stopElapsed(); _stopWatchdog(); + _refreshQuota(); // 内核掉线也算会话结束 → 刷新「今日剩余」 } } diff --git a/client/lib/state/quota_provider.dart b/client/lib/state/quota_provider.dart index 8adf924..d63c2d2 100644 --- a/client/lib/state/quota_provider.dart +++ b/client/lib/state/quota_provider.dart @@ -12,7 +12,6 @@ import 'package:uuid/uuid.dart'; import '../services/device_identity.dart'; import 'account_providers.dart'; -import 'auth_provider.dart'; /// 免费额度快照。 class FreeQuotaState { @@ -68,12 +67,10 @@ class QuotaController extends StateNotifier { state = FreeQuotaState(totalMinutes: total, remainingMinutes: remaining); } - /// 连接期倒计时归零 → 本地立即置耗尽(按钮随即灰化);登录态下再拉 me 让服务端权威同步。 + /// 连接期倒计时归零 → 本地立即置耗尽(按钮随即灰化);登录态下再静默拉 me 让服务端权威同步。 void markExhausted() { state = state.copyWith(remainingMinutes: 0); - if (_ref.read(authProvider).isLoggedIn) { - _ref.read(meProvider.notifier).refresh(); - } + _ref.read(meProvider.notifier).silentRefresh(); } /// 看广告加时:调 /v1/ads/unlock 累加分钟,成功后刷新 me 拿最新额度。 @@ -85,9 +82,9 @@ class QuotaController extends StateNotifier { deviceId: deviceId, adToken: const Uuid().v4(), // 占位 ad_token(DevVerifier 放行) ); - // 乐观置位剩余,再拉 me 校准(账户共享,以服务端为准)。 + // 乐观置位剩余,再静默拉 me 校准(账户共享,以服务端为准;不闪整页 spinner)。 state = state.copyWith(remainingMinutes: res.minutesRemaining); - await _ref.read(meProvider.notifier).refresh(); + await _ref.read(meProvider.notifier).silentRefresh(); return res.grantedMinutes; } catch (_) { return null; diff --git a/client/pubspec.yaml b/client/pubspec.yaml index eb23059..df6328a 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -1,7 +1,7 @@ name: pangolin_vpn description: 穿山甲 · Pangolin — 极简、稳定、跨平台网络加速客户端。 publish_to: "none" -version: 1.0.45+46 +version: 1.0.46+47 environment: sdk: ^3.5.0 diff --git a/client/windows/installer/pangolin.iss b/client/windows/installer/pangolin.iss index 7ec787d..f71880f 100644 --- a/client/windows/installer/pangolin.iss +++ b/client/windows/installer/pangolin.iss @@ -3,7 +3,7 @@ ; 前置: 先在 client/ 跑 `flutter build windows`(Release),产物在 ; ..\..\build\windows\x64\runner\Release #define MyAppName "穿山甲 Pangolin" -#define MyAppVersion "1.0.45" +#define MyAppVersion "1.0.46" #define MyAppPublisher "Pangolin" #define MyAppExeName "pangolin_vpn.exe" #define BuildDir "..\..\build\windows\x64\runner\Release"