更新样式

lib/pages/device/component/DeviceDataComponentWidget.dart

@@ -895,8 +895,12 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
                                         text: getBedStatus(widget
                                             .device['status']['inBed']), // 状态部分
                                         style: TextStyle(
-                                          color: themeController.currentColor
+                                          color: widget.device['status']
-                                              .sc2, // 同样颜色，也可改成其他颜色
+                                                      ['inBed'] ==
+                                                  1
+                                              ? themeController.currentColor.sc2
+                                              : themeController.currentColor
+                                                  .sc9, // 同样颜色，也可改成其他颜色
                                           fontSize: AppConstants()
                                               .title_text_fontSize,
                                         ),

lib/pages/device_bind/device_calibration_person.dart

@@ -852,7 +852,7 @@ class _CalibrationPersonPageState extends State<CalibrationPersonPage> {
           ),
         ),
         onWillPop: () async {
-          bool exit = false;
+          // bool exit = false;
           if (start) {
             if (deviceCalibrationController.flag.value != 2) {
               showConfirmDialog(context, Container(), "校准未完成提示".tr,
@@ -864,6 +864,7 @@ class _CalibrationPersonPageState extends State<CalibrationPersonPage> {
                 deviceCalibrationController.bed_calibration.value = 0;
                 deviceCalibrationController.position_calibration.value = 0;
                 blueteethBindController.cid!.value = "";
+                Get.back();
               }, onCancel: () {
                 exit = false;
               });
@@ -989,11 +990,13 @@ class _CalibrationPersonPageState extends State<CalibrationPersonPage> {
         failureNotifier.value = true;
         deviceCalibrationController.flag.value = 0;
         deviceCalibrationController.cd.value = 10000;
+        if (!exit) {
           TopSlideNotification.show(
             context,
             text: res.msg ?? "失败".tr,
             textColor: themeController.currentColor.sc9,
           );
+        }
       },
     );
   }