Browse Source

1、对第三方测量页面弹框在确定结果的时候返回之前页面优化

guanxinyi 1 year ago
parent
commit
1e4fd71e96

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

@@ -4,7 +4,9 @@ import 'package:fis_measure/interfaces/date_types/point.dart';
 import 'package:fis_measure/interfaces/process/standard_line/calibration.dart';
 import 'package:fis_measure/interfaces/process/workspace/application.dart';
 import 'package:fis_measure/interfaces/process/workspace/point_info.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
+import 'package:get/get.dart';
 
 import 'standard_line.dart';
 
@@ -57,6 +59,7 @@ class StandardLineCalibrationController
   @override
   void cancelEdit() {
     _changeState(StandardLineCalibrationEditState.inactive);
+    Get.back();
   }
 
   @override
@@ -66,6 +69,7 @@ class StandardLineCalibrationController
     _changeState(StandardLineCalibrationEditState.done);
     Future.delayed(const Duration(milliseconds: 100), () {
       _changeState(StandardLineCalibrationEditState.inactive);
+      Get.back();
     });
   }
 

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

@@ -329,11 +329,9 @@ class _MeasureMainViewState extends State<MeasureMainView> {
       okString: i18nBook.common.confirm.t,
       onOk: () {
         standardLineCalibrationController!.confirmEdit(calibrationLine);
-        Get.back();
       },
       onCancel: () {
         standardLineCalibrationController!.cancelEdit();
-        Get.back();
       },
       children: [
         _buildSpaceSizedBox(),

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

@@ -273,11 +273,9 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
       okString: i18nBook.common.confirm.t,
       onOk: () {
         standardLineCalibrationController!.confirmEdit(calibrationLine);
-        Get.back();
       },
       onCancel: () {
         standardLineCalibrationController!.cancelEdit();
-        Get.back();
       },
       children: [
         buildCalibrationLineItem(