From 3ac04ca3a85d87777e95891af8701277e1836434 Mon Sep 17 00:00:00 2001
From: wyf <494641114@qq.com>
Date: Tue, 8 Jul 2025 10:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mh_page/component/mht_bind_dialog.dart      | 11 ++++++-----
 .../device/mht_blueteeth_device_page.dart       |  2 +-
 .../mh_page/device/mht_device_calibration.dart  | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/pages/mh_page/component/mht_bind_dialog.dart b/lib/pages/mh_page/component/mht_bind_dialog.dart
index ab72290..4ed8226 100644
--- a/lib/pages/mh_page/component/mht_bind_dialog.dart
+++ b/lib/pages/mh_page/component/mht_bind_dialog.dart
@@ -935,7 +935,7 @@ Future<void> showTipDialog(
         child: Container(
           decoration: BoxDecoration(
             color: backgroundColor ?? Colors.white,
-            borderRadius: BorderRadius.circular(20.0),
+            borderRadius: BorderRadius.circular(8.0),
           ),
           padding: EdgeInsetsDirectional.fromSTEB(64.rpx, 0, 64.rpx, 0),
           child: Container(
@@ -963,8 +963,9 @@ Future<void> showTipDialog(
                       Get.back(); // 关闭对话框
                     },
                     colors: [
-                      stringToColor("FCFCFC"),
-                      stringToColor("CEECE3"),
+                      stringToColor("1592AA"),
+                      stringToColor("0C83A7"),
+                      stringToColor("006FA3"),
                     ],
                     child: Container(
                       width: MediaQuery.sizeOf(context).width,
@@ -978,9 +979,9 @@ Future<void> showTipDialog(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Text(
-                            '知道了'.tr,
+                            '确定'.tr,
                             style: TextStyle(
-                              color: stringToColor("#333333"),
+                              color: Colors.white,
                               fontFamily: 'Inter',
                               fontSize: AppConstants().normal_text_fontSize,
                               letterSpacing: 0.0,
diff --git a/lib/pages/mh_page/device/mht_blueteeth_device_page.dart b/lib/pages/mh_page/device/mht_blueteeth_device_page.dart
index e955e1f..1155c68 100644
--- a/lib/pages/mh_page/device/mht_blueteeth_device_page.dart
+++ b/lib/pages/mh_page/device/mht_blueteeth_device_page.dart
@@ -205,7 +205,7 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
   }
 
   void _startPeriodicScan() {
-    _timer = Timer.periodic(Duration(seconds: 10), (timer) {
+    _timer = Timer.periodic(Duration(seconds: 3), (timer) {
       if (mhtBlueToothController.shouldScan.value && !isScanning) {
         _removeOldDevices(); // 先清理老旧设备
         _startScanning();
diff --git a/lib/pages/mh_page/device/mht_device_calibration.dart b/lib/pages/mh_page/device/mht_device_calibration.dart
index 0028a83..d980568 100644
--- a/lib/pages/mh_page/device/mht_device_calibration.dart
+++ b/lib/pages/mh_page/device/mht_device_calibration.dart
@@ -734,7 +734,7 @@ class _MHTCalibrationPageState extends State<MHTCalibrationPage> {
 
   void _startPollingProgress(
       String serviceAddress, String progressApi, bool isSecondStep) {
-    _requestProgress(serviceAddress, progressApi, isSecondStep);
+    // _requestProgress(serviceAddress, progressApi, isSecondStep);
     _pollingTimer = Timer.periodic(Duration(seconds: 1), (_) {
       _requestProgress(serviceAddress, progressApi, isSecondStep);
     });
@@ -866,6 +866,14 @@ class _MHTCalibrationPageState extends State<MHTCalibrationPage> {
 
   void _handleCalibrationFailure(String message) {
     _pollingTimer?.cancel();
+    if (deviceCalibrationController.cd.value != 10000) {
+      TopSlideNotification.show(
+        context,
+        text: message,
+        textColor: themeController.currentColor.sc9,
+      );
+    }
+
     deviceCalibrationController.statusContext.value = "";
     deviceCalibrationController.bed_calibration.value == 0;
     blueteethBindController.cid?.value = "";
@@ -875,11 +883,6 @@ class _MHTCalibrationPageState extends State<MHTCalibrationPage> {
     deviceCalibrationController.cd.value = 10000;
     deviceCalibrationController.updateAll();
     failureNotifier.value = true;
-    TopSlideNotification.show(
-      context,
-      text: message,
-      textColor: themeController.currentColor.sc9,
-    );
   }
 
   void _startCalibration(bool isSecondStep) {
@@ -904,7 +907,7 @@ class _MHTCalibrationPageState extends State<MHTCalibrationPage> {
         data["side"] = currentCalibrationStep.value == 1 ? "A" : "B";
       }
     }
-
+    data['cancel'] = true;
     requestWithLog(
       logTitle: "设备校准",
       method: MyHttpMethod.post,