diff --git a/AGENTS.md b/AGENTS.md index 31f276f..766bdb4 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -351,34 +351,12 @@ static const String kBaseUrl = 'http://:/api/v1/open/'; | `register` | `/register/sms/code` | 注册页 | | `resetPassword` | `/reset-password/sms/code` | 忘记密码页 | -### 17 解耦适配 +## 17. Cupertino 与 Material 分包 -```dart -import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; -``` -都变更为 -```dart -import 'package:material_ui/material_ui.dart'; -import 'package:cupertino_ui/cupertino_ui.dart'; -``` +- 全项目手写 Dart 代码(含测试)统一从 `package:cupertino_ui/cupertino_ui.dart` 导入 Cupertino 组件,从 `package:material_ui/material_ui.dart` 导入 Material 组件。禁止直接导入 `package:flutter/cupertino.dart` 和 `package:flutter/material.dart`。Flutter 核心 API 仍按需使用 `widgets.dart`、`services.dart` 等库。 +- 在应用根组件注册 `AppLocalizations.delegate` 和 `...GlobalMaterialLocalizations.delegates`。后者来自 `material_ui`,覆盖分包后的 Material、Cupertino 和 Widgets 委托。业务页面复用根节点委托,避免重复注册或混入 SDK 的同名委托。 +- `flutter gen-l10n` 目前生成的文件仍依赖 SDK 的 `flutter_localizations`,保留该 SDK 依赖。业务代码只使用生成的 `AppLocalizations.delegate`、`supportedLocales` 和文案接口,应用入口使用上述分包委托。不要手改生成文件。 +- 仍依赖旧设计组件库的第三方组件使用官方 `MaterialUiCompatibilityBridge` 或 `CupertinoUiCompatibilityBridge` 接入。第三方组件迁移后可移除对应兼容桥。 +- `pubspec.yaml` 为两个设计包声明明确的兼容版本范围,应用提交锁文件。升级包后验证中英文委托、弹窗和第三方组件。 -flutter_localizations也被拆分,Material和Cupertino的本地化委托分别移进了对应的包。 - -迁移前: -```dart -import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:flutter/material.dart'; - -localizationsDelegates: const >[ - GlobalCupertinoLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, -], -``` -迁移后: -```dart -import 'package:material_ui/material_ui.dart'; - -localizationsDelegates: GlobalMaterialLocalizations.delegates, -``` \ No newline at end of file +参考:[cupertino_ui 迁移说明](https://pub.dev/packages/cupertino_ui#-migrating-existing-code-to-this-package)、[material_ui 迁移说明](https://pub.dev/packages/material_ui#-migrating-existing-code-to-this-package)。 diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index a4d8215..5169e4c 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -3,7 +3,6 @@ import java.io.FileInputStream plugins { id("com.android.application") - id("kotlin-android") // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id("dev.flutter.flutter-gradle-plugin") } @@ -17,7 +16,7 @@ if (keystorePropertiesFile.exists()) { android { namespace = "com.ttstd.familycare" - compileSdk = flutter.compileSdkVersion + compileSdk = 37 ndkVersion = flutter.ndkVersion compileOptions { @@ -25,17 +24,13 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "com.ttstd.familycare" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion + targetSdk = 37 versionCode = flutter.versionCode versionName = flutter.versionName } @@ -51,7 +46,9 @@ android { buildTypes { debug { - signingConfig = signingConfigs.getByName("own") + if (keystorePropertiesFile.exists()) { + signingConfig = signingConfigs.getByName("own") + } } release { // 使用自有签名配置 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 836c4a3..3de4775 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -15,6 +15,7 @@ + @@ -36,6 +37,8 @@ diff --git a/android/app/src/main/java/com/ttstd/familycare/MainActivity.java b/android/app/src/main/java/com/ttstd/familycare/MainActivity.java index 89e5b6c..5b6131c 100644 --- a/android/app/src/main/java/com/ttstd/familycare/MainActivity.java +++ b/android/app/src/main/java/com/ttstd/familycare/MainActivity.java @@ -1,7 +1,13 @@ package com.ttstd.familycare; import android.content.Intent; +import android.content.BroadcastReceiver; +import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.app.AlertDialog; import android.net.Uri; +import android.os.Build; +import android.provider.Settings; import androidx.annotation.NonNull; import io.flutter.embedding.android.FlutterActivity; @@ -10,6 +16,20 @@ import io.flutter.plugin.common.MethodChannel; public class MainActivity extends FlutterActivity { private static final String CHANNEL = "com.ttstd.familycare/app"; + private static final String LOCAL_NETWORK = "android.permission.ACCESS_LOCAL_NETWORK"; + private static final int LOCAL_NETWORK_REQUEST = 370; + private MethodChannel.Result localNetworkResult; + + @Override + public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) { + // WebRTC listens for this protected system broadcast on the Activity. + if (Build.VERSION.SDK_INT >= 33 && receiver != null && filter != null + && filter.countActions() == 1 + && filter.hasAction(Intent.ACTION_CONFIGURATION_CHANGED)) { + return super.registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED); + } + return super.registerReceiver(receiver, filter); + } @Override public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { @@ -21,6 +41,8 @@ public class MainActivity extends FlutterActivity { // 将应用退到后台而不销毁 Engine,实现热启动优化 moveTaskToBack(false); result.success(true); + } else if (call.method.equals("requestLocalNetwork")) { + requestLocalNetwork(result); } else if (call.method.equals("dialPhone")) { // 打开系统拨号盘拨打指定号码(ACTION_DIAL 无需拨号权限) String phone = call.argument("phone"); @@ -45,6 +67,69 @@ public class MainActivity extends FlutterActivity { ); } + private void requestLocalNetwork(MethodChannel.Result result) { + if (Build.VERSION.SDK_INT < 37 + || checkSelfPermission(LOCAL_NETWORK) == PackageManager.PERMISSION_GRANTED) { + result.success(true); + return; + } + if (localNetworkResult != null) { + result.success(false); + return; + } + localNetworkResult = result; + boolean showRationale = shouldShowRequestPermissionRationale(LOCAL_NETWORK); + boolean requested = getPreferences(MODE_PRIVATE).getBoolean("localNetworkRequested", false); + if (requested && !showRationale) { + new AlertDialog.Builder(this) + .setMessage("请在应用设置中允许访问局域网,以连接家庭关怀服务。") + .setPositiveButton("打开设置", (dialog, which) -> { + finishLocalNetworkRequest(false); + startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, + Uri.fromParts("package", getPackageName(), null))); + }) + .setNegativeButton(android.R.string.cancel, (dialog, which) -> finishLocalNetworkRequest(false)) + .setOnCancelListener(dialog -> finishLocalNetworkRequest(false)) + .show(); + } else if (showRationale) { + new AlertDialog.Builder(this) + .setMessage("登录和远程控制需要连接局域网中的家庭关怀服务。") + .setPositiveButton(android.R.string.ok, (dialog, which) -> promptLocalNetwork()) + .setNegativeButton(android.R.string.cancel, (dialog, which) -> finishLocalNetworkRequest(false)) + .setOnCancelListener(dialog -> finishLocalNetworkRequest(false)) + .show(); + } else { + promptLocalNetwork(); + } + } + + private void promptLocalNetwork() { + try { + requestPermissions(new String[]{LOCAL_NETWORK}, LOCAL_NETWORK_REQUEST); + } catch (SecurityException e) { + finishLocalNetworkRequest(false); + } + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, + @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (requestCode == LOCAL_NETWORK_REQUEST) { + if (grantResults.length > 0) { + getPreferences(MODE_PRIVATE).edit().putBoolean("localNetworkRequested", true).apply(); + } + finishLocalNetworkRequest(grantResults.length > 0 + && grantResults[0] == PackageManager.PERMISSION_GRANTED); + } + } + + private void finishLocalNetworkRequest(boolean granted) { + MethodChannel.Result result = localNetworkResult; + localNetworkResult = null; + if (result != null) result.success(granted); + } + /** * 注意:不再直接拦截 onBackPressed。 * 贪婪拦截会导致 Flutter 内部的 PopScope 失效,使得子页面(如 AppsPage)点击返回键时 diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..a7d7e74 --- /dev/null +++ b/android/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,7 @@ + + + + + 192.168.100.244 + + diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 99de329..2d65c37 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -22,6 +22,15 @@ subprojects { val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) project.layout.buildDirectory.value(newSubprojectBuildDir) } +// 百度地图等第三方插件仍固定较低的 compileSdk,与其自身依赖的 AAR 元数据要求冲突, +// 统一提升到应用的 compileSdk 版本。 +subprojects { + afterEvaluate { + (extensions.findByName("android") + as? com.android.build.api.dsl.CommonExtension)?.compileSdk = 37 + } +} + subprojects { project.evaluationDependsOn(":app") } diff --git a/android/gradle.properties b/android/gradle.properties index 475a628..e14270b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,7 +1,8 @@ org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -# This builtInKotlin flag was added automatically by Flutter migrator +# Flutter plugins still apply the legacy Kotlin plugin and use the old AGP DSL. android.builtInKotlin=false -# This newDsl flag was added automatically by Flutter migrator android.newDsl=false +# Kotlin incremental caches cannot relativize Windows plugin sources on another drive. +kotlin.incremental=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e4ef43f..bdc0141 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index bead1a0..3b7304c 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -26,7 +26,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false + id("com.android.application") version "9.1.1" apply false id("org.jetbrains.kotlin.android") version "2.3.20" apply false } diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 459f7f8..69e6b64 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -497,6 +497,7 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -683,6 +684,7 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -709,6 +711,7 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index e7ccb67..08ae915 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -77,6 +77,19 @@ 用于在地图上展示设备位置 NSLocationAlwaysAndWhenInUseUsageDescription 用于在地图上展示设备位置 + NSLocalNetworkUsageDescription + 家庭关怀需要连接局域网内的服务,以登录、查看和远程控制已绑定的设备。 + NSAppTransportSecurity + + NSExceptionDomains + + 192.168.100.244 + + NSExceptionAllowsInsecureHTTPLoads + + + + NSCameraUsageDescription 用于扫描设备二维码完成绑定 NSPhotoLibraryUsageDescription diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements new file mode 100644 index 0000000..dea0d97 --- /dev/null +++ b/ios/Runner/Runner.entitlements @@ -0,0 +1,8 @@ + + + + + keychain-access-groups + + + diff --git a/lib/app/app.dart b/lib/app/app.dart index 07cbaba..41f8ed5 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -1,12 +1,10 @@ import 'package:cupertino_ui/cupertino_ui.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; -// GlobalMaterialLocalizations 须用 material_ui 自带的(vendored 框架副本), -// 若整体导入 flutter_localizations 会与 material_ui 导出的同名类冲突。 -import 'package:material_ui/material_ui.dart' show GlobalMaterialLocalizations; +import 'package:material_ui/material_ui.dart' as material; import '../l10n/app_localizations.dart'; +import '../core/storage/token_storage.dart'; import 'theme/app_theme.dart'; /// 应用根组件。 @@ -23,18 +21,15 @@ class App extends StatelessWidget { title: '桐桐家庭关怀', theme: AppTheme.cupertinoTheme, routerConfig: router, - localizationsDelegates: >[ + localizationsDelegates: const [ AppLocalizations.delegate, - // 注意:本工程使用第三方 cupertino_ui 包,其 Cupertino 组件(如 - // CupertinoTabBar)依赖的是 cupertino_ui 自带的 CupertinoLocalizations, - // 而非 Flutter SDK 的 GlobalCupertinoLocalizations。因此这里必须注册 - // cupertino_ui 的 delegate,否则 CupertinoTabBar 等组件会在运行时 - // 抛 "could not find a CupertinoLocalizations ancestor" 异常。 - ...GlobalCupertinoLocalizations.delegates, - // easy_image_viewer 的关闭按钮使用 Material Tooltip,需要 - // MaterialLocalizations 兜底(用 material_ui 自带的多语言副本)。 - GlobalMaterialLocalizations.delegate, + ...material.GlobalMaterialLocalizations.delegates, ], + builder: (context, child) { + // easy_image_viewer 仍使用 SDK Material 的主题和本地化。 + // ignore: deprecated_member_use + return material.MaterialUiCompatibilityBridge(child: child!); + }, supportedLocales: AppLocalizations.supportedLocales, debugShowCheckedModeBanner: false, ); @@ -43,7 +38,11 @@ class App extends StatelessWidget { /// 便于在 main 中统一构建 ProviderScope + App。 Widget buildApp(GoRouter router) { - return ProviderScope( - child: App(router: router), + return ValueListenableBuilder( + valueListenable: TokenStorage.sessionChanges, + builder: (context, version, _) => ProviderScope( + key: ValueKey(version), + child: App(router: router), + ), ); } diff --git a/lib/app/router/app_router.dart b/lib/app/router/app_router.dart index 6e08d23..77e487f 100644 --- a/lib/app/router/app_router.dart +++ b/lib/app/router/app_router.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; +import '../../core/storage/token_storage.dart'; import '../../features/auth/presentation/login_page.dart'; import '../../features/auth/presentation/register_page.dart'; @@ -46,15 +47,27 @@ import '../../features/connection/presentation/remote_control_page.dart'; GoRouter buildAppRouter() { return GoRouter( initialLocation: '/splash', + refreshListenable: TokenStorage.sessionChanges, + redirect: (context, state) { + const publicPaths = { + '/splash', + '/login', + '/register', + '/forgot-password', + '/legal', + }; + final path = state.uri.path; + if (!TokenStorage.isLoggedIn && !publicPaths.contains(path)) { + return '/login'; + } + if (TokenStorage.isLoggedIn && {'/login', '/register'}.contains(path)) { + return '/home'; + } + return null; + }, routes: [ - GoRoute( - path: '/splash', - builder: (context, state) => const SplashPage(), - ), - GoRoute( - path: '/login', - builder: (context, state) => const LoginPage(), - ), + GoRoute(path: '/splash', builder: (context, state) => const SplashPage()), + GoRoute(path: '/login', builder: (context, state) => const LoginPage()), GoRoute( path: '/register', builder: (context, state) => const RegisterPage(), @@ -65,17 +78,10 @@ GoRouter buildAppRouter() { ), GoRoute( path: '/legal', - builder: (context, state) => - LegalDocumentPage.fromExtra(state.extra), - ), - GoRoute( - path: '/album', - builder: (context, state) => const AlbumPage(), - ), - GoRoute( - path: '/alarm', - builder: (context, state) => const AlarmPage(), + builder: (context, state) => LegalDocumentPage.fromExtra(state.extra), ), + GoRoute(path: '/album', builder: (context, state) => const AlbumPage()), + GoRoute(path: '/alarm', builder: (context, state) => const AlarmPage()), GoRoute( path: '/alarm/edit', builder: (context, state) => AlarmEditPage( @@ -92,10 +98,7 @@ GoRouter buildAppRouter() { contact: state.extra is Contact ? state.extra as Contact : null, ), ), - GoRoute( - path: '/apps', - builder: (context, state) => const AppsPage(), - ), + GoRoute(path: '/apps', builder: (context, state) => const AppsPage()), GoRoute( path: '/device/manage', builder: (context, state) => const DeviceManagePage(), @@ -132,10 +135,7 @@ GoRouter buildAppRouter() { path: '/security/wechat', builder: (context, state) => const WechatBindingPage(), ), - GoRoute( - path: '/map', - builder: (context, state) => _MapRoute(), - ), + GoRoute(path: '/map', builder: (context, state) => _MapRoute()), GoRoute( path: '/screenshots', builder: (context, state) => _ScreenshotsRoute( @@ -212,8 +212,9 @@ class _ScreenshotsRoute extends ConsumerWidget { final list = screenshotsAsync.valueOrNull ?? const []; // 越界保护:初始索引落在列表内,否则回退到 0。 - final index = - (list.isNotEmpty && initialIndex < list.length) ? initialIndex : 0; + final index = (list.isNotEmpty && initialIndex < list.length) + ? initialIndex + : 0; return ScreenshotPage(screenshots: list, sn: sn ?? '', initialIndex: index); } } diff --git a/lib/core/network/dio_client.dart b/lib/core/network/dio_client.dart index 54b6210..d351b4a 100644 --- a/lib/core/network/dio_client.dart +++ b/lib/core/network/dio_client.dart @@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart'; import '../../app/constants/app_constants.dart'; import '../storage/token_storage.dart'; +import '../utils/local_network_access.dart'; import 'api_error.dart'; import 'api_exception.dart'; @@ -20,6 +21,14 @@ class DioClient { DioClient._(); static Dio? _instance; + static HttpClientAdapter? _refreshAdapter; + + @visibleForTesting + static void useAdapterForTesting(HttpClientAdapter adapter) { + reset(); + instance.httpClientAdapter = adapter; + _refreshAdapter = adapter; + } /// 全局共享的 Dio 单例(懒加载)。 static Dio get instance { @@ -28,16 +37,19 @@ class DioClient { } /// 主动重置单例(测试或切换环境时使用)。 - static void reset() => _instance = null; + static void reset() { + _instance?.close(force: true); + _instance = null; + _refreshAdapter = null; + _refreshing = null; + } static Dio _create() { final dio = Dio( BaseOptions( baseUrl: AppConstants.kBaseUrl, - connectTimeout: - Duration(milliseconds: AppConstants.kConnectTimeoutMs), - receiveTimeout: - Duration(milliseconds: AppConstants.kReceiveTimeoutMs), + connectTimeout: Duration(milliseconds: AppConstants.kConnectTimeoutMs), + receiveTimeout: Duration(milliseconds: AppConstants.kReceiveTimeoutMs), headers: {'Content-Type': 'application/json'}, ), ); @@ -56,76 +68,55 @@ class DioClient { final dio = Dio( BaseOptions( baseUrl: AppConstants.kBaseUrl, - connectTimeout: - Duration(milliseconds: AppConstants.kConnectTimeoutMs), - receiveTimeout: - Duration(milliseconds: AppConstants.kReceiveTimeoutMs), + connectTimeout: Duration(milliseconds: AppConstants.kConnectTimeoutMs), + receiveTimeout: Duration(milliseconds: AppConstants.kReceiveTimeoutMs), headers: {'Content-Type': 'application/json'}, ), ); + if (_refreshAdapter != null) dio.httpClientAdapter = _refreshAdapter!; return dio; } - /// 标记当前是否正在刷新,避免并发 401 引发多次刷新。 - static bool _isRefreshing = false; + static Future? _refreshing; + static int? _refreshVersion; - /// 触发一次 token 刷新并重放原请求。 - /// - /// 返回重放后的响应体(已解析 data);刷新失败则抛出 [ApiException] - /// (unauthorized),由上层触发登出清理。 - static Future _refreshAndRetry( - Future> Function() call, - ) async { - if (_isRefreshing) { - // 已有刷新在途:直接等待其完成并重放,避免并发刷新。 - // 简单处理为失败,交由上层登出,避免复杂队列。 - throw const ApiException(code: '401', message: '登录已失效,请重新登录'); - } - _isRefreshing = true; - try { - final refreshed = await _refreshToken(); - if (!refreshed) { - TokenStorage.clear(); - throw const ApiException(code: '401', message: '登录已失效,请重新登录'); - } - // 刷新成功:用新 token 重放原请求。 - final response = await call(); - return _ResponseInterceptor.parse(response); - } finally { - _isRefreshing = false; - } + static Future _refreshOnce(int version) { + if (_refreshing != null && _refreshVersion == version) return _refreshing!; + _refreshVersion = version; + final future = _refreshToken(version); + _refreshing = future; + return future.whenComplete(() { + if (identical(_refreshing, future)) _refreshing = null; + }); } - /// 使用 refreshToken 换取新 token,并写回本地存储。 - /// - /// 返回是否刷新成功。刷新接口为匿名接口(带 refreshToken query), - /// 使用独立 [_refreshDio],不触发任何拦截器。 - static Future _refreshToken() async { - final refreshToken = TokenStorage.refreshToken; - debugPrint('[DioClient] _refreshToken: start, hasRefreshToken=${refreshToken?.isNotEmpty}'); - if (refreshToken == null || refreshToken.isEmpty) return false; + static Future _refreshToken(int version) async { + final refresh = TokenStorage.refreshToken; + if (refresh == null || refresh.isEmpty) return false; + final dio = _refreshDio; try { - // 对接 open 模块刷新接口,路径需带 v1/open/ 前缀。 - final response = await _refreshDio.post( + final response = await dio.post( 'v1/open/auth/refresh-token', - queryParameters: {'refreshToken': refreshToken}, + queryParameters: {'refreshToken': refresh}, ); - debugPrint('[DioClient] _refreshToken: response status=${response.statusCode} body=${response.data}'); - final body = response.data as Map?; - if (body == null) return false; - final code = body['code']?.toString() ?? '-1'; - // 成功码约定为 "00000"。 - if (code != '00000') return false; - final data = body['data'] as Map?; - final newToken = data?['accessToken'] as String?; - final newRefresh = data?['refreshToken'] as String?; - if (newToken == null || newToken.isEmpty) return false; - TokenStorage.saveTokens(token: newToken, refreshToken: newRefresh); - debugPrint('[DioClient] _refreshToken: success, newToken=${newToken.substring(0, 5)}...'); - return true; - } catch (e) { - debugPrint('[DioClient] _refreshToken: unexpected error: $e'); + final data = + _ResponseInterceptor.parse(response) as Map?; + final token = data?['accessToken'] as String?; + if (token == null || + token.isEmpty || + version != TokenStorage.sessionVersion) { + return false; + } + await TokenStorage.saveTokens( + token: token, + refreshToken: data?['refreshToken'] as String? ?? refresh, + newSession: false, + ); + return version == TokenStorage.sessionVersion; + } catch (_) { return false; + } finally { + dio.close(); } } @@ -133,26 +124,25 @@ class DioClient { static Future get( String path, { Map? queryParameters, - }) => - _request(() => instance.get(path, queryParameters: queryParameters)); + }) => _request( + () => instance.get(path, queryParameters: queryParameters), + ); /// 统一 POST 请求,返回解析后的 data。 static Future post( String path, { Map? data, Map? queryParameters, - }) => - _request(() => instance.post( - path, - data: data, - queryParameters: queryParameters, - )); + }) => _request( + () => instance.post( + path, + data: data, + queryParameters: queryParameters, + ), + ); /// 统一 PUT 请求,返回解析后的 data。 - static Future put( - String path, { - Map? data, - }) => + static Future put(String path, {Map? data}) => _request(() => instance.put(path, data: data)); /// 统一 POST 请求(multipart 文件上传),返回解析后的 data。 @@ -160,12 +150,13 @@ class DioClient { String path, { required FormData formData, Map? queryParameters, - }) => - _request(() => instance.post( - path, - data: formData, - queryParameters: queryParameters, - )); + }) => _request( + () => instance.post( + path, + data: formData.clone(), + queryParameters: queryParameters, + ), + ); /// 下载静态资源文件到本地路径(图片等二进制内容,不走 JSON 业务解析)。 /// @@ -187,71 +178,40 @@ class DioClient { Future> Function() call, ) async { try { - final response = await call(); - // [DEBUG] 打印接口响应状态与返回体。 - debugPrint( - '[DioClient] <- ${response.requestOptions.method} ' - '${response.requestOptions.uri} ' - 'statusCode=${response.statusCode}', - ); - debugPrint('[DioClient] response body=${response.data}'); - // 解析成功返回 data;若为业务错误(code != "00000")会在此抛出 ApiException。 - return _ResponseInterceptor.parse(response); - } on ApiException catch (e) { - // A0300:端标识/权限异常,旧令牌无法通过刷新恢复 client 身份, - // 直接清理本地令牌并转为登录失效,引导重新登录。 - if (e.code == 'A0300') { - TokenStorage.clear(); - throw const ApiException(code: '401', message: '登录已失效,请重新登录'); - } - // 业务层已抛出的异常:判断是否令牌失效,触发刷新重试。 - if (_isTokenExpired(e, null)) { - return _refreshAndRetry(call); - } + return _ResponseInterceptor.parse(await call()); + } on ApiException { rethrow; } on DioException catch (e) { - debugPrint( - '[DioClient] !! DioException ${e.requestOptions.method} ' - '${e.requestOptions.uri} statusCode=${e.response?.statusCode} ' - 'type=${e.type} message=${e.message}', - ); - debugPrint('[DioClient] error response body=${e.response?.data}'); - // 拦截器已将端标识/权限异常包装为 ApiException(如登录失效),直接透传。 - if (e.error is ApiException) { - throw e.error! as ApiException; - } - // 注:HTTP 401 的刷新重试已在 [_ErrorInterceptor.onError] 统一处理, - // 此处不再重复,避免重复刷新。 - throw ApiException.fromAppError( - AppError.fromDioException(e), - ); + if (e.error is ApiException) throw e.error! as ApiException; + throw ApiException.fromAppError(AppError.fromDioException(e)); } catch (e) { - debugPrint('[DioClient] !! unexpected error: $e'); throw ApiException.fromAppError(AppError.unknown(e)); } } - - /// 判断业务异常是否为令牌失效,需触发刷新。 - /// - /// 兼容两类表达:HTTP 401 已在调用处单独判断;此处针对响应体业务码 - /// (如后台用 {code: A0230, msg: 访问令牌无效或已过期} 表达令牌过期)。 - static bool _isTokenExpired(ApiException e, int? statusCode) { - if (statusCode == 401) return true; - // 已知令牌失效业务码(与后台约定,按需补充)。 - const expiredCodes = {'A0230', '401', 'A0801'}; - return expiredCodes.contains(e.code); - } } /// 请求拦截器:自动为已登录会话注入 Authorization 头。 class _AuthInterceptor extends Interceptor { @override - void onRequest(RequestOptions options, RequestInterceptorHandler handler) { - // [DEBUG] 打印所有接口请求的完整地址(debugPrint 在 release 下为空实现)。 - if (kDebugMode) { - debugPrint( - '[DioClient] -> ${options.method} ${options.uri}', + void onRequest( + RequestOptions options, + RequestInterceptorHandler handler, + ) async { + options.extra.putIfAbsent( + 'sessionVersion', + () => TokenStorage.sessionVersion, + ); + try { + await LocalNetworkAccess.ensure(options.uri); + } catch (error) { + handler.reject(DioException(requestOptions: options, error: error)); + return; + } + if (options.extra['sessionVersion'] != TokenStorage.sessionVersion) { + handler.reject( + DioException(requestOptions: options, type: DioExceptionType.cancel), ); + return; } final token = TokenStorage.accessToken; if (token != null && token.isNotEmpty) { @@ -290,8 +250,36 @@ class _ResponseInterceptor extends Interceptor { } @override - void onResponse(Response response, ResponseInterceptorHandler handler) { - // 解析在 _request 中统一进行,此处仅透传。 + void onResponse( + Response response, + ResponseInterceptorHandler handler, + ) { + if (response.requestOptions.extra['sessionVersion'] != + TokenStorage.sessionVersion) { + handler.reject( + DioException( + requestOptions: response.requestOptions, + type: DioExceptionType.cancel, + ), + ); + return; + } + final body = response.data; + if (body is Map && + _ErrorInterceptor.isAuthError( + body['code']?.toString(), + response.statusCode, + )) { + handler.reject( + DioException( + requestOptions: response.requestOptions, + response: response, + type: DioExceptionType.badResponse, + ), + true, + ); + return; + } super.onResponse(response, handler); } } @@ -302,95 +290,55 @@ class _ResponseInterceptor extends Interceptor { /// 触发刷新后自动重放原请求;刷新失败则向下传递 401 由上层登出处理。 /// 这样无论哪个请求方法都不会遗漏 401 刷新逻辑。 class _ErrorInterceptor extends Interceptor { + static bool isAuthError(String? code, int? status) => + status == 401 || {'A0230', '401', 'A0300'}.contains(code); + @override - void onError(DioException err, ErrorInterceptorHandler handler) { - final response = err.response; - final statusCode = response?.statusCode; - // 响应体可能是二进制(ResponseBody 等),先类型判定再取业务码,避免强转抛错。 - final data = response?.data; - final body = data is Map ? data : null; - final code = body?['code']?.toString(); - - // 访问权限异常(A0300):通常意味着当前令牌的端标识不符(如旧令牌未携带 - // clientType,或跨端令牌)。此类令牌无法通过刷新恢复客户端身份,直接清理 - // 本地令牌并转为「登录失效」,由上层引导重新登录,避免反复提示权限异常。 - if (code == 'A0300') { - debugPrint( - '[DioClient] _ErrorInterceptor: 端标识/权限异常 ' - '(status=$statusCode, code=$code). Clearing token & require re-login.', - ); - TokenStorage.clear(); - handler.next(_asLoginExpired(err)); - return; - } - - // 统一判断是否为令牌失效(HTTP 401 或业务码 A0230/A0801 等)。 - if (_isTokenExpiredRaw(code, statusCode)) { - debugPrint( - '[DioClient] _ErrorInterceptor: Token expired detected ' - '(status=$statusCode, code=$code). Attempting refresh...', - ); - _handle401(err, handler); - return; - } - handler.next(err); - } - - /// 将权限/端标识异常包装为「登录失效」错误,供上层统一走重新登录流程。 - static DioException _asLoginExpired(DioException err) { - return DioException( - requestOptions: err.requestOptions, - response: err.response, - type: DioExceptionType.unknown, - error: const ApiException(code: '401', message: '登录已失效,请重新登录'), - ); - } - - /// 内部快速判断逻辑,逻辑同 [DioClient._isTokenExpired]。 - bool _isTokenExpiredRaw(String? code, int? statusCode) { - if (statusCode == 401) return true; - const expiredCodes = {'A0230', '401', 'A0801'}; - return code != null && expiredCodes.contains(code); - } - - /// 处理 HTTP 401:刷新 token 后重放原请求。 - /// - /// 刷新受 [DioClient._isRefreshing] 保护(并发 401 只刷新一次)。重放通过 - /// [DioClient.instance.fetch] 进行,会自动重新注入新 token 并再次经过 - /// 拦截器链。刷新失败则向下传递原始 401。 - static void _handle401( - DioException err, - ErrorInterceptorHandler handler, - ) async { - try { - final refreshed = await _refreshTokenOnce(); - if (!refreshed) { - TokenStorage.clear(); - handler.next(err); - return; - } - final response = await DioClient.instance.fetch(err.requestOptions); - handler.resolve(response); - } catch (_) { + void onError(DioException err, ErrorInterceptorHandler handler) async { + final body = err.response?.data; + final code = body is Map ? body['code']?.toString() : null; + if (!isAuthError(code, err.response?.statusCode)) { handler.next(err); + return; + } + final request = err.requestOptions; + final version = request.extra['sessionVersion'] as int?; + final current = version == TokenStorage.sessionVersion; + try { + final sentToken = request.headers['Authorization']; + if (current && + code != 'A0300' && + request.extra['authRetried'] != true && + sentToken != null) { + final alreadyRefreshed = + sentToken != 'Bearer ${TokenStorage.accessToken}'; + if (alreadyRefreshed || await DioClient._refreshOnce(version!)) { + if (version == TokenStorage.sessionVersion) { + request.extra['authRetried'] = true; + if (request.data is FormData) { + request.data = (request.data as FormData).clone(); + } + final response = await DioClient.instance.fetch(request); + handler.resolve(response); + return; + } + } + } + if (version == TokenStorage.sessionVersion && sentToken != null) { + await TokenStorage.clear(); + } + handler.next(_expired(err)); + } on DioException catch (retryError) { + handler.next(retryError); + } catch (_) { + handler.next(_expired(err)); } } - /// 刷新 token(带并发保护)。 - /// - /// 返回是否刷新成功。刷新接口为匿名接口,使用独立 [_refreshDio], - /// 不触发任何拦截器,避免递归进入 401 流程。 - static Future _refreshTokenOnce() async { - debugPrint('[DioClient] _refreshTokenOnce: isRefreshing=${DioClient._isRefreshing}'); - if (DioClient._isRefreshing) { - // 已有刷新在途:简单处理为失败,交由上层登出,避免复杂队列。 - return false; - } - DioClient._isRefreshing = true; - try { - return await DioClient._refreshToken(); - } finally { - DioClient._isRefreshing = false; - } - } + static DioException _expired(DioException err) => DioException( + requestOptions: err.requestOptions, + response: err.response, + type: DioExceptionType.unknown, + error: const ApiException(code: '401', message: '登录已失效,请重新登录'), + ); } diff --git a/lib/core/storage/token_storage.dart b/lib/core/storage/token_storage.dart index 08c573d..62bbbd8 100644 --- a/lib/core/storage/token_storage.dart +++ b/lib/core/storage/token_storage.dart @@ -1,3 +1,6 @@ +import 'dart:convert'; +import 'package:flutter/foundation.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:mmkv/mmkv.dart'; import '../../app/constants/app_constants.dart'; @@ -5,8 +8,7 @@ import '../../app/constants/app_constants.dart'; /// 令牌与登录态的本地存储封装。 /// /// 令牌属于敏感数据,统一通过本封装读写,UI 与仓库不直接接触底层存储。 -/// 当前基于已引入的 MMKV 实现;若后续切换为 flutter_secure_storage, -/// 仅需调整本文件内部实现,调用方无感知。 +/// 凭证保存在系统安全存储中,MMKV 仅用于非敏感设备标识。 /// /// 健壮性:当 MMKV 未初始化(如单元测试宿主环境)或不可用(异常)时, /// 自动降级为内存存储,保证存储访问不崩溃。 @@ -14,6 +16,26 @@ class TokenStorage { const TokenStorage._(); static bool _mmkvReady = false; + static bool _initialized = false; + static const _secure = FlutterSecureStorage(); + static const _credentialsKey = 'family_care_credentials'; + static String? _accessToken; + static String? _refreshToken; + static Future _writes = Future.value(); + // Login/logout boundaries reset all account-owned providers. + static final sessionChanges = ValueNotifier(0); + static int get sessionVersion => sessionChanges.value; + + static Future _persist(String? value) { + final operation = _writes.then( + (_) => value == null + ? _secure.delete(key: _credentialsKey) + : _secure.write(key: _credentialsKey, value: value), + ); + _writes = operation.catchError((Object _) {}); + return operation; + } + static _KVStore? _backend; /// 内存回退后端实例(始终可用)。 @@ -24,16 +46,42 @@ class TokenStorage { /// 内部已做超时与异常保护:MMKV 初始化若在真机上偶发阻塞或失败, /// 会降级为内存存储并立即返回,避免阻塞 [main] 导致应用卡在首屏。 static Future initialize() async { - if (_mmkvReady) return; + if (_initialized) return; try { - await MMKV.initialize() - .timeout(const Duration(seconds: 5), onTimeout: () => throw StateError('mmkv init timeout')); + await MMKV.initialize().timeout( + const Duration(seconds: 5), + onTimeout: () => throw StateError('mmkv init timeout'), + ); MMKV.defaultMMKV(); _mmkvReady = true; } catch (_) { // 初始化失败或超时:降级为内存存储,不阻断应用启动。 _mmkvReady = false; } + try { + final saved = await _secure.read(key: _credentialsKey); + if (saved != null) { + final data = jsonDecode(saved) as Map; + _accessToken = data['accessToken'] as String?; + _refreshToken = data['refreshToken'] as String?; + } else { + final legacy = _store.getString(AppConstants.kTokenKey); + if (legacy != null && legacy.isNotEmpty) { + await saveTokens( + token: legacy, + refreshToken: _store.getString(AppConstants.kRefreshTokenKey), + newSession: false, + ); + } + } + _store.removeKey(AppConstants.kTokenKey); + _store.removeKey(AppConstants.kRefreshTokenKey); + } catch (_) { + // 安全存储不可用时以未登录状态启动,禁止回退到明文凭证。 + _accessToken = null; + _refreshToken = null; + } + _initialized = true; } /// 当前可用的键值存储后端。 @@ -50,16 +98,9 @@ class TokenStorage { return _memoryStore; } - /// 是否已登录(存在有效访问令牌)。 - static bool get isLoggedIn => - _store.getString(AppConstants.kTokenKey)?.isNotEmpty ?? false; - - /// 当前访问令牌,未登录时返回 null。 - static String? get accessToken => _store.getString(AppConstants.kTokenKey); - - /// 刷新令牌。 - static String? get refreshToken => - _store.getString(AppConstants.kRefreshTokenKey); + static bool get isLoggedIn => _accessToken?.isNotEmpty ?? false; + static String? get accessToken => _accessToken; + static String? get refreshToken => _refreshToken; /// 设备唯一标识,首次访问时生成并持久化。 static String get deviceId { @@ -70,18 +111,28 @@ class TokenStorage { return generated; } - /// 保存登录结果中的令牌。 - static void saveTokens({required String token, String? refreshToken}) { - _store.setString(AppConstants.kTokenKey, token); - if (refreshToken != null) { - _store.setString(AppConstants.kRefreshTokenKey, refreshToken); - } + /// Persist one encrypted record before publishing the session. + static Future saveTokens({ + required String token, + String? refreshToken, + bool newSession = true, + }) async { + final version = sessionVersion; + await _persist( + jsonEncode({'accessToken': token, 'refreshToken': refreshToken}), + ); + if (version != sessionVersion) return; + _accessToken = token; + _refreshToken = refreshToken; + if (newSession) sessionChanges.value++; } - /// 清除全部登录态(登出 / 令牌失效时使用)。 - static void clear() { - _store.removeKey(AppConstants.kTokenKey); - _store.removeKey(AppConstants.kRefreshTokenKey); + /// Invalidate memory immediately; disk writes remain ordered with later logins. + static Future clear() { + _accessToken = null; + _refreshToken = null; + sessionChanges.value++; + return _persist(null); } } diff --git a/lib/core/utils/local_network_access.dart b/lib/core/utils/local_network_access.dart new file mode 100644 index 0000000..4ee4962 --- /dev/null +++ b/lib/core/utils/local_network_access.dart @@ -0,0 +1,31 @@ +import 'dart:io'; + +import 'package:flutter/services.dart'; + +import '../../app/constants/app_constants.dart'; +import '../network/api_exception.dart'; + +class LocalNetworkAccess { + LocalNetworkAccess._(); + + static const _channel = MethodChannel('com.ttstd.familycare/app'); + static final _backendHost = Uri.parse(AppConstants.kBaseUrl).host; + static Future? _pending; + + static Future ensure(Uri uri) async { + if (!Platform.isAndroid || uri.host != _backendHost) return; + + final request = _pending ??= _channel.invokeMethod( + 'requestLocalNetwork', + ); + try { + if (await request == true) return; + } finally { + if (identical(_pending, request)) _pending = null; + } + throw const ApiException( + code: 'LOCAL_NETWORK_DENIED', + message: '请允许访问局域网后重试', + ); + } +} diff --git a/lib/features/album/data/photo_providers.dart b/lib/features/album/data/photo_providers.dart index 6c90adc..ce2c6d9 100644 --- a/lib/features/album/data/photo_providers.dart +++ b/lib/features/album/data/photo_providers.dart @@ -5,5 +5,8 @@ import 'package:ttstd_family_care/features/album/data/photo_repository.dart'; /// /// 页面级单例:随相册页销毁自动 dispose,同步释放内存中的媒体缓存 /// (见 [PhotoRepository.clearCache]),避免大量缩略图句柄常驻。 -final photoRepositoryProvider = - Provider((ref) => PhotoRepository()); +final photoRepositoryProvider = Provider.autoDispose((ref) { + final repository = PhotoRepository(); + ref.onDispose(repository.clearCache); + return repository; +}); diff --git a/lib/features/album/data/photo_repository.dart b/lib/features/album/data/photo_repository.dart index 10754b2..c1da5dc 100644 --- a/lib/features/album/data/photo_repository.dart +++ b/lib/features/album/data/photo_repository.dart @@ -86,11 +86,18 @@ class PhotoRepository { /// [type] 指定只读照片、只读视频或全部;默认全部(照片 + 视频)。 /// `hasAll: false` 排除系统「全部照片」根相簿,只展示真实文件夹。 /// 需要先保证权限已 [requestPermission]。 - Future> loadAlbums({RequestType type = RequestType.common}) async { + Future> loadAlbums({ + RequestType type = RequestType.common, + }) async { final paths = await PhotoManager.getAssetPathList( type: type, onlyAll: false, hasAll: false, + filterOption: FilterOptionGroup( + orders: [ + const OrderOption(type: OrderOptionType.createDate, asc: false), + ], + ), ); _pathCache.clear(); @@ -129,11 +136,15 @@ class PhotoRepository { /// /// [albumId] 为 [loadAlbums] 返回的 [AlbumFolder.id]。 /// 返回媒体的缩略图句柄列表(供照片墙按需加载)。 - Future> loadFolderAssets(String albumId) async { + Future> loadFolderAssets( + String albumId, { + int page = 0, + int pageSize = 90, + }) async { final path = _pathCache[albumId]; if (path == null) return const []; - final assets = await path.getAssetListPaged(page: 0, size: 20000); + final assets = await path.getAssetListPaged(page: page, size: pageSize); // 按创建时间降序(最新在前),保证照片墙时间顺序稳定。 assets.sort((a, b) { final t = b.createDateTime.compareTo(a.createDateTime); @@ -163,9 +174,7 @@ class PhotoRepository { final w = thumb.originalWidth; final h = thumb.originalHeight; // 按原图比例缩放到最长边为 size;原图尺寸异常时退化为正方形。 - final scale = (w <= 0 || h <= 0) - ? 1.0 - : size / (w >= h ? w : h); + final scale = (w <= 0 || h <= 0) ? 1.0 : size / (w >= h ? w : h); final tw = ((w * scale).round()).clamp(1, size); final th = ((h * scale).round()).clamp(1, size); final data = await asset.thumbnailDataWithSize(ThumbnailSize(tw, th)); diff --git a/lib/features/album/presentation/album_controller.dart b/lib/features/album/presentation/album_controller.dart index ea22459..54a10f4 100644 --- a/lib/features/album/presentation/album_controller.dart +++ b/lib/features/album/presentation/album_controller.dart @@ -31,6 +31,8 @@ class AlbumState { this.currentAlbum, this.assets = const [], this.error, + this.hasMore = false, + this.loadingMore = false, }); final AlbumPermissionStatus permission; @@ -45,6 +47,8 @@ class AlbumState { /// 一次性加载错误。 final AlbumLoadError? error; + final bool hasMore; + final bool loadingMore; /// 复制并覆盖部分字段。 /// @@ -52,6 +56,8 @@ class AlbumState { /// 哨兵实现:不传(保持默认)表示不修改,显式传 `null` 表示清空为 null, /// 显式传具体值表示覆盖。其余字段沿用 `??` 语义。 AlbumState copyWith({ + bool? hasMore, + bool? loadingMore, AlbumPermissionStatus? permission, bool? requesting, List? folders, @@ -59,6 +65,8 @@ class AlbumState { List? assets, Object? error = _noValue, }) => AlbumState( + hasMore: hasMore ?? this.hasMore, + loadingMore: loadingMore ?? this.loadingMore, permission: permission ?? this.permission, requesting: requesting ?? this.requesting, folders: folders ?? this.folders, @@ -79,84 +87,73 @@ class AlbumState { /// - 授权后加载本机相簿列表(按时间降序)。 /// - 打开某个相簿后加载其内媒体(时间降序)。 /// - 返回相簿列表(currentAlbum 置空)。 -class AlbumController extends Notifier { - /// 请求令牌:用于丢弃过期的异步结果。 - /// - /// 每次发起新的 [openAlbum] 或调用 [backToFolders] 时递增。`openAlbum` - /// 的 `await` 完成回来后,若令牌已变化(用户期间已返回或打开了其他相簿), - /// 则丢弃该次结果,避免「点了返回后相簿又被重新打开」的竞态。 +class AlbumController extends AutoDisposeNotifier { int _loadToken = 0; + bool _disposed = false; + int _nextPage = 0; + static const pageSize = 90; @override AlbumState build() { - // 页面级控制器,无需 keepAlive,随页面销毁自动 dispose; - // 同步清理仓库内存缓存,释放缩略图句柄。 + _disposed = false; + ref.watch(photoRepositoryProvider); ref.onDispose(() { - ref.read(photoRepositoryProvider).clearCache(); + _disposed = true; + _loadToken++; }); return const AlbumState(); } - /// 申请相册权限并在授权后加载相簿列表。 - /// - /// 首次调用会触发系统授权弹窗;已授权则直接刷新相簿。 Future requestPermissionAndLoad() async { if (state.requesting) return; + final token = ++_loadToken; final repo = ref.read(photoRepositoryProvider); - - // 1. 申请权限。 - state = state.copyWith(requesting: true); - final status = await repo.requestPermission(); - - if (status == AlbumPermissionStatus.denied || - status == AlbumPermissionStatus.permanentlyDenied || - status == AlbumPermissionStatus.restricted) { - state = state.copyWith( - permission: status, - requesting: false, - folders: const [], - currentAlbum: null, - assets: const [], - ); - return; - } - - // 2. 授权(含 limited),加载相簿。 - state = state.copyWith(permission: status, requesting: true); + state = state.copyWith(requesting: true, error: null); try { - final folders = await repo.loadAlbums(); + final status = await repo.requestPermission(); + if (_disposed || token != _loadToken) return; + final allowed = + status == AlbumPermissionStatus.granted || + status == AlbumPermissionStatus.limited; + final folders = allowed ? await repo.loadAlbums() : []; + if (_disposed || token != _loadToken) return; + state = AlbumState(permission: status, folders: folders); + } catch (_) { + if (_disposed || token != _loadToken) return; state = state.copyWith( - permission: status, - requesting: false, - folders: folders, - currentAlbum: null, - assets: const [], - ); - } catch (e) { - state = state.copyWith( - permission: status, requesting: false, error: AlbumLoadError.loadFolders, ); } } - /// 打开指定相簿,加载其内媒体(时间降序)。 Future openAlbum(AlbumFolder folder) async { final token = ++_loadToken; final repo = ref.read(photoRepositoryProvider); - state = state.copyWith(requesting: true); + _nextPage = 0; + state = state.copyWith( + requesting: true, + currentAlbum: folder, + assets: const [], + hasMore: true, + loadingMore: false, + error: null, + ); try { - final assets = await repo.loadFolderAssets(folder.id); - // 若期间用户已返回/打开了其他相簿(令牌变化),丢弃本次过期结果。 - if (token != _loadToken) return; + final assets = await repo.loadFolderAssets( + folder.id, + page: 0, + pageSize: pageSize, + ); + if (_disposed || token != _loadToken) return; + _nextPage = 1; state = state.copyWith( requesting: false, - currentAlbum: folder, assets: assets, + hasMore: assets.length == pageSize, ); - } catch (e) { - if (token != _loadToken) return; + } catch (_) { + if (_disposed || token != _loadToken) return; state = state.copyWith( requesting: false, error: AlbumLoadError.loadFolderAssets, @@ -164,33 +161,60 @@ class AlbumController extends Notifier { } } - /// 返回相簿列表。 - /// - /// 同时递增令牌,使在途的 [openAlbum] 结果失效,避免「返回后相簿又被重新 - /// 打开」的竞态。 + Future loadMore() async { + final folder = state.currentAlbum; + if (folder == null || + state.requesting || + state.loadingMore || + !state.hasMore) { + return; + } + final token = _loadToken; + final repo = ref.read(photoRepositoryProvider); + state = state.copyWith(loadingMore: true, error: null); + try { + final assets = await repo.loadFolderAssets( + folder.id, + page: _nextPage, + pageSize: pageSize, + ); + if (_disposed || token != _loadToken) return; + _nextPage++; + final ids = state.assets.map((e) => e.assetId).toSet(); + state = state.copyWith( + loadingMore: false, + assets: [...state.assets, ...assets.where((e) => ids.add(e.assetId))], + hasMore: assets.length == pageSize, + ); + } catch (_) { + if (_disposed || token != _loadToken) return; + state = state.copyWith( + loadingMore: false, + error: AlbumLoadError.loadFolderAssets, + ); + } + } + void backToFolders() { _loadToken++; state = state.copyWith( currentAlbum: null, assets: const [], requesting: false, + loadingMore: false, + hasMore: false, + error: null, ); } - /// 打开系统设置(用于永久拒绝后引导用户手动开启)。 - Future openSettings() async { - await ref.read(photoRepositoryProvider).openAppSettings(); - } - - /// 消费一次性加载错误,避免重复弹窗。 + Future openSettings() => + ref.read(photoRepositoryProvider).openAppSettings(); void consumeError() { - if (state.error != null) { - state = state.copyWith(error: null); - } + state = state.copyWith(error: null); } } -/// 相簿页控制器 Provider(页面级,不 keepAlive)。 -final albumControllerProvider = NotifierProvider( - AlbumController.new, -); +final albumControllerProvider = + NotifierProvider.autoDispose( + AlbumController.new, + ); diff --git a/lib/features/album/presentation/album_page.dart b/lib/features/album/presentation/album_page.dart index 28459a3..de1c112 100644 --- a/lib/features/album/presentation/album_page.dart +++ b/lib/features/album/presentation/album_page.dart @@ -97,8 +97,9 @@ class _AlbumPageState extends ConsumerState { }); return; } - final pictures = - await ref.read(deviceRepositoryProvider).getPictureList(sn); + final pictures = await ref + .read(deviceRepositoryProvider) + .getPictureList(sn); if (!mounted) return; setState(() { _pictures = pictures; @@ -151,7 +152,7 @@ class _AlbumPageState extends ConsumerState { }, child: CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( - middle: Text(inFolder ? currentAlbum!.name : l10n.albumTitle), + middle: Text(inFolder ? currentAlbum.name : l10n.albumTitle), leading: CupertinoButton( padding: EdgeInsets.zero, child: const Icon(CupertinoIcons.back), @@ -181,71 +182,116 @@ class _AlbumPageState extends ConsumerState { Widget _buildBody(AppLocalizations l10n) { // edge-to-edge 沉浸式布局下,SafeArea 兜底顶部状态栏与底部导航/Home 条安全区; // 顶部由 CupertinoNavigationBar 处理,这里仅保留底部 inset。 + final albumState = ref.watch(albumControllerProvider); + final showDetail = + _segment == 2 && + albumState.currentAlbum != null && + !albumState.requesting; return SafeArea( top: false, child: Stack( children: [ - ListView( - padding: const EdgeInsets.only(bottom: 120), - children: [ - // 分段切换 - Padding( - padding: const EdgeInsets.fromLTRB(16, 10, 16, 0), - child: Container( - padding: const EdgeInsets.all(3), - decoration: BoxDecoration( - color: AppColors.track, - borderRadius: BorderRadius.circular(12), - ), - child: Row( - children: [ - for (var i = 0; i < _segments.length; i++) - Expanded( - child: GestureDetector( - onTap: () => _onSegmentTap(i), - child: Container( - padding: const EdgeInsets.symmetric(vertical: 8), - decoration: BoxDecoration( - color: _segment == i - ? CupertinoColors.white - : const Color(0x00000000), - borderRadius: BorderRadius.circular(9), - boxShadow: _segment == i - ? const [ - BoxShadow( - color: Color(0x14141E3C), - blurRadius: 6, - offset: Offset(0, 2), - ), - ] - : null, - ), - child: Center( - child: Text( - _segments[i], - style: TextStyle( - fontSize: 13, - fontWeight: FontWeight.w600, + NotificationListener( + onNotification: (notification) { + if (showDetail && + notification.depth == 0 && + notification.metrics.extentAfter < 600) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) { + ref.read(albumControllerProvider.notifier).loadMore(); + } + }); + } + return false; + }, + child: CustomScrollView( + slivers: [ + SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 10, 16, 0), + child: Container( + padding: const EdgeInsets.all(3), + decoration: BoxDecoration( + color: AppColors.track, + borderRadius: BorderRadius.circular(12), + ), + child: Row( + children: [ + for (var i = 0; i < _segments.length; i++) + Expanded( + child: GestureDetector( + onTap: () => _onSegmentTap(i), + child: Container( + padding: const EdgeInsets.symmetric( + vertical: 8, + ), + decoration: BoxDecoration( color: _segment == i - ? AppColors.ink - : AppColors.sub, + ? CupertinoColors.white + : const Color(0x00000000), + borderRadius: BorderRadius.circular(9), + boxShadow: _segment == i + ? const [ + BoxShadow( + color: Color(0x14141E3C), + blurRadius: 6, + offset: Offset(0, 2), + ), + ] + : null, + ), + child: Center( + child: Text( + _segments[i], + style: TextStyle( + fontSize: 13, + fontWeight: FontWeight.w600, + color: _segment == i + ? AppColors.ink + : AppColors.sub, + ), + ), ), ), ), ), - ), - ), - ], + ], + ), + ), ), ), - ), - if (_segment == 2) - _buildAlbumSegment(l10n) - else if (_segment == 0) - _buildUploadedSegment(l10n) - else - _buildFavoritesSegment(l10n), - ], + if (showDetail) + _FolderDetailView( + l10n: l10n, + album: albumState.currentAlbum!, + assets: albumState.assets, + onView: _viewLocalPicture, + onSend: _onPhotoTap, + ) + else + SliverToBoxAdapter( + child: _segment == 2 + ? _buildAlbumSegment(l10n) + : _segment == 0 + ? _buildUploadedSegment(l10n) + : _buildFavoritesSegment(l10n), + ), + if (showDetail && albumState.hasMore) + SliverToBoxAdapter( + child: Center( + child: albumState.loadingMore + ? const CupertinoActivityIndicator() + : CupertinoButton( + onPressed: () => ref + .read(albumControllerProvider.notifier) + .loadMore(), + child: Text(l10n.albumLoadMore), + ), + ), + ), + const SliverToBoxAdapter(child: SizedBox(height: 120)), + ], + ), ), Positioned( right: 18, @@ -309,16 +355,6 @@ class _AlbumPageState extends ConsumerState { } // 已授权(含 limited): - if (state.currentAlbum != null) { - return _FolderDetailView( - l10n: l10n, - album: state.currentAlbum!, - assets: state.assets, - onView: _viewLocalPicture, - onSend: _onPhotoTap, - ); - } - // 相簿列表。 if (state.folders.isEmpty) { return Padding( @@ -363,9 +399,7 @@ class _AlbumPageState extends ConsumerState { child: Text( l10n.albumUploadedStats( _pictures.length, - _formatSize( - _pictures.fold(0, (sum, p) => sum + p.fileSize), - ), + _formatSize(_pictures.fold(0, (sum, p) => sum + p.fileSize)), ), style: const TextStyle(fontSize: 12, color: AppColors.sub), ), @@ -395,9 +429,7 @@ class _AlbumPageState extends ConsumerState { child: Text( l10n.albumFavoriteStats( favorites.length, - _formatSize( - favorites.fold(0, (sum, p) => sum + p.fileSize), - ), + _formatSize(favorites.fold(0, (sum, p) => sum + p.fileSize)), ), style: const TextStyle(fontSize: 12, color: AppColors.sub), ), @@ -437,10 +469,13 @@ class _AlbumPageState extends ConsumerState { child: Image.network( picture.url, fit: BoxFit.cover, - errorBuilder: (_, __, ___) => Container( + errorBuilder: (_, _, _) => Container( color: AppColors.track, - child: const Icon(CupertinoIcons.photo, - size: 28, color: AppColors.sub), + child: const Icon( + CupertinoIcons.photo, + size: 28, + color: AppColors.sub, + ), ), ), ), @@ -484,8 +519,9 @@ class _AlbumPageState extends ConsumerState { /// 全屏查看本地相册照片(easy_image_viewer,取原图文件展示)。 Future _viewLocalPicture(PhotoThumb thumb) async { - final file = - await ref.read(photoRepositoryProvider).getAssetFile(thumb.assetId); + final file = await ref + .read(photoRepositoryProvider) + .getAssetFile(thumb.assetId); if (!mounted) return; if (file == null) { _showAlert(_l10n.albumSendGetFileFailed); @@ -611,14 +647,15 @@ class _AlbumPageState extends ConsumerState { ), ); if (confirmed != true || !mounted) return; - final file = - await ref.read(photoRepositoryProvider).getAssetFile(thumb.assetId); - if (file == null || !mounted) { + final file = await ref + .read(photoRepositoryProvider) + .getAssetFile(thumb.assetId); + if (!mounted) return; + if (file == null) { _showAlert(l10n.albumSendGetFileFailed); return; } - final err = - await ref.read(deviceRepositoryProvider).sendPicture(sn, file); + final err = await ref.read(deviceRepositoryProvider).sendPicture(sn, file); if (!mounted) return; if (err == null) { // 发送成功后刷新「全部」已上传图片列表。 @@ -744,32 +781,31 @@ class _FolderDetailView extends StatelessWidget { @override Widget build(BuildContext context) { if (assets.isEmpty) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 80), - child: Column( - children: [ - const Icon(CupertinoIcons.photo, size: 56, color: AppColors.sub), - const SizedBox(height: 12), - Text( - l10n.albumFolderEmpty, - style: const TextStyle(fontSize: 14, color: AppColors.sub), - ), - ], + return SliverToBoxAdapter( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 80), + child: Column( + children: [ + const Icon(CupertinoIcons.photo, size: 56, color: AppColors.sub), + const SizedBox(height: 12), + Text( + l10n.albumFolderEmpty, + style: const TextStyle(fontSize: 14, color: AppColors.sub), + ), + ], + ), ), ); } - return Padding( + return SliverPadding( padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 8), - child: GridView.builder( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), + sliver: SliverGrid( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, crossAxisSpacing: 3, mainAxisSpacing: 3, ), - itemCount: assets.length, - itemBuilder: (context, i) { + delegate: SliverChildBuilderDelegate((context, i) { final thumb = assets[i]; return GestureDetector( onTap: () => onView(thumb), @@ -779,7 +815,7 @@ class _FolderDetailView extends StatelessWidget { child: AlbumThumb(thumb: thumb, size: 240), ), ); - }, + }, childCount: assets.length), ), ); } diff --git a/lib/features/album/presentation/album_thumbnail.dart b/lib/features/album/presentation/album_thumbnail.dart index d7e35a6..ae575b3 100644 --- a/lib/features/album/presentation/album_thumbnail.dart +++ b/lib/features/album/presentation/album_thumbnail.dart @@ -30,6 +30,8 @@ class AlbumThumb extends ConsumerStatefulWidget { class _AlbumThumbState extends ConsumerState { late Future _future; + ui.Image? _image; + int _generation = 0; @override void initState() { @@ -47,13 +49,32 @@ class _AlbumThumbState extends ConsumerState { } } - Future _load() => ref - .read(photoRepositoryProvider) - .loadThumb(widget.thumb, size: widget.size); + Future _load() async { + final generation = ++_generation; + _image?.dispose(); + _image = null; + final image = await ref + .read(photoRepositoryProvider) + .loadThumb(widget.thumb, size: widget.size); + if (!mounted || generation != _generation) { + image?.dispose(); + return null; + } + _image = image; + return image; + } + + @override + void dispose() { + _generation++; + _image?.dispose(); + super.dispose(); + } @override Widget build(BuildContext context) { return FutureBuilder( + key: ValueKey(_generation), future: _future, builder: (context, snapshot) { if (snapshot.connectionState != ConnectionState.done || diff --git a/lib/features/auth/data/auth_repository_impl.dart b/lib/features/auth/data/auth_repository_impl.dart index f84301b..bc0027c 100644 --- a/lib/features/auth/data/auth_repository_impl.dart +++ b/lib/features/auth/data/auth_repository_impl.dart @@ -22,7 +22,7 @@ class AuthRepositoryImpl implements AuthRepository { username: phone, password: password, ); - TokenStorage.saveTokens( + await TokenStorage.saveTokens( token: result.token, refreshToken: result.refreshToken, ); @@ -35,11 +35,8 @@ class AuthRepositoryImpl implements AuthRepository { required String code, required String deviceId, }) async { - final result = await _api.loginBySms( - phone: phone, - code: code, - ); - TokenStorage.saveTokens( + final result = await _api.loginBySms(phone: phone, code: code); + await TokenStorage.saveTokens( token: result.token, refreshToken: result.refreshToken, ); @@ -58,7 +55,7 @@ class AuthRepositoryImpl implements AuthRepository { code: code, password: password, ); - TokenStorage.saveTokens( + await TokenStorage.saveTokens( token: result.token, refreshToken: result.refreshToken, ); @@ -66,10 +63,7 @@ class AuthRepositoryImpl implements AuthRepository { } @override - Future sendSmsCode({ - required String phone, - required SmsScene scene, - }) => + Future sendSmsCode({required String phone, required SmsScene scene}) => _api.sendSmsCode(phone: phone, scene: scene); @override @@ -77,6 +71,5 @@ class AuthRepositoryImpl implements AuthRepository { required String phone, required String code, required String password, - }) => - _api.resetPassword(phone: phone, code: code, password: password); + }) => _api.resetPassword(phone: phone, code: code, password: password); } diff --git a/lib/features/auth/presentation/auth_controller.dart b/lib/features/auth/presentation/auth_controller.dart index c0f3891..7d5bf43 100644 --- a/lib/features/auth/presentation/auth_controller.dart +++ b/lib/features/auth/presentation/auth_controller.dart @@ -5,7 +5,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../core/network/api_exception.dart'; import '../../../core/network/error_message.dart'; import '../../../core/storage/token_storage.dart'; -import '../../device/data/device_providers.dart'; import '../data/auth_providers.dart'; import '../domain/auth_models.dart'; import '../domain/auth_state.dart'; @@ -33,23 +32,24 @@ class AuthController extends Notifier { required String phone, required String password, }) async { - return _run(() => ref.read(authRepositoryProvider).loginByPassword( - phone: phone, - password: password, - deviceId: _deviceId, - )); + return _run( + () => ref + .read(authRepositoryProvider) + .loginByPassword( + phone: phone, + password: password, + deviceId: _deviceId, + ), + ); } /// 短信登录。 - Future loginBySms({ - required String phone, - required String code, - }) async { - return _run(() => ref.read(authRepositoryProvider).loginBySms( - phone: phone, - code: code, - deviceId: _deviceId, - )); + Future loginBySms({required String phone, required String code}) async { + return _run( + () => ref + .read(authRepositoryProvider) + .loginBySms(phone: phone, code: code, deviceId: _deviceId), + ); } /// 注册。 @@ -58,12 +58,16 @@ class AuthController extends Notifier { required String code, required String password, }) async { - return _run(() => ref.read(authRepositoryProvider).register( - phone: phone, - code: code, - password: password, - deviceId: _deviceId, - )); + return _run( + () => ref + .read(authRepositoryProvider) + .register( + phone: phone, + code: code, + password: password, + deviceId: _deviceId, + ), + ); } /// 发送短信验证码并启动 60s 倒计时。 @@ -83,16 +87,12 @@ class AuthController extends Notifier { } state = state.copyWith(isSendingCode: true, clearAlert: true); try { - await ref.read(authRepositoryProvider).sendSmsCode( - phone: trimmed, - scene: scene, - ); + await ref + .read(authRepositoryProvider) + .sendSmsCode(phone: trimmed, scene: scene); _startCountdown(); } catch (e) { - state = state.copyWith( - isSendingCode: false, - alert: userMessageOf(e), - ); + state = state.copyWith(isSendingCode: false, alert: userMessageOf(e)); } } @@ -112,11 +112,9 @@ class AuthController extends Notifier { }) async { state = state.copyWith(isLoading: true, clearAlert: true); try { - await ref.read(authRepositoryProvider).resetPassword( - phone: phone, - code: code, - password: password, - ); + await ref + .read(authRepositoryProvider) + .resetPassword(phone: phone, code: code, password: password); state = state.copyWith(isLoading: false); return true; } catch (e) { @@ -134,15 +132,11 @@ class AuthController extends Notifier { /// 登出。 /// - /// 除清除令牌与登录态外,还需失效当前账号的已绑定设备列表及由其推导的 - /// 选中设备 SN 等 Provider,否则切换账号登录后仍会读到上一账号缓存的设备/ - /// SN 数据(`myDevicesProvider` / `selectedDeviceSnProvider` 等持有旧值)。 + /// 会话版本变化后,应用根节点统一销毁当前账号的 ProviderScope。 void logout() { _countdownTimer?.cancel(); - TokenStorage.clear(); + TokenStorage.clear().catchError((Object _) {}); state = const AuthState(); - // 失效当前账号相关的设备与选中 SN 缓存,避免下一账号登录后沿用旧 SN。 - ref.invalidate(myDevicesProvider); } Future _run(Future Function() action) async { @@ -180,9 +174,9 @@ class AuthController extends Notifier { } }); } - } /// 认证控制器 Provider(会话级 keepAlive 在 build 内通过 ref.keepAlive 实现)。 -final authControllerProvider = - NotifierProvider(AuthController.new); +final authControllerProvider = NotifierProvider( + AuthController.new, +); diff --git a/lib/features/connection/data/signaling_client.dart b/lib/features/connection/data/signaling_client.dart index 6465b96..ed79b02 100644 --- a/lib/features/connection/data/signaling_client.dart +++ b/lib/features/connection/data/signaling_client.dart @@ -6,6 +6,7 @@ import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:web_socket_channel/io.dart'; import '../../../core/storage/token_storage.dart'; +import '../../../core/utils/local_network_access.dart'; import '../domain/connection_models.dart'; /// WebRTC 信令 WebSocket 客户端(控制端)。 @@ -32,9 +33,12 @@ class SignalingClient { /// [serverUrl] WebSocket 地址(如 ws://host:port/ws/signal)。 /// [targetSn] 目标设备 SN(作为 query 参数传给服务端做绑定校验)。 Future connect(String serverUrl, {String? targetSn}) async { - final token = TokenStorage.accessToken ?? ''; + final sessionVersion = TokenStorage.sessionVersion; final uri = Uri.parse('$serverUrl?sn=$targetSn'); + await LocalNetworkAccess.ensure(uri); + if (sessionVersion != TokenStorage.sessionVersion) return; + final token = TokenStorage.accessToken ?? ''; _channel = IOWebSocketChannel.connect( uri, headers: {'Authorization': 'Bearer $token'}, @@ -44,7 +48,7 @@ class SignalingClient { _subscription = _channel!.stream.listen( (data) => _handleRaw(data), onError: (Object e) { - debugPrint('[webrtc] 信令错误: $e'); + debugPrint('[webrtc] 信令连接错误'); onError?.call('信令连接异常'); }, onDone: () { @@ -52,7 +56,7 @@ class SignalingClient { onConnectionChanged?.call(false); }, ); - debugPrint('[webrtc] 信令已发起连接: $uri'); + debugPrint('[webrtc] 信令已发起连接'); } void _handleRaw(dynamic data) { @@ -60,7 +64,9 @@ class SignalingClient { try { final json = jsonDecode(data) as Map; final msg = SignalMessage.fromJson(json); - debugPrint('[webrtc] 信令收到: type=${msg.type}, from=${msg.fromDeviceId}, to=${msg.toDeviceId}'); + debugPrint( + '[webrtc] 信令收到: type=${msg.type}, from=${msg.fromDeviceId}, to=${msg.toDeviceId}', + ); onMessage?.call(msg); } catch (e) { debugPrint('[webrtc] 信令解析失败: $e'); diff --git a/lib/features/connection/presentation/connection_controller.dart b/lib/features/connection/presentation/connection_controller.dart index e111e3a..07cabb9 100644 --- a/lib/features/connection/presentation/connection_controller.dart +++ b/lib/features/connection/presentation/connection_controller.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart'; @@ -27,17 +28,22 @@ class ConnectionSessionState { /// 是否正在录制远程视频。 final bool recording; + /// 录制状态提示(已保存路径等)。 final String recordStatus; /// 当前选中的分辨率预设下标。 final int selectedResolution; + /// 分辨率预设列表。 final List> resolutionOptions; + /// 帧率档位(收到被控端上报后以上报列表为准)。 final List fpsOptions; + /// 被控端当前采集帧率(0 表示尚未收到上报)。 final int currentFps; + /// 被控端最近上报的实际采集尺寸(切帧率时保持分辨率不变)。 final int lastReportedWidth; final int lastReportedHeight; @@ -92,10 +98,29 @@ class ConnectionController extends Notifier { @override ConnectionSessionState build() { + final signaling = ref.read(signalingClientProvider); + ref.onDispose(() { + _disposed = true; + signaling.onMessage = null; + signaling.onError = null; + signaling.dispose(); + final orchestrator = _orchestrator; + _orchestrator = null; + if (orchestrator != null) { + orchestrator.onConnectionState = null; + orchestrator.onReport = null; + } + unawaited( + _videoRecorder.dispose().whenComplete(() async { + await orchestrator?.dispose(); + }), + ); + }); return const ConnectionSessionState(); } /// 目标设备 SN(页面初始化时设置)。 + bool _disposed = false; String? _targetSn; set targetSn(String? value) => _targetSn = value; @@ -151,8 +176,10 @@ class ConnectionController extends Notifier { try { await signaling.connect(signalServerUrl, targetSn: sn); - await _orchestrator!.start(); + if (_disposed) return; + await _orchestrator?.start(); } catch (e) { + if (_disposed) return; state = ConnectionSessionState( state: ConnectionState.error, errorMessage: '连接失败: $e', @@ -162,17 +189,11 @@ class ConnectionController extends Notifier { void _onRtcState(bool connected) { if (connected) { - state = state.copyWith( - state: ConnectionState.connected, - hasVideo: true, - ); + state = state.copyWith(state: ConnectionState.connected, hasVideo: true); // 连接成功后按默认分辨率(1080P)下发一次,确保默认生效。 selectResolution(state.selectedResolution); } else { - state = state.copyWith( - state: ConnectionState.ended, - hasVideo: false, - ); + state = state.copyWith(state: ConnectionState.ended, hasVideo: false); } } @@ -194,23 +215,31 @@ class ConnectionController extends Notifier { /// 发送点击(相对坐标 0~1)。 void sendTap(double relX, double relY) { - debugPrint('[touch] TAP rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})'); + debugPrint( + '[touch] TAP rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})', + ); _orchestrator?.sendTap(relX, relY); } void sendLongPress(double relX, double relY) { - debugPrint('[touch] LONG_PRESS rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})'); + debugPrint( + '[touch] LONG_PRESS rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})', + ); _orchestrator?.sendLongPress(relX, relY); } void sendSwipe(double relX1, double relY1, double relX2, double relY2) { - debugPrint('[touch] SWIPE rel=(${relX1.toStringAsFixed(3)}, ${relY1.toStringAsFixed(3)}) -> (${relX2.toStringAsFixed(3)}, ${relY2.toStringAsFixed(3)})'); + debugPrint( + '[touch] SWIPE rel=(${relX1.toStringAsFixed(3)}, ${relY1.toStringAsFixed(3)}) -> (${relX2.toStringAsFixed(3)}, ${relY2.toStringAsFixed(3)})', + ); _orchestrator?.sendSwipe(relX1, relY1, relX2, relY2); } /// 发送实时触摸事件(MOTION_EVENT,跟手用)。action:0=DOWN,1=UP,2=MOVE。 void sendMotionEvent(int action, double relX, double relY) { - debugPrint('[touch] MOTION action=$action rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})'); + debugPrint( + '[touch] MOTION action=$action rel=(${relX.toStringAsFixed(3)}, ${relY.toStringAsFixed(3)})', + ); _orchestrator?.sendMotionEvent(action, relX, relY); } @@ -283,10 +312,20 @@ class ConnectionController extends Notifier { /// 关闭并清理。 Future disconnect() async { - await _videoRecorder.dispose(); - await _orchestrator?.dispose(); + final signaling = ref.read(signalingClientProvider); + final orchestrator = _orchestrator; _orchestrator = null; - ref.read(signalingClientProvider).dispose(); - state = const ConnectionSessionState(state: ConnectionState.ended); + signaling.onMessage = null; + signaling.onError = null; + signaling.dispose(); + if (orchestrator != null) { + orchestrator.onConnectionState = null; + orchestrator.onReport = null; + } + await _videoRecorder.dispose(); + await orchestrator?.dispose(); + if (!_disposed) { + state = const ConnectionSessionState(state: ConnectionState.ended); + } } } diff --git a/lib/features/home/presentation/wallpaper_page.dart b/lib/features/home/presentation/wallpaper_page.dart index 4d3dec3..c3423a9 100644 --- a/lib/features/home/presentation/wallpaper_page.dart +++ b/lib/features/home/presentation/wallpaper_page.dart @@ -1,11 +1,6 @@ import 'dart:io'; import 'package:cupertino_ui/cupertino_ui.dart'; -// 仅取 GlobalWidgetsLocalizations;GlobalMaterialLocalizations 须用 material_ui 自带的 -//(vendored 框架副本,提供其 MaterialLocalizations 类型并支持 zh 等多语言), -// 若整体导入 flutter_localizations 会与 material_ui 导出的同名类冲突。 -import 'package:flutter_localizations/flutter_localizations.dart' - show GlobalWidgetsLocalizations; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:image_picker/image_picker.dart'; @@ -436,55 +431,42 @@ class _WallpaperPageState extends ConsumerState { Expanded( child: _rotationItems.isEmpty ? _buildRotationEmpty() - // ReorderableListView 属于 Material 组件,运行期需要 MaterialLocalizations; - // 本应用根组件是 CupertinoApp(仅提供 CupertinoLocalizations),故此处 - // 局部包一层 Localizations 补齐。注意: - // - DefaultMaterialLocalizations 仅支持 en_US,zh 下不会加载,必须用 - // material_ui 自带、支持多语言的 GlobalMaterialLocalizations.delegate; - // - Localizations 断言要求至少一个 WidgetsLocalizations delegate, - // 使用 flutter_localizations 的 GlobalWidgetsLocalizations.delegate。 - : Localizations( - locale: Localizations.localeOf(context), - delegates: const [ - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], - child: ReorderableListView.builder( - padding: const EdgeInsets.fromLTRB(16, 4, 16, 24), - buildDefaultDragHandles: false, - // 默认 proxyDecorator 用不透明 Material 包裹拖拽项, - // 会把 item 底部内边距渲染成白色条(留白),且圆角处不透明白色。 - // 改用透明 Material,仅保留阴影,圆角处透出页面背景。 - proxyDecorator: (child, index, animation) => Material( - type: MaterialType.canvas, - color: Colors.transparent, - elevation: 4, - shadowColor: Colors.black26, - borderRadius: BorderRadius.circular(14), - child: child, - ), - itemCount: _rotationItems.length + - (_rotationItems.length < _maxRotation ? 1 : 0), - onReorder: _onReorder, - itemBuilder: (context, index) { - // 末尾「新增」占位项:不参与拖动。 - if (index >= _rotationItems.length) { - return Padding( - key: const ValueKey('wallpaper_add_tile'), - padding: const EdgeInsets.only(top: 12), - child: _buildAddTile(), - ); - } - return ReorderableDelayedDragStartListener( - key: ValueKey('wallpaper_item_$index'), - index: index, - child: Padding( - padding: const EdgeInsets.only(bottom: 12), - child: _buildImageTile(index), - ), - ); - }, + : ReorderableListView.builder( + padding: const EdgeInsets.fromLTRB(16, 4, 16, 24), + buildDefaultDragHandles: false, + // 默认 proxyDecorator 用不透明 Material 包裹拖拽项, + // 会把 item 底部内边距渲染成白色条(留白),且圆角处不透明白色。 + // 改用透明 Material,仅保留阴影,圆角处透出页面背景。 + proxyDecorator: (child, index, animation) => Material( + type: MaterialType.canvas, + color: Colors.transparent, + elevation: 4, + shadowColor: Colors.black26, + borderRadius: BorderRadius.circular(14), + child: child, ), + itemCount: + _rotationItems.length + + (_rotationItems.length < _maxRotation ? 1 : 0), + onReorder: _onReorder, + itemBuilder: (context, index) { + // 末尾「新增」占位项:不参与拖动。 + if (index >= _rotationItems.length) { + return Padding( + key: const ValueKey('wallpaper_add_tile'), + padding: const EdgeInsets.only(top: 12), + child: _buildAddTile(), + ); + } + return ReorderableDelayedDragStartListener( + key: ValueKey('wallpaper_item_$index'), + index: index, + child: Padding( + padding: const EdgeInsets.only(bottom: 12), + child: _buildImageTile(index), + ), + ); + }, ), ), ], diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 01ed24a..ab35c74 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -2179,6 +2179,12 @@ abstract class AppLocalizations { /// In zh, this message translates to: /// **'加载失败'** String get commonLoadFailed; + + /// No description provided for @albumLoadMore. + /// + /// In zh, this message translates to: + /// **'加载更多'** + String get albumLoadMore; } class _AppLocalizationsDelegate diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index a77798d..0f23d15 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -1085,4 +1085,7 @@ class AppLocalizationsEn extends AppLocalizations { @override String get commonLoadFailed => 'Failed to load'; + + @override + String get albumLoadMore => 'Load more'; } diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 706f62c..206cdbb 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -1062,4 +1062,7 @@ class AppLocalizationsZh extends AppLocalizations { @override String get commonLoadFailed => '加载失败'; + + @override + String get albumLoadMore => '加载更多'; } diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 9e35f81..785adec 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -358,5 +358,6 @@ "commonCancel": "Cancel", "commonSave": "Save", "commonRetry": "Retry", - "commonLoadFailed": "Failed to load" + "commonLoadFailed": "Failed to load", + "albumLoadMore": "Load more" } diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index 04cf496..aae4737 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -1418,5 +1418,6 @@ "commonLoadFailed": "加载失败", "@commonLoadFailed": { "description": "通用:加载失败" - } + }, + "albumLoadMore": "加载更多" } diff --git a/lib/main.dart b/lib/main.dart index 59c5e0c..d6a29ae 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -27,7 +27,9 @@ void main() async { // 初始化百度地图 SDK(需申请 AK;坐标类型使用 BD09LL,设备 GPS 坐标在展示前转换)。 BMFMapSDK.setAgreePrivacy(true); BMFMapSDK.setApiKeyAndCoordType( - AppConstants.kBaiduMapAk, BMF_COORD_TYPE.BD09LL); + AppConstants.kBaiduMapAk, + BMF_COORD_TYPE.BD09LL, + ); // 初始化 Android 版本适配:Android 10+ 使用 surfaceMapView(比默认 textureMapView 更稳定), // 避免百度 SDK 在模拟器 / 部分机型上因 textureView + EGL 渲染冲突触发原生崩溃(SIGSEGV / EGL_BAD_MATCH)。 await BMFAndroidVersion.initAndroidVersion(); @@ -36,8 +38,7 @@ void main() async { await SystemUiUtil.configure(); // 初始化本地存储(含超时保护,避免阻塞启动导致卡在首屏)。 - await TokenStorage.initialize() - .timeout(const Duration(seconds: 5), onTimeout: () {}); + await TokenStorage.initialize(); // 设备信息打印不阻塞启动主流程。 DeviceInfoUtil.printDeviceInfo(); diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements index dddb8a3..b231432 100644 --- a/macos/Runner/DebugProfile.entitlements +++ b/macos/Runner/DebugProfile.entitlements @@ -8,5 +8,7 @@ com.apple.security.network.server + keychain-access-groups + diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements index 852fa1a..0833c1b 100644 --- a/macos/Runner/Release.entitlements +++ b/macos/Runner/Release.entitlements @@ -4,5 +4,7 @@ com.apple.security.app-sandbox + keychain-access-groups + diff --git a/pubspec.yaml b/pubspec.yaml index 2b21fb4..9639a33 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -98,8 +98,8 @@ dependencies: # 与 iOS(PhotoKit,含 limited 授权状态)的相册权限与读取。 photo_manager: ^3.6.0 - cupertino_ui: any - material_ui: any + cupertino_ui: ^1.1.3 + material_ui: ^1.7.0 intl: any lpinyin: ^2.0.3 flutter_displaymode: ^0.7.0 diff --git a/test/core/network/dio_client_test.dart b/test/core/network/dio_client_test.dart new file mode 100644 index 0000000..69f9ce5 --- /dev/null +++ b/test/core/network/dio_client_test.dart @@ -0,0 +1,151 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:dio/dio.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:ttstd_family_care/core/network/dio_client.dart'; +import 'package:ttstd_family_care/core/network/api_exception.dart'; +import 'package:ttstd_family_care/core/storage/token_storage.dart'; + +class FakeAdapter implements HttpClientAdapter { + FakeAdapter(this.respond); + final Future Function(RequestOptions) respond; + @override + Future fetch( + RequestOptions options, + Stream? requestStream, + Future? cancelFuture, + ) => respond(options); + @override + void close({bool force = false}) {} +} + +ResponseBody body(String code, {int status = 200, Object? data}) => + ResponseBody.fromString( + jsonEncode({'code': code, 'data': data}), + status, + headers: { + Headers.contentTypeHeader: [Headers.jsonContentType], + }, + ); + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + setUp(() async { + FlutterSecureStorage.setMockInitialValues({}); + await TokenStorage.clear(); + await TokenStorage.saveTokens(token: 'old', refreshToken: 'refresh'); + }); + tearDown(DioClient.reset); + + for (final businessError in [false, true]) { + test( + 'concurrent expiry shares refresh (business=$businessError)', + () async { + var refreshes = 0; + var expired = 0; + final allExpired = Completer(); + DioClient.useAdapterForTesting( + FakeAdapter((request) async { + if (request.path.contains('refresh-token')) { + refreshes++; + await allExpired.future; + return body( + '00000', + data: {'accessToken': 'new', 'refreshToken': 'rotated'}, + ); + } + if (request.headers['Authorization'] == 'Bearer old') { + expired++; + if (expired == 3) allExpired.complete(); + return body('A0230', status: businessError ? 200 : 401); + } + return body('00000', data: request.path); + }), + ); + expect( + await Future.wait([ + DioClient.get('one'), + DioClient.get('two'), + DioClient.get('three'), + ]), + ['one', 'two', 'three'], + ); + expect(refreshes, 1); + expect(TokenStorage.accessToken, 'new'); + }, + ); + } + + test('replay still unauthorized stops after one retry', () async { + var calls = 0; + var refreshes = 0; + DioClient.useAdapterForTesting( + FakeAdapter((request) async { + if (request.path.contains('refresh-token')) { + refreshes++; + return body('00000', data: {'accessToken': 'new'}); + } + calls++; + return body('A0230', status: 401); + }), + ); + await expectLater(DioClient.get('protected'), throwsA(isA())); + expect(calls, 2); + expect(refreshes, 1); + expect(TokenStorage.isLoggedIn, false); + }); + + test('old refresh cannot replace a new account session', () async { + final started = Completer(); + final release = Completer(); + DioClient.useAdapterForTesting( + FakeAdapter((request) async { + if (request.path.contains('refresh-token')) { + started.complete(); + await release.future; + return body('00000', data: {'accessToken': 'stale'}); + } + return body('A0230', status: 401); + }), + ); + final result = expectLater( + DioClient.get('protected'), + throwsA(isA()), + ); + await started.future; + await TokenStorage.clear(); + await TokenStorage.saveTokens( + token: 'account-b', + refreshToken: 'refresh-b', + ); + release.complete(); + await result; + expect(TokenStorage.accessToken, 'account-b'); + }); + + test( + 'refresh preserves session version; logout and login advance it', + () async { + final version = TokenStorage.sessionVersion; + await TokenStorage.saveTokens( + token: 'renewed', + refreshToken: 'r', + newSession: false, + ); + expect(TokenStorage.sessionVersion, version); + final clearing = TokenStorage.clear(); + final saving = TokenStorage.saveTokens(token: 'other'); + await Future.wait([clearing, saving]); + expect(TokenStorage.accessToken, 'other'); + expect(TokenStorage.refreshToken, isNull); + expect(TokenStorage.sessionVersion, version + 2); + final saved = await const FlutterSecureStorage().read( + key: 'family_care_credentials', + ); + expect(jsonDecode(saved!)['accessToken'], 'other'); + }, + ); +} diff --git a/test/features/album/album_controller_test.dart b/test/features/album/album_controller_test.dart new file mode 100644 index 0000000..ddae47d --- /dev/null +++ b/test/features/album/album_controller_test.dart @@ -0,0 +1,99 @@ +import 'dart:async'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:ttstd_family_care/features/album/data/photo_providers.dart'; +import 'package:ttstd_family_care/features/album/data/photo_repository.dart'; +import 'package:ttstd_family_care/features/album/domain/album_models.dart'; +import 'package:ttstd_family_care/features/album/presentation/album_controller.dart'; + +class FakePhotos extends PhotoRepository { + final pages = []; + Completer>? pending; + bool cleared = false; + @override + Future> loadFolderAssets( + String id, { + int page = 0, + int pageSize = 90, + }) async { + pages.add(page); + if (pending != null) return pending!.future; + return List.generate( + page == 0 ? pageSize : 2, + (i) => PhotoThumb( + assetId: '$page-$i', + originalWidth: 10, + originalHeight: 10, + ), + ); + } + + @override + void clearCache() { + cleared = true; + } +} + +void main() { + const folder = AlbumFolder( + id: 'folder', + name: 'Photos', + assetCount: 92, + coverAssetId: 'cover', + ); + test('loads pages incrementally and stops at the last page', () async { + final repo = FakePhotos(); + final container = ProviderContainer( + overrides: [ + photoRepositoryProvider.overrideWith((ref) { + ref.onDispose(repo.clearCache); + return repo; + }), + ], + ); + final subscription = container.listen(albumControllerProvider, (_, _) {}); + final controller = container.read(albumControllerProvider.notifier); + await controller.openAlbum(folder); + expect(container.read(albumControllerProvider).assets.length, 90); + await controller.loadMore(); + await controller.loadMore(); + expect(repo.pages, [0, 1]); + expect(container.read(albumControllerProvider).assets.length, 92); + subscription.close(); + await container.pump(); + expect(repo.cleared, true); + container.dispose(); + }); + + test('returning to folders discards a pending page', () async { + final repo = FakePhotos()..pending = Completer>(); + final container = ProviderContainer( + overrides: [photoRepositoryProvider.overrideWithValue(repo)], + ); + final subscription = container.listen(albumControllerProvider, (_, _) {}); + final controller = container.read(albumControllerProvider.notifier); + final loading = controller.openAlbum(folder); + controller.backToFolders(); + repo.pending!.complete([]); + await loading; + expect(container.read(albumControllerProvider).currentAlbum, isNull); + expect(container.read(albumControllerProvider).requesting, false); + subscription.close(); + container.dispose(); + }); + test('completion after page disposal cannot update state', () async { + final repo = FakePhotos()..pending = Completer>(); + final container = ProviderContainer( + overrides: [photoRepositoryProvider.overrideWithValue(repo)], + ); + final subscription = container.listen(albumControllerProvider, (_, _) {}); + final loading = container + .read(albumControllerProvider.notifier) + .openAlbum(folder); + subscription.close(); + await container.pump(); + repo.pending!.complete([]); + await loading; + container.dispose(); + }); +} diff --git a/test/features/auth/session_test.dart b/test/features/auth/session_test.dart new file mode 100644 index 0000000..24ed849 --- /dev/null +++ b/test/features/auth/session_test.dart @@ -0,0 +1,72 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:go_router/go_router.dart'; +import 'package:ttstd_family_care/app/app.dart'; +import 'package:ttstd_family_care/app/router/app_router.dart'; +import 'package:ttstd_family_care/core/storage/token_storage.dart'; + +void main() { + setUp(() async { + FlutterSecureStorage.setMockInitialValues({}); + await TokenStorage.clear(); + }); + + testWidgets('account changes dispose and replace provider caches', ( + tester, + ) async { + var created = 0; + var disposed = 0; + final cache = Provider((ref) { + ref.onDispose(() => disposed++); + return ++created; + }); + final router = GoRouter( + initialLocation: '/login', + routes: [ + GoRoute( + path: '/login', + builder: (_, _) => Consumer( + builder: (context, ref, _) => Text('cache:${ref.watch(cache)}'), + ), + ), + ], + ); + await tester.pumpWidget(buildApp(router)); + await tester.pumpAndSettle(); + expect(find.text('cache:1'), findsOneWidget); + await tester.runAsync(() => TokenStorage.saveTokens(token: 'a')); + await tester.pumpAndSettle(); + expect(find.text('cache:2'), findsOneWidget); + expect(disposed, 1); + await tester.runAsync( + () => TokenStorage.saveTokens(token: 'renewed', newSession: false), + ); + await tester.pumpAndSettle(); + expect(find.text('cache:2'), findsOneWidget); + await tester.runAsync(TokenStorage.clear); + await tester.pumpAndSettle(); + expect(find.text('cache:3'), findsOneWidget); + await tester.pumpWidget(const SizedBox()); + router.dispose(); + }); + + testWidgets('unauthenticated protected routes redirect to login', ( + tester, + ) async { + final router = buildAppRouter(); + await tester.pumpWidget(buildApp(router)); + await tester.pumpAndSettle(); + for (final path in ['/security', '/connection', '/album']) { + router.go(path); + await tester.pumpAndSettle(); + expect(router.routeInformationProvider.value.uri.path, '/login'); + } + router.go('/legal'); + await tester.pumpAndSettle(); + expect(router.routeInformationProvider.value.uri.path, '/legal'); + await tester.pumpWidget(const SizedBox()); + router.dispose(); + }); +} diff --git a/test/widget_test.dart b/test/widget_test.dart index a757e61..d67071b 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -3,21 +3,15 @@ // 验证 CupertinoApp.router + ProviderScope + GoRouter 能正常构建并渲染首屏。 // 重构后入口为 buildApp(buildAppRouter()),不再存在默认模板的 MyApp / Counter。 // -// 注意:TokenStorage 依赖 MMKV,需在测试环境先 initialize(真实运行在 main 中完成)。 +// 未登录首屏使用内存登录态,无需初始化原生插件。 import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:ttstd_family_care/app/app.dart'; import 'package:ttstd_family_care/app/router/app_router.dart'; -import 'package:ttstd_family_care/core/storage/token_storage.dart'; void main() { - setUpAll(() async { - // 初始化 MMKV,避免启动页路由决策时访问未就绪的存储。 - await TokenStorage.initialize(); - }); - testWidgets('应用可正常构建并渲染首屏', (tester) async { // 构建真实应用根组件(ProviderScope + CupertinoApp.router)。 await tester.pumpWidget(buildApp(buildAppRouter())); diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index ac7420a..6eff198 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -41,6 +41,8 @@ function(APPLY_STANDARD_SETTINGS TARGET) target_compile_features(${TARGET} PUBLIC cxx_std_17) target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") target_compile_options(${TARGET} PRIVATE /EHsc) + # 源码为 UTF-8,未指定时 MSVC 按系统代码页解析,中文系统下会触发 C4819 并被 /WX 当错误。 + target_compile_options(${TARGET} PRIVATE /utf-8) target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") endfunction()