更新控制跳转

lib/controller/weather/weather_controller.dart

@@ -81,6 +81,10 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
       List<Placemark> placemarks = [];
       // placemarks = await placemarkFromCoordinates(position.latitude, position.longitude,
       //     localeIdentifier: language);
+      placemarks = await placemarkFromCoordinates(
+        position.latitude,
+        position.longitude,
+      );
 
       if (placemarks.isNotEmpty) {
         model.cityName = placemarks[0].locality ?? "未知数据".tr;

lib/pages/common/selectDialog.dart

@@ -195,9 +195,9 @@ Future showDateSelectionDialog(BuildContext context,
                               width: 100.rpx,
                               height: 60.rpx,
                               alignment: Alignment.center,
-                              child: Text("确认",
+                              child: Text("确定",
                                   style: TextStyle(
-                                      fontSize: 30.rpx, color: Colors.white)),
+                                      fontSize: 30.rpx, color: stringToColor("#84F5FF"))),
                             ),
                           ),
                         ],
@@ -348,10 +348,10 @@ Future<void> showWeightPickerDialog(
                                 width: 100.rpx,
                                 height: 60.rpx,
                                 child: Text(
-                                  "确认",
+                                  "确定",
                                   style: TextStyle(
                                     fontSize: 30.rpx,
-                                    color: Colors.white,
+                                    color: stringToColor("#84F5FF"),
                                   ),
                                 ),
                               )),
@@ -475,10 +475,10 @@ Future<void> showHeightPickerDialog(
                                 width: 100.rpx,
                                 height: 60.rpx,
                                 child: Text(
-                                  "确认",
+                                  "确定",
                                   style: TextStyle(
                                     fontSize: 30.rpx,
-                                    color: Colors.white,
+                                    color: stringToColor("#84F5FF"),
                                   ),
                                 ),
                               )),
@@ -701,7 +701,7 @@ Future showDayTimeSelectionDialog(
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: <Widget>[
-                      // 顶部栏：取消 - 标题 - 确认
+                      // 顶部栏：取消 - 标题 - 确定
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
@@ -742,9 +742,9 @@ Future showDayTimeSelectionDialog(
                               width: 100.rpx,
                               height: 60.rpx,
                               alignment: Alignment.center,
-                              child: Text("确认".tr,
+                              child: Text("确定".tr,
                                   style: TextStyle(
-                                      fontSize: 30.rpx, color: Colors.white)),
+                                      fontSize: 30.rpx, color: stringToColor("#84F5FF"))),
                             ),
                           ),
                         ],
@@ -879,9 +879,9 @@ Future showOneSelectionDialog(
                               alignment: Alignment.center,
                               width: 100.rpx,
                               height: 60.rpx,
-                              child: Text("确认".tr,
+                              child: Text("确定".tr,
                                   style: TextStyle(
-                                      fontSize: 30.rpx, color: Colors.white)),
+                                      fontSize: 30.rpx, color: stringToColor("#84F5FF"))),
                             ),
                           ),
                         ],

lib/pages/mh_page/bluetooth.dart

@@ -9,6 +9,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
 import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart';
 import 'package:vbvs_app/model/api_response.dart';
 import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
+import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
 import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
 
 class BluetoothPage extends StatefulWidget {
@@ -166,8 +167,11 @@ class _BluetoothPageState extends State<BluetoothPage> {
                                     context, '详情', "/devicePeopleInfo",
                                     arguments: obsData),
                                 _buildMenuButton(
-                                    context, '人员资料', "/peopleInfoPage",
+                                  context,
-                                    arguments: obsData,),
+                                  '人员资料',
+                                  "/peopleInfoPage",
+                                  arguments: obsData,
+                                ),
                                 _buildMenuButton(
                                     context, '房间选择', "/roomPickerPage",
                                     arguments: obsData),
