bakamaka.guan 2 жил өмнө
parent
commit
cecfd6d3a1

+ 3 - 14
lib/process/language/measure_language.dart

@@ -1,21 +1,10 @@
-import 'dart:convert';
-
-import 'package:fis_measure/process/workspace/measure_data_controller.dart';
-import 'package:get/get.dart';
-
-typedef TranslateFunction = String Function(String key);
-// final measureData = Get.find<MeasureDataController>();
+typedef TranslateFunction = String Function(String module, String code);
 
 class MeasureLanguage {
-  // static Map<String, dynamic> _map = {};
-
-  // static void load(String mapJson) {
-  //   _map = jsonDecode(mapJson)["Language"];
-  // }
   static late TranslateFunction transFn;
 
   /// 翻译
-  String t(String code) {
-    return transFn(code);
+  String t(String module, String code) {
+    return transFn(module, code);
   }
 }

+ 1 - 0
lib/view/measure/measure_config/measure_configuation_page.dart

@@ -328,6 +328,7 @@ class _HasSelectedModulePage extends StatelessWidget implements FWidget {
                           ),
                           FText(
                             measureLanguage.t(
+                              'measure',
                               chooseMeasureList[index].toString(),
                             ),
                             style: const TextStyle(

+ 3 - 3
lib/view/measure/measure_config/widgets/measurement_tool_selection.dart

@@ -107,7 +107,7 @@ class _SelectModulePageState extends FState<SelectModulePage> {
               itemMetaGroupTitle,
             ),
             FText(
-              measureLanguage.t(itemMetaGroupTitle),
+              measureLanguage.t('measure', itemMetaGroupTitle),
             ),
           ],
         ),
@@ -141,7 +141,7 @@ class _SelectModulePageState extends FState<SelectModulePage> {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               FText(
-                measureLanguage.t(e.description ?? ''),
+                measureLanguage.t('measure', e.description ?? ''),
                 style: const TextStyle(
                   color: Colors.white,
                   fontSize: 14,
@@ -185,7 +185,7 @@ class _SelectModulePageState extends FState<SelectModulePage> {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               FText(
-                measureLanguage.t(e.description ?? ''),
+                measureLanguage.t('measure', e.description ?? ''),
                 style: const TextStyle(
                   color: Colors.black,
                   fontSize: 14,

+ 17 - 11
lib/view/measure/measure_images_bar.dart

@@ -292,7 +292,7 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
   }
 
   ///翻译图片描述
-  String translateDescription(RemedicalInfoDTO remedicalInfo) {
+  String _translateDescription(RemedicalInfoDTO remedicalInfo) {
     String description = '';
 
     try {
@@ -300,8 +300,10 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
         //判断是否是老数据,老数据里面没有applicationCategory的字段
         if (remedicalInfo.applicationCategory != null) {
           //如果不是老数据
-          description = getDescription(
-              remedicalInfo.application!, remedicalInfo.applicationCategory!);
+          description = _getDescription(
+            remedicalInfo.application ?? '',
+            remedicalInfo.applicationCategory ?? '',
+          );
         } else {
           //如果是老数据
           description = "Old data";
@@ -315,16 +317,20 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
     return description;
   }
 
-  String getDescription(String application, String applicationCategory) {
+  /// 设置翻译值
+  String _setLanguageValue(String code) {
+    return measureLanguage.t('application', code);
+  }
+
+  String _getDescription(String application, String applicationCategory) {
     String description = '';
-    if (applicationCategory == "FromSonopost" ||
-        application == "FromSonopost") {
-      description = measureLanguage.t("FromSonopost");
+    if ([application, applicationCategory].contains('FromSonopost')) {
+      description = _setLanguageValue('FromSonopost');
     } else {
-      if (application != '' || applicationCategory != '') {
-        description = measureLanguage.t(applicationCategory) +
+      if (application.isNotEmpty || applicationCategory.isNotEmpty) {
+        description = _setLanguageValue(applicationCategory) +
             "-" +
-            measureLanguage.t(application);
+            _setLanguageValue(application);
       } else {
         description = '';
       }
@@ -349,7 +355,7 @@ class _ScrollableImageListState extends State<ScrollableImageList> {
               remedicalItemList[index].remedicalCode!,
             ),
             serialNo: index + 1,
-            description: translateDescription(remedicalItemList[index]),
+            description: _translateDescription(remedicalItemList[index]),
           );
           return FContainer(
             key: ValueKey(measureData.itemCurrentImage),

+ 6 - 4
lib/view/measure/measure_tool.dart

@@ -252,7 +252,8 @@ class LeftSiderSelectMeasureState extends FState<LeftSiderSelectMeasure> {
   FWidget _buildItemButton(int itemIndex) {
     final itemMeta = measureData.curItemMetaList[itemIndex];
     final ifShowCN = i18nBook.isCurrentChinese && // 中文环境下显示中英文,否则只显示英文
-        measureLanguage.t(itemMeta.description) != itemMeta.description;
+        measureLanguage.t('measure', itemMeta.description) !=
+            itemMeta.description;
     final isActived = itemIndex == activeItemIndex;
     return FElevatedButton(
       name: itemMeta.name,
@@ -263,7 +264,7 @@ class LeftSiderSelectMeasureState extends FState<LeftSiderSelectMeasure> {
         children: [
           if (ifShowCN)
             FText(
-              measureLanguage.t(itemMeta.description),
+              measureLanguage.t('measure', itemMeta.description),
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
               style: TextStyle(
@@ -296,7 +297,8 @@ class LeftSiderSelectMeasureState extends FState<LeftSiderSelectMeasure> {
   FWidget _buildItemTitle(int itemIndex) {
     final itemMeta = measureData.curItemMetaList[itemIndex];
     final ifShowCN = i18nBook.isCurrentChinese && // 中文环境下显示中英文,否则只显示英文
-        measureLanguage.t(itemMeta.description) != itemMeta.description;
+        measureLanguage.t('measure', itemMeta.description) !=
+            itemMeta.description;
     return FContainer(
       decoration: const BoxDecoration(
         border: Border(
@@ -312,7 +314,7 @@ class LeftSiderSelectMeasureState extends FState<LeftSiderSelectMeasure> {
           children: [
             if (ifShowCN)
               FText(
-                measureLanguage.t(itemMeta.description),
+                measureLanguage.t('measure', itemMeta.description),
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(