ソースを参照

fix(vid): 修正Vid加载流程 Review by loki

gavin.chen 2 年 前
コミット
143ff4d900

+ 0 - 11
lib/process/workspace/measure_controller.dart

@@ -214,15 +214,4 @@ class MeasureController implements IMeasureController {
       }
     } catch (e) {}
   }
-
-  /// 选择Vid图像Url
-  String chooseImageUrl(TerminalImageDTO dto) {
-    // 按Server推荐选择CDN/源站
-    final useOrigin =
-        dto.recommendedDownloadMode == RecommendedDownloadModeEnum.Origin &&
-            dto.originImageUrl != null &&
-            dto.originImageUrl!.isNotEmpty;
-    final imageUrl = useOrigin ? dto.originImageUrl! : dto.imageUrl!;
-    return imageUrl;
-  }
 }

+ 11 - 0
lib/process/workspace/measure_data_controller.dart

@@ -538,6 +538,17 @@ class MeasureDataController implements IMeasureDataController {
     return result;
   }
 
+  /// 选择Vid图像Url
+  String chooseImageUrl(TerminalImageDTO dto) {
+    // 按Server推荐选择CDN/源站
+    final useOrigin =
+        dto.recommendedDownloadMode == RecommendedDownloadModeEnum.Origin &&
+            dto.originImageUrl != null &&
+            dto.originImageUrl!.isNotEmpty;
+    final imageUrl = useOrigin ? dto.originImageUrl! : dto.imageUrl!;
+    return imageUrl;
+  }
+
   void _onRemedicalListChanged() {
     remedicalListResultChanged.emit(this, remedicalList);
   }

+ 2 - 2
lib/view/measure/measure_images_bar.dart

@@ -223,6 +223,7 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
     if (measureData.itemCurrentImage == imageUrl) {
       return;
     }
+    measureData.itemCurrentImage = imageUrl;
     final selectedIndex = measureController.examInfo.images.indexWhere(
       (element) => element.url == imageUrl,
     );
@@ -235,7 +236,6 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
       imageUrl,
       remedicalCode,
     );
-
     measureController.examInfo.selectedImageIndex = selectedIndex;
     setState(() {});
   }
@@ -258,7 +258,7 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
     final item =
         remedicalList.firstWhere((e) => e.remedicalCode == remedicalCode);
     final imgInfo = item.terminalImages!;
-    return measureController.chooseImageUrl(imgInfo);
+    return measureData.chooseImageUrl(imgInfo);
   }
 
   @override

+ 3 - 4
lib/view/measure/measure_view.dart

@@ -116,7 +116,7 @@ class _MeasureMainPageState extends State<MeasureMainPage> {
         if (remedicalInfo.terminalImages != null) {
           _hideFullScreenLoading = true;
           measureData.itemCurrentImage =
-              measureController.chooseImageUrl(remedicalInfo.terminalImages!);
+              measureData.chooseImageUrl(remedicalInfo.terminalImages!);
           getExamImageInfoList(remedicals);
           measureHandler.changeImageList.emit(this, remedicals);
         }
@@ -319,8 +319,7 @@ class _MeasureMainPageState extends State<MeasureMainPage> {
       if (remedicalInfo.terminalImages != null) {
         _hideFullScreenLoading = true;
         final imgInfo = remedicalInfo.terminalImages!;
-        measureData.itemCurrentImage =
-            measureController.chooseImageUrl(imgInfo);
+        measureData.itemCurrentImage = measureData.chooseImageUrl(imgInfo);
         getExamImageInfoList(remedicals);
       }
     }
@@ -334,7 +333,7 @@ class _MeasureMainPageState extends State<MeasureMainPage> {
     /// 检查中图片信息表
     List<ExamImageInfo> examImageInfoList = remedicals.map((e) {
       final imgInfo = e.terminalImages!;
-      final vidUrl = measureController.chooseImageUrl(imgInfo);
+      final vidUrl = measureData.chooseImageUrl(imgInfo);
       return ExamImageInfo(vidUrl, imgInfo.previewUrl!);
     }).toList();
 

+ 2 - 3
lib/view/mobile_view/mobile_measure_view.dart

@@ -59,7 +59,7 @@ class _MobileMeasureMainPageState extends State<MobileMeasureMainPage> {
   void getExamImageInfoList(List<RemedicalInfoDTO> remedicals) async {
     examImageInfoList = remedicals.map((e) {
       final imgInfo = e.terminalImages!;
-      final vidUrl = measureController.chooseImageUrl(imgInfo);
+      final vidUrl = measureData.chooseImageUrl(imgInfo);
       return ExamImageInfo(vidUrl, imgInfo.previewUrl!);
     }).toList();
 
@@ -261,8 +261,7 @@ class _MobileMeasureMainPageState extends State<MobileMeasureMainPage> {
       if (remedicalInfo.terminalImages != null) {
         loaded = true;
         final imgInfo = remedicalInfo.terminalImages!;
-        measureData.itemCurrentImage =
-            measureController.chooseImageUrl(imgInfo);
+        measureData.itemCurrentImage = measureData.chooseImageUrl(imgInfo);
         getExamImageInfoList(remedicals);
       }
     }