@@ -194,6 +198,10 @@ class _BluetoothPageState extends State<BluetoothPage> {
                                               .unbindDevice(obsData);
                                           await deviceListController
                                               .getDeviceList();
+                                          MHTHomeController homeController =
+                                              Get.find();
+                                          homeController.selectDevcie.value =
+                                              "";
                                           try {
                                             WebviewTestController
                                                 webviewTestController =

lib/pages/mh_page/device/device.dart

@@ -4,11 +4,14 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutterflow_ui/flutterflow_ui.dart';
 
 import 'package:vbvs_app/common/color/appFontsize.dart';
+import 'package:vbvs_app/common/util/DailyLogUtils.dart';
 import 'package:vbvs_app/common/util/FitTool.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
 import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
 import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
 import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart';
+import 'package:vbvs_app/pages/main_bottom/component/main_page_b_bottom_change.dart';
+import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
 
 class DeviceInfoWidget extends GetView {
   int index;
@@ -200,8 +203,26 @@ class DeviceInfoWidget extends GetView {
                             width: 150.rpx,
                             height: 90.rpx,
                             child: FFButtonWidget(
-                              onPressed: () {
+                              onPressed: () async {
-                                // deviceControllerChange(device);
+                                try {
+                                  WebviewTestController webviewTestController =
+                                      Get.find();
+                                  var future = webviewTestController
+                                      .web.jsbridge?.dart
+                                      .appToHtmlDevice(device);
+                                  Future.delayed(Duration(seconds: 5), () {
+                                    return;
+                                  });
+                                  await future;
+                                  await webviewTestController.web.jsbridge?.dart
+                                      .pageActive();
+                                  MainPageBBottomChange.jumpTo(2);
+                                  Get.until((route) =>
+                                      Get.currentRoute ==
+                                      "/mianPageBottomChange");
+                                } catch (e) {
+                                  DailyLogUtils.writeError("发生异常: $e");
+                                }
                               },
                               text: '控制',
                               options: FFButtonOptions(

lib/pages/mh_page/device/mht_blueteeth_device_page.dart

@@ -170,8 +170,28 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
               mac: r.device.remoteId.str.replaceAll(':', ''));
         }).toList();
 
+        final currentDevices = mhtBlueToothController.model.blueRawData ?? [];
+        final newDevices = <BlueToothDataModel>[];
+
+        for (var newDevice in filteredResults) {
+          // 检查设备是否已存在
+          final existingIndex =
+              currentDevices.indexWhere((d) => d.mac == newDevice.mac);
+
+          if (existingIndex >= 0) {
+            // 更新已有设备信息（如信号强度）
+            currentDevices[existingIndex] = newDevice;
+          } else {
+            // 添加新设备
+            newDevices.add(newDevice);
+          }
+        }
+
         setState(() {
-          mhtBlueToothController.model.blueRawData = filteredResults;
+          mhtBlueToothController.model.blueRawData = [
+            ...currentDevices,
+            ...newDevices
+          ];
         });
       });
 
@@ -189,6 +209,7 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
   void _startPeriodicScan() {
     _timer = Timer.periodic(Duration(seconds: 10), (timer) {
       if (mhtBlueToothController.shouldScan.value && !isScanning) {
+        _removeOldDevices(); // 先清理老旧设备
         _startScanning();
       }
     });
@@ -693,4 +714,20 @@ class _MHTBlueteethDevicePageState extends State<MHTBlueteethDevicePage> {
       ),
     );
   }
+
+  void _removeOldDevices() {
+    final now = DateTime.now();
+    final currentDevices = mhtBlueToothController.model.blueRawData ?? [];
+
+    // 移除30秒内未出现的设备
+    final updatedDevices = currentDevices.where((device) {
+      return now.difference(device.lastSeen) < Duration(seconds: 30);
+    }).toList();
+
+    if (updatedDevices.length != currentDevices.length) {
+      setState(() {
+        mhtBlueToothController.model.blueRawData = updatedDevices;
+      });
+    }
+  }
 }

lib/pages/mh_page/device/mht_people_info.dart

@@ -39,7 +39,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
     peopleList.add({
       'mac': device?.macA,
       'gender': "男",
-      'id':device!.macAID,
+      'id': device!.macAID,
     });
 
     // Initialize person B if exists
