更新界面布局

lib/pages/mh_page/device/component/DeviceComponentWidget.dart

@@ -1,11 +1,9 @@
 import 'dart:async';
 
 import 'package:EasyDartModule/EasyDartModule.dart' as edm;
-import 'package:EasyDartModule/base/logger/Logger.dart';
 import 'package:easydevice/easydevice.dart';
 import 'package:ef/ef.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:flutterflow_ui/flutterflow_ui.dart';
 import 'package:vbvs_app/common/color/ServiceConstant.dart';
 import 'package:vbvs_app/common/color/app_uri_status.dart';
@@ -16,7 +14,6 @@ import 'package:vbvs_app/common/util/requestWithLog.dart';
 import 'package:vbvs_app/component/tool/ClickableContainer.dart';
 import 'package:vbvs_app/component/tool/CustomCard.dart';
 import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
-import 'package:vbvs_app/component/tool/cmd.dart';
 import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
 import 'package:vbvs_app/model/BleDeviceData.dart';
 import 'package:vbvs_app/model/api_response.dart';
@@ -473,7 +470,6 @@ class _DeviceComponentWidgetState extends State<DeviceComponentWidget> {
 
       var read = bledevice.getresource('fff0/fff1');
       await read!.characteristic.setNotifyValue(true);
-
       var write = bledevice.getresource('fff0/fff2');
 
       for (int attempt = 0; attempt < maxRetries; attempt++) {

lib/pages/mh_page/device/component/mht_device_calibration_controller.dart

@@ -32,6 +32,7 @@ class MHTDeviceCalibrationController
   RxString tips = "".obs;
   RxInt flag = 0.obs; //0没有开始 1：校准中 2.校准完成 3.校准失败
   RxString statusContext = "".obs;
+  RxBool another = false.obs;
   
 
   RxInt cd = 10000.obs;

lib/pages/mh_page/device/mht_bind_device_type.dart

@@ -158,18 +158,25 @@ class _MHTBindDeviceTypePageState extends State<MHTBindDeviceTypePage> {
     }
 
     Map data = {
-      "reg":reg,
-       "type":type, 
+      "reg": reg,
+      "type": type,
     };
     return CustomCard(
       borderRadius: 20.rpx,
       onTap: () {
+        if (type == 2) {
+          TopSlideNotification.show(
+            context,
+            text: "当前类型不支持绑定".tr,
+          );
+          return;
+        }
         MHTBlueToothController mhtBlueToothController = Get.find();
         mhtBlueToothController.model.deviceType = type.toInt();
         Get.toNamed("/mHTBlueteethDevicePage", arguments: data);
       },
       colors: [Colors.white],
-      child: Container(       
+      child: Container(
         width: double.infinity,
         height: MediaQuery.sizeOf(context).height * 0.135,
         constraints: BoxConstraints(minHeight: 220.rpx),

lib/pages/mh_page/device/mht_wifi_page.dart

@@ -205,11 +205,10 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
                     Positioned(
                       right: 20.rpx,
                       child: CustomCard(
+                        gradientDirection: GradientDirection.vertical,
                         borderRadius: 20.rpx,
                         onTap: _navigateToNextPage,
-                        colors: [
-                          stringToColor("#84F5FF"),
-                        ],
+                        colors: AppConstants().mhtButtongradientColors,
                         child: Container(
                           width: 130.rpx,
                           height: 60.rpx,
@@ -222,7 +221,7 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
                                 .titleSmall
                                 .override(
                                   fontFamily: 'Inter Tight',
-                                  color: stringToColor("#011D33"),
+                                  color: stringToColor("#003058"),
                                   letterSpacing: 0.0,
                                 ),
                           ),