更新睡眠报告

lib/pages/device_bind/bind_device_success.dart

@@ -268,7 +268,13 @@ class _EPageState extends State<BindDeviceSuccess> {
                         borderRadius:
                             AppConstants().button_container_radius, // 圆角半径
                         onTap: () {
-                          Get.offAllNamed("/mianPageBottomChange");
+                          BlueteethBindController blueteethBindController =
+                              Get.find();
+                          if (blueteethBindController.returnPage == 0) {
+                            Get.offAllNamed("/mianPageBottomChange");
+                          } else {
+                            Get.offAllNamed("/bodyDevice");
+                          }
                         },
                         colors: [
                           // 渐变色

lib/pages/device_bind/componnet/bind_dialog.dart

@@ -862,9 +862,11 @@ void showWifiDialog(
 
 void showTipDialog(
   BuildContext context,
-  Widget widget,
-  // String title,
-) {
+  Widget widget, {
+  Color? backgroundColor, // 新增可选参数
+}
+    // String title,
+    ) {
   ThemeController themeController = Get.find();
   BlueteethBindController blueteethBindController = Get.find();
 
@@ -877,7 +879,8 @@ void showTipDialog(
         blurSigma: 3.0,
         child: Container(
           decoration: BoxDecoration(
-            color: themeController.currentColor.sc17,
+            color:
+                backgroundColor ?? themeController.currentColor.sc17, // 使用默认颜色
             borderRadius: BorderRadius.circular(20.0),
           ),
           padding: EdgeInsetsDirectional.fromSTEB(64.rpx, 0, 64.rpx, 0),

lib/pages/device_bind/device_calibration.dart

@@ -92,6 +92,10 @@ class _CalibrationPageState extends State<CalibrationPage> {
                                     context, Container(), "校准未完成提示".tr,
                                     onConfirm: () async {
                                   exit = true;
+                                  if (widget.type == 2) {
+                                    Get.back();
+                                    return;
+                                  }
                                   await Get.toNamed("/personPage");
                                   print("object");
                                   deviceCalibrationController.process.value = 0;

lib/pages/device_bind/device_type.dart

@@ -426,14 +426,18 @@ class _EPageState extends State<DeviceTypePage> {
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Text(
-              title,
-              style: FlutterFlowTheme.of(context).bodyMedium.override(
-                    fontFamily: 'Inter',
-                    color: themeController.currentColor.sc3,
-                    fontSize: 30.rpx,
-                    letterSpacing: 0.0,
-                  ),
+            Expanded(
+              child: Text(
+                title,
+                style: FlutterFlowTheme.of(context).bodyMedium.override(
+                      fontFamily: 'Inter',
+                      color: themeController.currentColor.sc3,
+                      fontSize: 30.rpx,
+                      letterSpacing: 0.0,
+                    ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
             ),
             ClipRRect(
               borderRadius: BorderRadius.circular(8.rpx),

lib/pages/device_bind/device_type_list.dart

@@ -163,7 +163,7 @@ class _DeviceTypeListPageState extends State<DeviceTypeListPage> {
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Text(
+            Expanded(child: Text(
               title,
               style: FlutterFlowTheme.of(context).bodyMedium.override(
                     fontFamily: 'Inter',
@@ -171,7 +171,9 @@ class _DeviceTypeListPageState extends State<DeviceTypeListPage> {
                     fontSize: 30.rpx,
                     letterSpacing: 0.0,
                   ),
-            ),
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+            ),),
             ClipRRect(
               borderRadius: BorderRadius.circular(8.rpx),
               // child: Image.asset(