@@ -47,7 +47,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
       peopleList.add({
         'mac': device.macB,
         'gender': "男",
-        'id':device!.macBID,
+        'id': device!.macBID,
       });
     }
 
@@ -113,7 +113,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
             ? DateFormat('yyyy-MM-dd').format(personData['birthday'])
             : personData['birthday'],
         'contact': personData['contact'],
-        'id':personData['id'],
+        'id': personData['id'],
       };
       await requestWithLog(
         logTitle: "保存用户信息",
@@ -124,7 +124,8 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
           print(res);
         },
         onFailure: (res) {
-          TopSlideNotification.show(context,text: res.msg!,textColor: themeController.currentColor.sc9);
+          TopSlideNotification.show(context,
+              text: res.msg!, textColor: themeController.currentColor.sc9);
           print(res);
         },
       );
@@ -306,21 +307,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                   width: double.infinity,
                                   height: 90.rpx,
                                   decoration: BoxDecoration(),
-                                  child: Row(
+                                  child: InkWell(
-                                    mainAxisSize: MainAxisSize.max,
-                                    mainAxisAlignment:
-                                        MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      Text(
-                                        '性别',
-                                        style: TextStyle(
-                                          fontFamily: 'Readex Pro',
-                                          color: Color(0xFF9EA4B7),
-                                          fontSize: 30.rpx,
-                                          letterSpacing: 0,
-                                        ),
-                                      ),
-                                      InkWell(
                                     onTap: () {
                                       FocusScope.of(context)
                                           .requestFocus(FocusNode());
@@ -342,6 +329,20 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                       });
                                     },
                                     child: Row(
+                                      mainAxisSize: MainAxisSize.max,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        Text(
+                                          '性别',
+                                          style: TextStyle(
+                                            fontFamily: 'Readex Pro',
+                                            color: Color(0xFF9EA4B7),
+                                            fontSize: 30.rpx,
+                                            letterSpacing: 0,
+                                          ),
+                                        ),
+                                        Row(
                                           mainAxisSize: MainAxisSize.max,
                                           children: [
                                             Container(
@@ -365,10 +366,10 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                             ),
                                           ],
                                         ),
-                                      ),
                                       ],
                                     ),
                                   ),
+                                ),
                                 getLine(),
                                 Container(
                                   width: double.infinity,
@@ -376,6 +377,27 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                   margin: EdgeInsets.only(
                                       left: 40.rpx, right: 35.rpx),
                                   decoration: BoxDecoration(),
+                                  child: InkWell(
+                                    onTap: () {
+                                      FocusScope.of(context).unfocus();
+                                      Future.delayed(
+                                          const Duration(milliseconds: 250),
+                                          () {
+                                        showHeightPickerDialog(
+                                          context,
+                                          initialHeight: int.tryParse(
+                                                  peopleList[index]['height'] ??
+                                                      '170') ??
+                                              170,
+                                          onConfirm: (int selectedHeight) {
+                                            setState(() {
+                                              peopleList[index]['height'] =
+                                                  selectedHeight.toString();
+                                            });
+                                          },
+                                        );
+                                      });
+                                    },
                                     child: Row(
                                       mainAxisSize: MainAxisSize.max,
                                       mainAxisAlignment:
@@ -390,29 +412,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                             letterSpacing: 0,
                                           ),
                                         ),
-                                      InkWell(
+                                        Row(
-                                        onTap: () {
-                                          FocusScope.of(context).unfocus();
-                                          Future.delayed(
-                                              const Duration(milliseconds: 250),
-                                              () {
-                                            showHeightPickerDialog(
-                                              context,
-                                              initialHeight: int.tryParse(
-                                                      peopleList[index]
-                                                              ['height'] ??
-                                                          '170') ??
-                                                  170,
-                                              onConfirm: (int selectedHeight) {
-                                                setState(() {
-                                                  peopleList[index]['height'] =
-                                                      selectedHeight.toString();
-                                                });
-                                              },
-                                            );
-                                          });
-                                        },
-                                        child: Row(
                                           children: [
                                             Text(
                                               peopleList[index]['height'] !=
@@ -431,10 +431,10 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                                 size: 48.rpx),
                                           ],
                                         ),
-                                      ),
                                       ],
                                     ),
                                   ),
