1

flutter_app/lib/camera/camera_screen.dart

@@ -6,6 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../detection/detector_worker.dart';
+import '../models/model_manager.dart';
 import '../reminder/reminder.dart';
 import 'app_camera_controller.dart';
 import 'camera_view_model.dart';
@@ -119,8 +120,18 @@ class _CameraScreenState extends State<CameraScreen> {
     setState(() => _permissionGranted = granted);
     if (!granted) return;
 
+    // 模型热更新：优先使用已下载的数据集模型（启动时后台拉取；此处兜底等待，
+    // 下载慢/失败不阻塞相机启动——无下载模型时 worker 回退内置资产）
+    if (!ModelManager.instance.ready) {
+      try {
+        await ModelManager.instance
+            .refresh()
+            .timeout(const Duration(seconds: 15));
+      } catch (_) {}
+    }
     // 模型加载/推理在后台 isolate，不阻塞 UI；worker 为 null 时仅预览并提示
-    final worker = await DetectorWorker.create();
+    final worker = await DetectorWorker.create(
+        models: ModelManager.instance.models);
     final viewModel = CameraViewModel(reminder: Reminder());
     viewModel.setModelReady(worker != null);
     final analyzer = FrameAnalyzer(worker: worker, viewModel: viewModel);
@@ -276,6 +287,27 @@ class _CameraScreenState extends State<CameraScreen> {
     return Stack(
       fit: StackFit.expand,
       children: [
+        // 模型热更新下载失败提示（已加载模型仍可用，仅提示补更新）
+        if (vm.state.modelReady && ModelManager.instance.error != null)
+          Positioned(
+            left: 16,
+            right: 16,
+            top: MediaQuery.of(context).padding.top + 56,
+            child: Container(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              child: Text(
+                ModelManager.instance.error!,
+                textAlign: TextAlign.center,
+                style: const TextStyle(color: Colors.orange, fontSize: 12),
+              ),
+            ),
+          ),
+
         // 模型未加载时仅显示相机预览，不做检测标注（横幅置于顶栏下方，避免与底部诊断行重叠）
         if (!vm.state.modelReady)
           Positioned(
@@ -305,7 +337,7 @@ class _CameraScreenState extends State<CameraScreen> {
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Text(
-                '阈值:${(_minScore * 100).toStringAsFixed(0)}% 模型:${vm.state.modelReady ? '已加载' : '未加载'} 帧:${vm.state.framesReceived} 流:${camera?.streamCallbacks ?? 0} 推理:${vm.state.debugDetectCalls}次 异常:${vm.state.debugDetectErrors}次 处理:${vm.state.debugLastMs}ms 最高分:${(vm.state.debugHighestScore * 100).toStringAsFixed(1)}% 图:${vm.state.imageWidthPx}x${vm.state.imageHeightPx} 传感:${camera?.sensorOrientation ?? '-'} 屏转:${camera?.displayDegrees ?? '-'} 旋:${camera?.rotationDegrees ?? 0} turn:${camera?.quarterTurns ?? '-'}',
+                '阈值:${(_minScore * 100).toStringAsFixed(0)}% 模型:${vm.state.modelReady ? ModelManager.instance.modelsLabel : '未加载'} 帧:${vm.state.framesReceived} 流:${camera?.streamCallbacks ?? 0} 推理:${vm.state.debugDetectCalls}次 异常:${vm.state.debugDetectErrors}次 处理:${vm.state.debugLastMs}ms 最高分:${(vm.state.debugHighestScore * 100).toStringAsFixed(1)}% 图:${vm.state.imageWidthPx}x${vm.state.imageHeightPx} 传感:${camera?.sensorOrientation ?? '-'} 屏转:${camera?.displayDegrees ?? '-'} 旋:${camera?.rotationDegrees ?? 0} turn:${camera?.quarterTurns ?? '-'}',
                 style: const TextStyle(color: Colors.white70, fontSize: 12),
               ),
               if (_nativeStats.isNotEmpty)