Browse Source

1、修复第一次出现校准线页面关闭不了的问题

guanxinyi 1 năm trước cách đây
mục cha
commit
d42a8a22fd

+ 0 - 2
lib/process/workspace/third_part/calibration_controller.dart

@@ -59,7 +59,6 @@ class StandardLineCalibrationController
   @override
   void cancelEdit() {
     _changeState(StandardLineCalibrationEditState.inactive);
-    Get.back();
   }
 
   @override
@@ -69,7 +68,6 @@ class StandardLineCalibrationController
     _changeState(StandardLineCalibrationEditState.done);
     Future.delayed(const Duration(milliseconds: 100), () {
       _changeState(StandardLineCalibrationEditState.inactive);
-      Get.back();
     });
   }
 

+ 8 - 2
lib/view/measure/measure_main_view.dart

@@ -328,10 +328,16 @@ class _MeasureMainViewState extends State<MeasureMainView> {
       cancelString: i18nBook.common.cancel.t,
       okString: i18nBook.common.confirm.t,
       onOk: () {
-        standardLineCalibrationController!.confirmEdit(calibrationLine);
+        Get.back();
+        Future.delayed(const Duration(milliseconds: 150), () {
+          standardLineCalibrationController!.confirmEdit(calibrationLine);
+        });
       },
       onCancel: () {
-        standardLineCalibrationController!.cancelEdit();
+        Get.back();
+        Future.delayed(const Duration(milliseconds: 150), () {
+          standardLineCalibrationController!.cancelEdit();
+        });
       },
       children: [
         _buildSpaceSizedBox(),

+ 8 - 2
lib/view/mobile_view/mobile_measure_main_view.dart

@@ -272,10 +272,16 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
       cancelString: i18nBook.common.cancel.t,
       okString: i18nBook.common.confirm.t,
       onOk: () {
-        standardLineCalibrationController!.confirmEdit(calibrationLine);
+        Get.back();
+        Future.delayed(const Duration(milliseconds: 150), () {
+          standardLineCalibrationController!.confirmEdit(calibrationLine);
+        });
       },
       onCancel: () {
-        standardLineCalibrationController!.cancelEdit();
+        Get.back();
+        Future.delayed(const Duration(milliseconds: 150), () {
+          standardLineCalibrationController!.cancelEdit();
+        });
       },
       children: [
         buildCalibrationLineItem(