+                                ),
                                 getLine(),
                                 Container(
                                   width: double.infinity,
@@ -442,21 +442,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                   margin: EdgeInsets.only(
                                       left: 40.rpx, right: 35.rpx),
                                   decoration: BoxDecoration(),
-                                  child: Row(
+                                  child: InkWell(
-                                    mainAxisSize: MainAxisSize.max,
-                                    mainAxisAlignment:
-                                        MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      Text(
-                                        '体重(kg)',
-                                        style: TextStyle(
-                                          fontFamily: 'Readex Pro',
-                                          color: Color(0xFF9EA4B7),
-                                          fontSize: 30.rpx,
-                                          letterSpacing: 0,
-                                        ),
-                                      ),
-                                      InkWell(
                                     onTap: () {
                                       FocusScope.of(context).unfocus();
                                       Future.delayed(
@@ -475,6 +461,20 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                       });
                                     },
                                     child: Row(
+                                      mainAxisSize: MainAxisSize.max,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        Text(
+                                          '体重(kg)',
+                                          style: TextStyle(
+                                            fontFamily: 'Readex Pro',
+                                            color: Color(0xFF9EA4B7),
+                                            fontSize: 30.rpx,
+                                            letterSpacing: 0,
+                                          ),
+                                        ),
+                                        Row(
                                           children: [
                                             Text(
                                               peopleList[index]['weight'] !=
@@ -493,10 +493,10 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                                 size: 48.rpx),
                                           ],
                                         ),
-                                      ),
                                       ],
                                     ),
                                   ),
+                                ),
                                 getLine(),
                                 Container(
                                   width: double.infinity,
@@ -504,6 +504,29 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                   margin: EdgeInsets.only(
                                       left: 40.rpx, right: 35.rpx),
                                   decoration: BoxDecoration(),
+                                  child: InkWell(
+                                    onTap: () {
+                                      FocusScope.of(context)
+                                          .requestFocus(FocusNode());
+                                      Future.delayed(
+                                          const Duration(milliseconds: 250),
+                                          () {
+                                        showDateSelectionDialog(context,
+                                            checkDate: peopleList[index]
+                                                    ['birthday'] is DateTime
+                                                ? peopleList[index]['birthday']
+                                                : DateTime.tryParse(
+                                                        peopleList[index]
+                                                                ['birthday'] ??
+                                                            '') ??
+                                                    DateTime.now(),
+                                            checkChange: (DateTime d) {
+                                          setState(() {
+                                            peopleList[index]['birthday'] = d;
+                                          });
+                                        }).then((d) {});
+                                      });
+                                    },
                                     child: Row(
                                       mainAxisSize: MainAxisSize.max,
                                       mainAxisAlignment:
@@ -518,32 +541,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                             letterSpacing: 0,
                                           ),
                                         ),
-                                      InkWell(
+                                        Row(
-                                        onTap: () {
-                                          FocusScope.of(context)
-                                              .requestFocus(FocusNode());
-                                          Future.delayed(
-                                              const Duration(milliseconds: 250),
-                                              () {
-                                            showDateSelectionDialog(context,
-                                                checkDate: peopleList[index]
-                                                        ['birthday'] is DateTime
-                                                    ? peopleList[index]
-                                                        ['birthday']
-                                                    : DateTime.tryParse(
-                                                            peopleList[index][
-                                                                    'birthday'] ??
-                                                                '') ??
-                                                        DateTime.now(),
-                                                checkChange: (DateTime d) {
-                                              setState(() {
-                                                peopleList[index]['birthday'] =
-                                                    d;
-                                              });
-                                            }).then((d) {});
-                                          });
-                                        },
-                                        child: Row(
                                           mainAxisSize: MainAxisSize.max,
                                           children: [
                                             Container(
@@ -574,10 +572,10 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
                                             ),
                                           ],
                                         ),
-                                      ),
                                       ],
                                     ),
                                   ),
