From 35cf04b580e37215480c32dfb3c9f184f75acbd9 Mon Sep 17 00:00:00 2001 From: wyf <494641114@qq.com> Date: Tue, 15 Jul 2025 10:59:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=9E=E6=8E=A5=E5=90=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9A=84=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 10 ++- lib/model/WebSocketMessage.dart | 3 +- lib/model/WebSocketMessage.g.dart | 2 + .../component/main_page_b_bottom_change.dart | 81 +++++++++++++++++-- lib/pages/mh_page/room_picker.dart | 3 +- lib/pages/mh_page/test/WebviewTestModel.dart | 9 ++- 6 files changed, 93 insertions(+), 15 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index f3a848c..a96221c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -177,6 +177,10 @@ void initEasyDartModule() { WebSocketConfig(ServiceConstant.webSocketService, (data) { // 接收到服务消息 var json = jsonDecode(data); + ef.log("[websokcet]:${json}"); + if (json['wsId'] != null) { + ef.kvRoot.websocketId = json['wsId']; + } if (json['code'] != null && json['code'] != 200) { EasyDartModule.logger.error("websocket连接失败--》" + json); } @@ -184,7 +188,11 @@ void initEasyDartModule() { var call = CommonVariables.callMap[json["path"]]; if (call != null) { try { - call(json["data"]); + if (json['path'] != "/smartbed/connect") { + call(json["data"]); + } else { + call(json); + } } catch (e) { print(e); } diff --git a/lib/model/WebSocketMessage.dart b/lib/model/WebSocketMessage.dart index 67ed567..274e04d 100644 --- a/lib/model/WebSocketMessage.dart +++ b/lib/model/WebSocketMessage.dart @@ -7,8 +7,9 @@ class WebSocketMessage { String path; int? type; dynamic data; + String? to; - WebSocketMessage({required this.path, this.type, this.data}); + WebSocketMessage({required this.path, this.type, this.data, this.to}); static WebSocketMessage fromJson(Map json) => _$WebSocketMessageFromJson(json); diff --git a/lib/model/WebSocketMessage.g.dart b/lib/model/WebSocketMessage.g.dart index ca9147d..256ed78 100644 --- a/lib/model/WebSocketMessage.g.dart +++ b/lib/model/WebSocketMessage.g.dart @@ -11,6 +11,7 @@ WebSocketMessage _$WebSocketMessageFromJson(Map json) => path: json['path'] as String, type: (json['type'] as num?)?.toInt(), data: json['data'], + to: json['to'] as String?, ); Map _$WebSocketMessageToJson(WebSocketMessage instance) => @@ -18,4 +19,5 @@ Map _$WebSocketMessageToJson(WebSocketMessage instance) => 'path': instance.path, 'type': instance.type, 'data': instance.data, + 'to': instance.to, }; diff --git a/lib/pages/main_bottom/component/main_page_b_bottom_change.dart b/lib/pages/main_bottom/component/main_page_b_bottom_change.dart index 31a9169..b238d14 100644 --- a/lib/pages/main_bottom/component/main_page_b_bottom_change.dart +++ b/lib/pages/main_bottom/component/main_page_b_bottom_change.dart @@ -4,6 +4,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:vbvs_app/common/util/CommonVariables.dart'; import 'package:vbvs_app/component/NullDataComponentWidget.dart'; +import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/WebSocketMessage.dart'; import 'package:vbvs_app/pages/common/bezier_bottom_navigation_bar.dart'; import 'package:vbvs_app/pages/mh_page/MattressControl.dart'; @@ -139,26 +140,90 @@ class _HomePageState extends State setState(() { selectedIndex = index; + dealWebSource(index); }); } Future dealWebSource(int index) async { try { + UserInfoController userInfoController = Get.find(); WebviewTestController webviewTestController = Get.find(); if (index == 2) { await webviewTestController.web.jsbridge?.dart.pageActive(true); //激活websocket - CommonVariables.callMap["/smartbed/connect"] = (data) { - //订阅连接消息 - ef.log("[设备申请连接]:$data"); - }; edm.EasyDartModule.websocket.sendData(jsonEncode(WebSocketMessage( - path: "/smartbed/connect", - type: 5, - data: {"mac": webviewTestController.selectDevice['mac']}))); + path: "/smartbed/connect", + type: 1, + ))); + await Future.delayed(Duration(seconds: 1)); + edm.EasyDartModule.websocket.sendData(jsonEncode( + WebSocketMessage(path: "/smartbed/connect", type: 5, data: { + 'mac': webviewTestController.selectDevice['mac'], + }))); } else { - await webviewTestController.web.jsbridge?.dart.pageInActive(); + await webviewTestController.web.jsbridge?.dart.pageInActive(); } + CommonVariables.callMap["/smartbed/connect"] = (data) { + //订阅连接消息 + ef.log("[websocket]:$data"); + ef.log("[设备申请连接]:$data"); + if (data['type'] == 4) { + if (ef.kvRoot.websocketId == data['from']) { + return; + } + //接收到有人正在控制，停止连接 + if (index == 2) { + //通知显示弹窗已被用户绑定 + try { + webviewTestController.web.jsbridge?.dart.haveConnected(data); + } catch (e) { + ef.log("[websocket]调用网页异常:$e"); + } + } + } + if (data['type'] == 5) { + //接收到别人正在申请控制，判断自己是否处于控制页并且连接了该设备 + if (ef.kvRoot.websocketId == null) { + return; + } + if (ef.kvRoot.websocketId == data['from']) { + return; + } + if (webviewTestController.selectDevice['mac'] == null) { + return; + } + if (index != 2) { + //当前不处于控制页且没有连接该设备 + if (webviewTestController.selectDevice == null || + webviewTestController.selectDevice['mac'] != + data['data']?['mac']) { + //如果当前没有连接该设备,则返回 + return; + } + //当前不处于控制页且连接了该设备-->进行断开 + //web todo 断开设备连接 + webviewTestController.web.jsbridge?.dart.disconnectByOtherUser(); + } else { + ef.log("[websocket]:当前处于控制页，给指定用户发送xxx用户已连接"); + //当前处于控制页，给指定用户发送xxx用户已连接 + if (webviewTestController.selectDevice == null || + webviewTestController.selectDevice['mac'] != + data['data']['mac']) { + //如果当前没有连接该设备,则返回 + return; + } + edm.EasyDartModule.websocket.sendData(jsonEncode(WebSocketMessage( + to: data['from'], + // to: ef.kvRoot.websocketId, + path: "/smartbed/connect", + type: 4, + data: { + "mac": webviewTestController.selectDevice['mac'], + "user": userInfoController.model + }))); + } + } + }; } catch (e) { ef.log("[激活控制页面报错]:$e"); } diff --git a/lib/pages/mh_page/room_picker.dart b/lib/pages/mh_page/room_picker.dart index 4853cd7..534b2c7 100644 --- a/lib/pages/mh_page/room_picker.dart +++ b/lib/pages/mh_page/room_picker.dart @@ -188,8 +188,7 @@ class _RoomPickerPageState extends State { "id": editedData["_id"], "roomId": rooms[selectedIndex]['_id'], }, - onSuccess: (res) { - + onSuccess: (res) { TopSlideNotification.show(context, text: "更新成功".tr, textColor: Color(0XFF00C1AA)); diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart index 1de75b0..eae4723 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -13,6 +13,7 @@ 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/controller/user_info_controller.dart'; +import 'package:vbvs_app/model/WebSocketMessage.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; class WebviewTestModel { @@ -69,13 +70,15 @@ class WebviewTestController extends GetControllerEx { (selectDevice['mac'] != args[0]['mac'])) { lastSelectDevice = selectDevice; } + edm.EasyDartModule.websocket.sendData(jsonEncode( + WebSocketMessage(path: "/smartbed/connect", type: 5, data: { + 'mac': selectDevice['mac'], + }))); dealInstantData(selectDevice); } catch (e) { - ef.log("[aaaa]$e"); + ef.log("[切换设备失败]$e"); } - //查询人员信息 - return true; }); bridge.sdk.updateBlueToothStatus((args) async { From 6423485e34936ff1e1f9af1e6d90e654f013059a Mon Sep 17 00:00:00 2001 From: wyf <494641114@qq.com> Date: Tue, 15 Jul 2025 14:18:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=9D=A1=E7=9C=A0?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E5=B1=85?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=202.=E6=9B=B4=E6=96=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=8C=89=E9=92=AE=E5=8F=98=E5=9C=86=E5=9C=88=203.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E7=A7=B0=E5=A4=AA=E9=95=BF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=9B=BE=E6=A0=87=E6=8C=A4=E5=87=BA=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/mh_page/device/device.dart | 2 +- .../component/HomeDeviceStausWidget.dart | 51 +- .../homepage/mht_sleep_report_page.dart | 2 +- lib/pages/mh_page/homepage/new_Home_page.dart | 2 +- .../sleep_report/new_sleep_report_page.dart | 578 +++++++++++++++++- 5 files changed, 592 insertions(+), 43 deletions(-) diff --git a/lib/pages/mh_page/device/device.dart b/lib/pages/mh_page/device/device.dart index 25013b0..de59fb3 100644 --- a/lib/pages/mh_page/device/device.dart +++ b/lib/pages/mh_page/device/device.dart @@ -211,7 +211,7 @@ class DeviceInfoWidget extends GetView { webviewTestController.web.jsbridge?.dart .pageActive(false); - await Future.delayed(Duration(seconds: 1)); + // await Future.delayed(Duration(seconds: 1)); webviewTestController.web.jsbridge?.dart .appToHtmlDevice(device); MainPageBBottomChange.jumpTo(2); diff --git a/lib/pages/mh_page/homepage/component/HomeDeviceStausWidget.dart b/lib/pages/mh_page/homepage/component/HomeDeviceStausWidget.dart index ddfc4f3..625effd 100644 --- a/lib/pages/mh_page/homepage/component/HomeDeviceStausWidget.dart +++ b/lib/pages/mh_page/homepage/component/HomeDeviceStausWidget.dart @@ -33,32 +33,39 @@ class _HomeDeviceStausWidgetState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 170.rpx, - height: 81.rpx, - child: ClipRRect( - borderRadius: BorderRadius.circular(8.rpx), - child: Image.network( - widget.deviceStatus['device_image'], // 从DeviceStatus获取图片 - width: 200.rpx, - height: 200.rpx, - fit: BoxFit.cover, + Flexible( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 170.rpx, + height: 81.rpx, + child: ClipRRect( + borderRadius: BorderRadius.circular(8.rpx), + child: Image.network( + widget + .deviceStatus['device_image'], // 从DeviceStatus获取图片 + width: 200.rpx, + height: 200.rpx, + fit: BoxFit.cover, + ), ), ), - ), - Text( - '${(widget.deviceStatus['name'] ?? '').isEmpty ? '未命名'.tr : widget.deviceStatus['name']}', - style: TextStyle( - color: Colors.white, - fontSize: 26.rpx, - letterSpacing: 0.0.rpx, + Text( + '${(widget.deviceStatus['name'] ?? '').isEmpty ? '未命名'.tr : widget.deviceStatus['name']}', + style: TextStyle( + color: Colors.white, + fontSize: 26.rpx, + letterSpacing: 0.0.rpx, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, ), - ), - ].divide(SizedBox(height: 26.rpx)), + ].divide(SizedBox(height: 26.rpx)), + ), ), + SizedBox(width: 26.rpx), Column( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart index de65810..f020e14 100644 --- a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart +++ b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart @@ -282,7 +282,7 @@ class _MhtSleepReportPageState extends State { borderColor: Colors.transparent, borderWidth: 2, - borderRadius: 0.rpx, + borderRadius: 100.rpx, margin: EdgeInsetsDirectional .fromSTEB( diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index 1541314..9ddffac 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -540,7 +540,7 @@ class _NewHomePageState extends State { borderColor: Colors.transparent, borderWidth: 2, - borderRadius: 18, + borderRadius: 100.rpx, margin: EdgeInsetsDirectional .fromSTEB( diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index da93ccc..661423c 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -155,15 +155,6 @@ class _NewSleepReportPageState extends State { builder: (context, bodySize) => GestureDetector( onTap: () => FocusScope.of(context).unfocus(), child: Container( - // decoration: BoxDecoration( - // image: DecorationImage( - // image: (widget.data['backgroundImg'] != null && - // widget.data['backgroundImg'].toString().isNotEmpty) - // ? AssetImage(widget.data['backgroundImg']) - // : AssetImage('assets/img/bgNoImg.png') as ImageProvider, - // fit: BoxFit.fill, - // ), - // ), decoration: BoxDecoration( image: (widget.data['noBackImg'] != null && widget.data['noBackImg'] == true) @@ -176,7 +167,6 @@ class _NewSleepReportPageState extends State { fit: BoxFit.fill, ), ), - child: Scaffold( backgroundColor: Colors.transparent, // 背景透明 // appBar: AppBar( @@ -252,13 +242,12 @@ class _NewSleepReportPageState extends State { ), ), ), - body: SafeArea( top: true, - child: SingleChildScrollView( - child: Obx(() { - var sleepReport = sleepReportController.sleepReport; - print(sleepReport); + child: Obx(() { + var sleepReport = sleepReportController.sleepReport; + print(sleepReport); + if (sleepReport.isEmpty || sleepReport.isEmpty) { return Column( children: [ Padding( @@ -767,7 +756,7 @@ class _NewSleepReportPageState extends State { ), (sleepReport.value == null || sleepReport.value.isEmpty) ? Container( - child: NullDataWidget(), + child: Expanded(child: NullDataWidget()), ) : (sleepReportController.model.type == 1 ? DailyDataWidget(sleepReport, sleepCardKey, @@ -782,8 +771,561 @@ class _NewSleepReportPageState extends State { height: 25.rpx, )), ); - }), - ), + } else { + return SingleChildScrollView( + child: Column( + children: [ + Padding( + padding: + EdgeInsetsDirectional.fromSTEB(0, 30.rpx, 0, 0), + child: Container( + width: double.infinity, + constraints: BoxConstraints( + minHeight: 90.rpx, + ), + decoration: BoxDecoration( + color: widget.data['backgroundColor'] != null + ? widget.data['backgroundColor'] + : themeController.currentColor.sc5, + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 30.rpx, 15.rpx, 30.rpx, 15.rpx), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Stack( + alignment: Alignment.bottomLeft, + children: [ + Row( + mainAxisSize: MainAxisSize.max, + children: [ + ClickableContainer( + backgroundColor: Colors.transparent, + highlightColor: themeController + .currentColor.sc3, + borderRadius: 8.rpx, + padding: EdgeInsets.all(0), + onTap: () async { + sleepReportController.model.type = + 1; + + String data = MyUtils.formatDate( + calendarController + .selectedDate.value!); + await requestWithLog( + logTitle: "查询睡眠报告", + method: MyHttpMethod.get, + queryUrl: + "https://sleepdata.he-info.com/api/analysis/sleep/analysis?mac=${widget.data['mac']}&time=${data}&type=${sleepReportController.model.type}", + onSuccess: (res) { + print(res); + sleepReportController + .sleepReport + .value = res.data; + 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); + }); + sleepReportController.updateAll(); + }, + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: + 115.rpx, // 固定宽度为 160.rpx + alignment: + Alignment.center, // 文字居中 + child: Text( + '日报'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: AppConstants() + .title_text_fontSize, + letterSpacing: 0.0, + color: sleepReportController + .model.type == + 1 + ? themeController + .currentColor.sc2 + : themeController + .currentColor.sc3, + ), + ), + ), + SizedBox(height: 10.rpx), + ], + ), + ), + Obx(() { + return ClickableContainer( + backgroundColor: + Colors.transparent, + highlightColor: themeController + .currentColor.sc3, + borderRadius: 8.rpx, + padding: EdgeInsets.all(0), + onTap: () async { + sleepReportController + .model.type = 2; + String data = + MyUtils.formatDate( + calendarController + .selectedDate + .value!); + await requestWithLog( + logTitle: "查询睡眠报告", + method: MyHttpMethod.get, + queryUrl: + "https://sleepdata.he-info.com/api/analysis/sleep/analysis?mac=${widget.data['mac']}&time=${data}&type=${sleepReportController.model.type}", + onSuccess: (res) { + print(res); + sleepReportController + .sleepReport + .value = res.data; + 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); + }); + sleepReportController + .updateAll(); + }, + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 115 + .rpx, // 固定宽度为 160.rpx + alignment: Alignment + .center, // 文字居中 + child: Text('周报'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: AppConstants() + .title_text_fontSize, + letterSpacing: 0.0, + color: sleepReportController + .model + .type == + 2 + ? themeController + .currentColor + .sc2 + : themeController + .currentColor + .sc3, + )), + ), + SizedBox(height: 10.rpx), + ], + ), + ); + }), + Obx(() { + return ClickableContainer( + backgroundColor: + Colors.transparent, + highlightColor: themeController + .currentColor.sc3, + borderRadius: 8.rpx, + padding: EdgeInsets.all(0), + onTap: () async { + sleepReportController + .model.type = 3; + String data = + MyUtils.formatDate( + calendarController + .selectedDate + .value!); + await requestWithLog( + logTitle: "查询睡眠报告", + method: MyHttpMethod.get, + queryUrl: + "https://sleepdata.he-info.com/api/analysis/sleep/analysis?mac=${widget.data['mac']}&time=${data}&type=${sleepReportController.model.type}", + onSuccess: (res) { + print(res); + sleepReportController + .sleepReport + .value = res.data; + 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); + }); + + sleepReportController + .updateAll(); + }, + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 115 + .rpx, // 固定宽度为 160.rpx + alignment: Alignment + .center, // 文字居中 + child: Text( + '月报'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: AppConstants() + .title_text_fontSize, + letterSpacing: 0.0, + color: + sleepReportController + .model + .type == + 3 + ? themeController + .currentColor + .sc2 + : themeController + .currentColor + .sc3, + ), + ), + ), + SizedBox(height: 10.rpx), + ], + ), + ); + }), + ], + ), + AnimatedPositioned( + duration: Duration(milliseconds: 300), + curve: Curves.easeInOut, + bottom: 0, + left: + sleepReportController.model.type == + 1 + ? 0 + : sleepReportController + .model.type == + 2 + ? 115.rpx + : 230.rpx, + child: Container( + width: lineWidth, + height: 4.rpx, + decoration: BoxDecoration( + color: themeController + .currentColor.sc2, + borderRadius: + BorderRadius.circular(2.rpx), + ), + ), + ), + ], + ), + ], + ), + ), + ), + ), + Container( + width: double.infinity, + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 30.rpx, 32.rpx, 30.rpx, 32.rpx), + child: getTimeWidget(), + ), + ), + if (widget.data['person_show'] == null || + widget.data['person_show'] != false) + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 30.rpx, 0.rpx, 30.rpx, 51.rpx), + child: ClickableContainer( + backgroundColor: + widget.data['backgroundColor'] != null + ? widget.data['backgroundColor'] + : themeController.currentColor.sc5, + highlightColor: themeController + .currentColor.sc5, // 或你希望的点击水波纹颜色 + borderRadius: AppConstants() + .normal_container_radius, // 如果你想加圆角可以设置 eg. 12.rpx + padding: EdgeInsets.zero, + onTap: () {}, + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + flex: 2, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Row( + children: [ + Column( + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + '姓名'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc4, + ), + ), + Text( + '年龄'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc4, + ), + ), + ].divide( + SizedBox(height: 34.rpx)), + ), + Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + (widget.data['person'] + ?['name'] + ?.toString() + .trim() + .isNotEmpty ?? + false) + ? widget.data['person']![ + 'name'] + .toString() + : '未知数据'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + ), + Text( + '${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(widget.data['person']?['birthday'])) ?? '未知数据'.tr}', + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + ), + ].divide( + SizedBox(height: 34.rpx)), + ), + ] + .divide(SizedBox(width: 33.rpx)) + .addToStart( + SizedBox(width: 37.rpx)), + ), + ] + .addToStart(SizedBox(height: 36.rpx)) + .addToEnd(SizedBox(height: 36.rpx)), + ), + ), + Flexible( + flex: 3, + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Row( + children: [ + Column( + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + '设备ID'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc4, + ), + ), + Text( + '体重'.tr, + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc4, + ), + ), + ].divide( + SizedBox(height: 34.rpx)), + ), + Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + '${widget.data['code'] ?? '未知数据'.tr}', + // "D11250300003", + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + maxLines: 1, + overflow: + TextOverflow.ellipsis, + ), + Text( + '${widget.data['person']?['weight'] ?? '未知数据'.tr}kg', + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + ), + ].divide( + SizedBox(height: 34.rpx)), + ), + ] + .divide(SizedBox(width: 33.rpx)) + .addToStart( + SizedBox(width: 37.rpx)), + ), + ] + .addToStart(SizedBox(height: 36.rpx)) + .addToEnd(SizedBox(height: 36.rpx)), + ), + ), + ], + ), + ), + ), + (sleepReport.value == null || sleepReport.value.isEmpty) + ? Container( + child: NullDataWidget(), + ) + : (sleepReportController.model.type == 1 + ? DailyDataWidget( + sleepReport, + sleepCardKey, + heartRateCardKey, + breatheCardKey, + widget.data) + : sleepReportController.model.type == 2 + ? WeekDataWidget(sleepReport, widget.data) + : sleepReportController.model.type == 3 + ? MonthDataWidget( + sleepReport, widget.data) + : NullDataWidget()), + ].divide(SizedBox( + height: 25.rpx, + )), + ), + ); + } + }), ), ), ),