Bladeren bron

fix(standardLine): 修正校准线保存空值时的错误 #0015453

gavin.chen 1 jaar geleden
bovenliggende
commit
953732bd48
3 gewijzigde bestanden met toevoegingen van 23 en 3 verwijderingen
  1. 11 1
      lib/view/measure/measure_main_view.dart
  2. 11 1
      lib/view/mobile_view/mobile_measure_main_view.dart
  3. 1 1
      pubspec.yaml

+ 11 - 1
lib/view/measure/measure_main_view.dart

@@ -328,6 +328,10 @@ class _MeasureMainViewState extends State<MeasureMainView> {
       cancelString: i18nBook.common.cancel.t,
       okString: i18nBook.common.confirm.t,
       onOk: () {
+        if (calibrationLine == 0) {
+          PromptBox.toast(i18nBook.measure.toast4calibrationLine.t);
+          return;
+        }
         try {
           standardLineCalibrationController!.confirmEdit(calibrationLine);
         } catch (e) {
@@ -378,7 +382,13 @@ class _MeasureMainViewState extends State<MeasureMainView> {
               controller: TextEditingController(
                 text: calibrationLine.toString(),
               ),
-              onChanged: (val) => calibrationLine = double.parse(val),
+              onChanged: (val) {
+                try {
+                  calibrationLine = double.parse(val);
+                } catch (e) {
+                  calibrationLine = 0;
+                }
+              },
             ),
           ),
         ),

+ 11 - 1
lib/view/mobile_view/mobile_measure_main_view.dart

@@ -277,6 +277,10 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
       cancelString: i18nBook.common.cancel.t,
       okString: i18nBook.common.confirm.t,
       onOk: () {
+        if (calibrationLine == 0) {
+          PromptBox.toast(i18nBook.measure.toast4calibrationLine.t);
+          return;
+        }
         try {
           standardLineCalibrationController!.confirmEdit(calibrationLine);
           Get.back();
@@ -318,7 +322,13 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
               ),
               filled: true,
             ),
-            onChanged: (val) => calibrationLine = double.parse(val),
+            onChanged: (val) {
+              try {
+                calibrationLine = double.parse(val);
+              } catch (e) {
+                calibrationLine = 0;
+              }
+            },
           ),
         ),
         buildCalibrationLineItem(

+ 1 - 1
pubspec.yaml

@@ -96,7 +96,7 @@ dependency_overrides:
   fis_i18n:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git
-      ref: dfeb9de
+      ref: 20fcc4f
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git