+                                ),
                                 getLine(),
                                 Container(
                                   width: double.infinity,

lib/pages/mh_page/device/model/BlueToothDataModel.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 class BlueToothDataModel {
-  String name;//设备型号
+  String name; // 设备型号
   bool bind;
   String mac;
   ScanResult scanResult;
@@ -10,6 +10,7 @@ class BlueToothDataModel {
   int type;
   String? macAID;
   String? macBID;
+  DateTime lastSeen; // 添加的最后可见时间字段
 
   BlueToothDataModel({
     this.name = '',
@@ -19,6 +20,7 @@ class BlueToothDataModel {
     required this.type,
     this.macA = '',
     this.macB = '',
+    required this.lastSeen, // 添加到构造函数参数
   });
 
   factory BlueToothDataModel.fromScanResult(ScanResult result, int type,
@@ -28,6 +30,14 @@ class BlueToothDataModel {
         name.isNotEmpty ? name : (result.advertisementData.localName ?? '');
 
     return BlueToothDataModel(
-        name: finalName, bind: bind, mac: mac, scanResult: result, type: type);
+      name: finalName,
+      bind: bind,
+      mac: mac,
+      scanResult: result,
+      type: type,
+      macA: '', // 保持原有默认值
+      macB: '', // 保持原有默认值
+      lastSeen: DateTime.now(), // 设置为当前时间
+    );
   }
 }

lib/pages/mh_page/homepage/mht_sleep_report_page.dart

@@ -4,6 +4,7 @@ import 'package:flutterflow_ui/flutterflow_ui.dart';
 import 'package:vbvs_app/common/color/app_uri_status.dart';
 import 'package:vbvs_app/common/util/FitTool.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
+import 'package:vbvs_app/component/NullDataComponentWidget.dart';
 import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
 import 'package:vbvs_app/controller/user_info_controller.dart';
 import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
@@ -38,11 +39,11 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
     deviceController.getDeviceList(group: 'room').then((apiResponse) {
       if (apiResponse.code != HttpStatusCodes.ok) {
         if (context.mounted) {
-          TopSlideNotification.show(
+          // TopSlideNotification.show(
-            context,
+          //   context,
-            text: apiResponse.msg!,
+          //   text: apiResponse.msg!,
-            textColor: themeController.currentColor.sc9,
+          //   textColor: themeController.currentColor.sc9,
-          );
+          // );
         }
       } else {
         //请求睡眠报告
@@ -257,6 +258,9 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
                             ),
                           );
                       }
+                      if (userInfoController.model.login != null &&
+                          userInfoController.model.login == 1)
+                        return Expanded(child: NullDataWidget());
                       return Container();
                     }),
 
@@ -273,7 +277,7 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
                               'backgroundImg':
                                   'assets/images/new_background.png',
                               'arrow': false,
-                              'noBackImg':true,
+                              'noBackImg': true,
                             },
                           ),
                         );

lib/pages/mh_page/homepage/new_Home_page.dart

@@ -45,20 +45,20 @@ class _NewHomePageState extends State<NewHomePage> {
       // homeController.getSleepReport();
       deviceController.getDeviceNum().then((apiResponse) {
         if (apiResponse.code != HttpStatusCodes.ok) {
-          TopSlideNotification.show(
+          // TopSlideNotification.show(
-            Get.context!,
+          //   Get.context!,
-            text: apiResponse.msg!,
+          //   text: apiResponse.msg!,
-            textColor: themeController.currentColor.sc9,
+          //   textColor: themeController.currentColor.sc9,
-          );
+          // );
         }
       });
       deviceController.getDeviceList(group: 'room').then((apiResponse) {
         if (apiResponse.code != HttpStatusCodes.ok) {
-          TopSlideNotification.show(
+          // TopSlideNotification.show(
-            Get.context!,
+          //   Get.context!,
-            text: apiResponse.msg!,
+          //   text: apiResponse.msg!,
-            textColor: themeController.currentColor.sc9,
+          //   textColor: themeController.currentColor.sc9,
-          );
+          // );
         } else {
           //请求睡眠报告
           // deviceController.getSleepReport();
@@ -105,11 +105,11 @@ class _NewHomePageState extends State<NewHomePage> {
   Widget build(BuildContext context) {
     deviceController.getDeviceList(group: 'room').then((apiResponse) {
       if (apiResponse.code != HttpStatusCodes.ok) {
-        TopSlideNotification.show(
+        // TopSlideNotification.show(
-          context,
+        //   context,
-          text: apiResponse.msg!,
+        //   text: apiResponse.msg!,
-          textColor: themeController.currentColor.sc9,
+        //   textColor: themeController.currentColor.sc9,
-        );
+        // );
       } else {
         //请求睡眠报告
         // deviceController.getSleepReport();
@@ -121,21 +121,21 @@ class _NewHomePageState extends State<NewHomePage> {
       //请求绑定设备列表
       // homeController.getSleepReport();
       deviceController.getDeviceNum().then((apiResponse) {
-        if (apiResponse.code != HttpStatusCodes.ok) {
+        // if (apiResponse.code != HttpStatusCodes.ok) {
-          TopSlideNotification.show(
+        //   TopSlideNotification.show(
-            Get.context!,
+        //     Get.context!,
-            text: apiResponse.msg!,
+        //     text: apiResponse.msg!,
-            textColor: themeController.currentColor.sc9,
+        //     textColor: themeController.currentColor.sc9,
-          );
+        //   );
-        }
+        // }
       });
       deviceController.getDeviceList(group: 'room').then((apiResponse) {
         if (apiResponse.code != HttpStatusCodes.ok) {
-          TopSlideNotification.show(
+          // TopSlideNotification.show(
-            Get.context!,
+          //   Get.context!,
-            text: apiResponse.msg!,
+          //   text: apiResponse.msg!,
-            textColor: themeController.currentColor.sc9,
+          //   textColor: themeController.currentColor.sc9,
-          );
+          // );
         } else {
           //请求睡眠报告
           // deviceController.getSleepReport();

lib/pages/mh_page/test/WebviewTestModel.dart

@@ -32,8 +32,8 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
   WebviewTestController() : super(WebviewTestModel()) {
     web = WebviewHelper(
       jsbridge: buildsdk(
-        // father: this,
+        father: this,
-        // clientId: '494641114',
+        clientId: '494641114',
         // dbgserverUrl: 'ws://192.168.1.2:9001',
       ),
       settings: buildsettings(),
@@ -61,10 +61,6 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
           return true;
         });
         bridge.sdk.selectDevice((args) async {
-<<<<<<< HEAD
-          ef.log('selectDevice: $args');
-          selectDevice = args[0];
-=======
           try {
             ef.log('selectDevice: $args');
             selectDevice = args[0];
@@ -82,7 +78,6 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
 
           //查询人员信息
 
->>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
           return true;
         });
         bridge.sdk.updateBlueToothStatus((args) async {

lib/pages/sleep_report/chart/TimeSeriesChart.dart

@@ -1,6 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
-import 'package:vbvs_app/common/color/appConstants.dart';
+import 'package:flutter/material.dart';
 import 'package:vbvs_app/common/util/FitTool.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
 

lib/pages/sleep_report/component/HeartChangeWidget.dart

@@ -148,13 +148,16 @@ class _HeartChangeWidgetState extends State<HeartChangeWidget> {
                           alignment: MainAxisAlignment.center,
                           widget1: Row(
                             children: [
-                              Text(
+                              Expanded(
+                                child: Text(
                                   '${data['name']}',
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                   style: TextStyle(
                                     color: themeController.currentColor.sc3,
-                                  fontSize: AppConstants().normal_text_fontSize,
+                                    fontSize:
+                                        AppConstants().normal_text_fontSize,
+                                  ),
                                 ),
                               ),
                               ClickableContainer(

lib/pages/sleep_report/new_sleep_report_page.dart

@@ -6,10 +6,10 @@ import 'package:vbvs_app/common/color/appConstants.dart';
 import 'package:vbvs_app/common/util/FitTool.dart';
 import 'package:vbvs_app/common/util/MyUtils.dart';
 import 'package:vbvs_app/common/util/requestWithLog.dart';
+import 'package:vbvs_app/component/NullDataComponentWidget.dart';
 import 'package:vbvs_app/component/tool/ClickableContainer.dart';
 import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
 import 'package:vbvs_app/controller/date/CalendarController.dart';
-import 'package:vbvs_app/controller/home/home_controller.dart';
 import 'package:vbvs_app/controller/sleep/sleep_report_controller.dart';
 import 'package:vbvs_app/language/AppLanguage.dart';
 import 'package:vbvs_app/pages/common/selectDialog.dart';
@@ -147,8 +147,15 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
           _scrollToTargetComponent(sleepReportController.sleepReport);
         },
         onFailure: (res) {
+          if (MainPageBBottomChange.getCurrentIndex() != null) {
+            if (MainPageBBottomChange.getCurrentIndex() == 1) {
               TopSlideNotification.show(context,
                   text: res.msg!, textColor: themeController.currentColor.sc9);
+            }
+          } else {
+            TopSlideNotification.show(context,
+                text: res.msg!, textColor: themeController.currentColor.sc9);
+          }
           sleepReportController.sleepReport.value = {};
           sleepReportController.updateAll();
           print(res);
@@ -609,6 +616,12 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
                           ),
                         ),
                       ),
+                      if (sleepReport.value == null ||
+                          sleepReport.value.isEmpty)
+                        Container(
+                          height: 500.rpx,
+                          child: NullDataWidget(),
+                        ),
                       Padding(
                         padding: EdgeInsetsDirectional.fromSTEB(
                             30.rpx, 0.rpx, 30.rpx, 0),
@@ -851,8 +864,16 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
             sleepReportController.updateAll();
           },
           onFailure: (res) {
+            if (MainPageBBottomChange.getCurrentIndex() != null) {
+              if (MainPageBBottomChange.getCurrentIndex() == 1) {
+                TopSlideNotification.show(context,
+                    text: res.msg!,
+                    textColor: themeController.currentColor.sc9);
+              }
+            } else {
               TopSlideNotification.show(context,
                   text: res.msg!, textColor: themeController.currentColor.sc9);
+            }
             sleepReportController.sleepReport.value = {};
             sleepReportController.updateAll();
             print(res);
@@ -890,8 +911,16 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
             sleepReportController.updateAll();
           },
           onFailure: (res) {
+            if (MainPageBBottomChange.getCurrentIndex() != null) {
+              if (MainPageBBottomChange.getCurrentIndex() == 1) {
+                TopSlideNotification.show(context,
+                    text: res.msg!,
+                    textColor: themeController.currentColor.sc9);
+              }
+            } else {
               TopSlideNotification.show(context,
                   text: res.msg!, textColor: themeController.currentColor.sc9);
+            }
             sleepReportController.sleepReport.value = {};
             sleepReportController.updateAll();
             print(res);
@@ -974,9 +1003,17 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
                       sleepReportController.updateAll();
                     },
                     onFailure: (res) {
+                      if (MainPageBBottomChange.getCurrentIndex() != null) {
+                        if (MainPageBBottomChange.getCurrentIndex() == 1) {
                           TopSlideNotification.show(context,
                               text: res.msg!,
                               textColor: themeController.currentColor.sc9);
+                        }
+                      } else {
+                        TopSlideNotification.show(context,
+                            text: res.msg!,
+                            textColor: themeController.currentColor.sc9);
+                      }
                       sleepReportController.sleepReport.value = {};
                       sleepReportController.updateAll();
                       print(res);

pubspec.yaml

@@ -66,7 +66,7 @@ dependencies:
   easyweb:
     git:
       url: https://gitea.wslpc.real.he-info.cn:94/flutter/easyweb.git
-      ref: e86d515f77
+      ref: main
   archive: ^4.0.0