diff --git a/assets/img/icon/triangle.svg b/assets/img/icon/triangle.svg
new file mode 100644
index 0000000..bfd6690
--- /dev/null
+++ b/assets/img/icon/triangle.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/img/xiaoe.png b/assets/img/xiaoe.png
new file mode 100644
index 0000000..4254142
Binary files /dev/null and b/assets/img/xiaoe.png differ
diff --git a/assets/langs/en_US.json b/assets/langs/en_US.json
index 43ac062..4399497 100644
--- a/assets/langs/en_US.json
+++ b/assets/langs/en_US.json
@@ -321,7 +321,7 @@
"ios启用网络提示":"",
"设备报修":"Device repair",
"联系人":"Contact",
- "手机号":"Phone number",
+ "手机号":"Phone",
"名称输入提示":"Enter contact name",
"手机号输入提示":"Enter contact phone number",
"提交":"Submit",
@@ -398,7 +398,7 @@
"全部消息":"All messages",
"请先在设置里的消息通知打开全部消息配置":"Please enable all message notifications in settings first",
"请先打开全部消息配置":"Please enable all message notifications first",
- "正常值":"Normal range:",
+ "正常值":"range:",
"今日":"Today",
"深色":"Dark",
"皮肤指数":"Skin index",
diff --git a/assets/langs/zh_CN.json b/assets/langs/zh_CN.json
index 5d6ea38..4a86f2f 100644
--- a/assets/langs/zh_CN.json
+++ b/assets/langs/zh_CN.json
@@ -421,7 +421,8 @@
"心率散点图介绍":"心电散点图是用非线性的图形方法描记的连续心冲击图的RR间期图，因图形由散点组成，又称散点图。",
"今日数据":"今日数据",
"昨日数据":"昨日数据",
- "次":"次",
- "秒":"秒"
+ "次":"频次",
+ "秒":"秒",
+ "当前暂无数据":"当前暂无数据"
}
\ No newline at end of file
diff --git a/lib/component/home_page/DynamicReportDetailWidget.dart b/lib/component/home_page/DynamicReportDetailWidget.dart
index 54336c8..4cb025f 100644
--- a/lib/component/home_page/DynamicReportDetailWidget.dart
+++ b/lib/component/home_page/DynamicReportDetailWidget.dart
@@ -9,6 +9,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/home_page/SleepDataModuleWidget.dart';
import 'package:vbvs_app/component/home_page/SleepDateWidget.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
+import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
class DynamicReportDetailWidget extends StatefulWidget {
@@ -38,7 +39,7 @@ class _DynamicReportDetailWidgetState extends State {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
- Future.delayed(Duration(milliseconds: 100), () {
+ Future.delayed(Duration(milliseconds: 500), () {
if (!_hasScrolled &&
_scrollController.hasClients &&
_scrollController.position.maxScrollExtent > 0) {
@@ -121,6 +122,8 @@ class _DynamicReportDetailWidgetState extends State {
String sleepReportUrl =
"${ServiceConstant.sleep_report_url}?mac=$mac&token=${ServiceConstant.sleep_token}&date=$time";
Get.toNamed("/sleepReportPage", arguments: sleepReportUrl);
+ } else {
+ TopSlideNotification.show(context,text: "当前暂无数据".tr,textColor: themeController.currentColor.sc9);
}
},
child: Row(
diff --git a/lib/component/home_page/SleepDataModuleWidget.dart b/lib/component/home_page/SleepDataModuleWidget.dart
index e3a0505..5414058 100644
--- a/lib/component/home_page/SleepDataModuleWidget.dart
+++ b/lib/component/home_page/SleepDataModuleWidget.dart
@@ -79,156 +79,181 @@ class _SleepDataModuleWidgetState extends State {
showTipDialog(
backgroundColor: stringToColor("#FFFFFF"),
context,
- Column(
- children: [
- Text(
- "${widget.data['name']}",
- style: TextStyle(
- color: stringToColor("#333333"),
- fontSize: 36.rpx,
- ),
- ),
- SizedBox(
- height: 17.rpx,
- ),
- Text(
- (widget.data['tips']?.toString().trim().isNotEmpty ?? false)
- ? widget.data['tips'].toString()
- : "未知数据".tr,
- style: TextStyle(
- color: stringToColor("#C8CBD2"),
- fontSize: 26.rpx,
- ),
- ),
- SizedBox(
- height: 37.rpx,
- ),
- Text(
- "${widget.data['value']}",
- style: TextStyle(
- color: stringToColor("${widget.data['color']}"),
- fontSize: 60.rpx,
- ),
- ),
- SizedBox(
- height: 81.rpx,
- ),
- IntrinsicHeight(
- child: Row(
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- for (int i = 0; i < levelGroups.length; i++) ...[
- // 每个 levelGroup 区域
- Expanded(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- // Level 名称
- Text(
- levelGroups[i]['levelName'],
- style: TextStyle(
- fontSize: 30.rpx,
- color: stringToColor("#333333"),
- fontWeight: FontWeight.bold,
- ),
- ),
- SizedBox(height: 38.rpx),
+ Container(
+ constraints: BoxConstraints(
+ maxHeight: 700.rpx,
+ ),
+ child: SingleChildScrollView(
+ child: Column(
+ children: [
+ Text(
+ "${widget.data['name']}",
+ style: TextStyle(
+ color: stringToColor("#333333"),
+ fontSize: 36.rpx,
+ ),
+ ),
+ SizedBox(
+ height: 17.rpx,
+ ),
+ Text(
+ (widget.data['tips']?.toString().trim().isNotEmpty ??
+ false)
+ ? widget.data['tips'].toString()
+ : "未知数据".tr,
+ style: TextStyle(
+ color: stringToColor("#C8CBD2"),
+ fontSize: 26.rpx,
+ ),
+ ),
+ SizedBox(
+ height: 37.rpx,
+ ),
+ Text(
+ "${widget.data['value']}" +
+ ((widget.data['unit'] == null ||
+ widget.data['unit'].toString().isEmpty)
+ ? ''
+ : widget.data['unit']),
+ style: TextStyle(
+ color: stringToColor("${widget.data['color']}"),
+ fontSize: 60.rpx,
+ ),
+ ),
+ SizedBox(
+ height: 81.rpx,
+ ),
+ IntrinsicHeight(
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ for (int i = 0; i < levelGroups.length; i++) ...[
+ // 每个 levelGroup 区域
+ Expanded(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ // Level 名称
+ Text(
+ levelGroups[i]['levelName'],
+ style: TextStyle(
+ fontSize: 30.rpx,
+ color: stringToColor("#333333"),
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ SizedBox(height: 38.rpx),
- // 颜色圆点 + key（包一层，和 svg 分离）
- Row(
- mainAxisAlignment:
- MainAxisAlignment.spaceAround,
- crossAxisAlignment:
- CrossAxisAlignment.start, // 上对齐，避免撑高分割线
- children:
- levelGroups[i]['items'].map((item) {
- final bool isSelected =
- (item['key'] == itemLevel);
- return Column(
- children: [
- // 颜色圆点 + key（参与分割线高度）
- Column(
+ // 颜色圆点 + key（包一层，和 svg 分离）
+ Row(
+ mainAxisAlignment:
+ MainAxisAlignment.spaceAround,
+ crossAxisAlignment:
+ CrossAxisAlignment.start, // 上对齐，避免撑高分割线
+ children: levelGroups[i]['items']
+ .map((item) {
+ final bool isSelected =
+ (item['key'] == itemLevel);
+ return Column(
children: [
- Container(
- width: 20.rpx,
- height: 20.rpx,
- decoration: BoxDecoration(
- color:
- stringToColor(item['color']),
- shape: BoxShape.circle,
- ),
- ),
- SizedBox(height: 30.rpx),
- Text(
- item['key'],
- style: TextStyle(
- color: stringToColor("#333333"),
- fontSize: 20.rpx,
- ),
+ // 颜色圆点 + key（参与分割线高度）
+ Column(
+ children: [
+ Container(
+ width: 20.rpx,
+ height: 20.rpx,
+ decoration: BoxDecoration(
+ color: stringToColor(
+ item['color']),
+ shape: BoxShape.circle,
+ ),
+ ),
+ SizedBox(height: 30.rpx),
+ Text(
+ item['key'],
+ style: TextStyle(
+ color:
+ stringToColor("#333333"),
+ fontSize: 20.rpx,
+ ),
+ ),
+ ],
),
+
+ // svg 箭头（不影响分割线高度）
+ SizedBox(height: 20.rpx),
+ isSelected
+ ? SvgPicture.asset(
+ 'assets/img/icon/triangle.svg',
+ width: 18.rpx,
+ height: 18.rpx,
+ color: themeController
+ .currentColor.sc9,
+ )
+ : SizedBox(height: 18.rpx),
],
- ),
-
- // svg 箭头（不影响分割线高度）
- SizedBox(height: 20.rpx),
- isSelected
- ? SvgPicture.asset(
- 'assets/img/icon/triangle.svg',
- width: 18.rpx,
- height: 18.rpx,
- color: themeController
- .currentColor.sc9,
- )
- : SizedBox(height: 18.rpx),
- ],
- );
- }).toList(),
+ );
+ }).toList(),
+ ),
+ ],
),
- ],
- ),
- ),
+ ),
- // 分割线（只和主要内容等高）
- if (i != levelGroups.length - 1)
- Container(
- width: 1.rpx,
- color: stringToColor("${widget.data['color']}"),
- margin: EdgeInsets.symmetric(horizontal: 10.rpx),
+ // 分割线（只和主要内容等高）
+ if (i != levelGroups.length - 1)
+ Container(
+ width: 1.rpx,
+ color: Colors.grey.withOpacity(0.5),
+ margin:
+ EdgeInsets.symmetric(horizontal: 10.rpx),
+ ),
+ ]
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 71.rpx,
+ ),
+ RichText(
+ text: TextSpan(
+ children: [
+ TextSpan(
+ text: "当前属于".tr, // 第一部分文本
+ style: TextStyle(
+ color: Colors.black, // 你想要的样式
+ fontSize: 30.rpx,
+ ),
),
- ]
- ],
- ),
- ),
- SizedBox(
- height: 71.rpx,
- ),
- RichText(
- text: TextSpan(
- children: [
- TextSpan(
- text: "当前属于".tr, // 第一部分文本
- style: TextStyle(
- color: Colors.black, // 你想要的样式
- fontSize: 30.rpx,
- ),
+ TextSpan(
+ text: itemLevel, // 第二部分文本
+ style: TextStyle(
+ color: stringToColor("${widget.data['color']}"),
+ fontSize: 30.rpx,
+ ),
+ ),
+ ],
),
- TextSpan(
- text: itemLevel, // 第二部分文本
- style: TextStyle(
- color: stringToColor("${widget.data['color']}"),
- fontSize: 30.rpx,
- ),
- ),
- ],
- ),
+ ),
+ ],
),
- ],
+ ),
),
);
}
+ if (widget.data['onto'] != null && widget.data['onto'] == true) {
+ //跳转睡眠报告
+ Get.toNamed("/newSleepReportPage", arguments: {
+ 'date': widget.data['time'] != null
+ ? int.parse(widget.data['time'].toString())
+ : DateTime.now().millisecondsSinceEpoch,
+ "mac": 'aaaaaaeeeeeq',
+ 'type': 1,
+ 'name': 'sleep', //'sleep', 'heartRate' 或 'breathe'
+ 'itemName': widget.data['id'],
+ });
+ }
},
child: Container(
- // width: MediaQuery.sizeOf(context).width * 0.267,
width: MediaQuery.sizeOf(context).width * 0.267,
constraints: BoxConstraints(
minWidth: 200.rpx,
@@ -251,40 +276,80 @@ class _SleepDataModuleWidgetState extends State {
overflow: TextOverflow.ellipsis,
),
Row(
- mainAxisSize: MainAxisSize.max,
+ mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Row(
- mainAxisSize: MainAxisSize.max,
- crossAxisAlignment: CrossAxisAlignment.end,
- children: [
- Text(
- '${widget.data['value']}',
- style: FlutterFlowTheme.of(context).bodyMedium.override(
+ // Expanded(
+ // child: Row(
+ // mainAxisSize: MainAxisSize.min,
+ // crossAxisAlignment: CrossAxisAlignment.end,
+ // children: [
+ // Text(
+ // '${widget.data['value']}',
+ // style: FlutterFlowTheme.of(context).bodyMedium.override(
+ // fontFamily: 'Inter',
+ // fontSize: 36.rpx,
+ // letterSpacing: 0.0,
+ // color: themeController.currentColor.sc3,
+ // ),
+ // maxLines: 1,
+ // overflow: TextOverflow.ellipsis,
+ // ),
+ // Padding(
+ // padding:
+ // EdgeInsetsDirectional.fromSTEB(0, 0, 0, 10.rpx),
+ // child: Text(
+ // '${widget.data['unit'] ?? ''}',
+ // style: FlutterFlowTheme.of(context)
+ // .bodyMedium
+ // .override(
+ // fontFamily: 'Inter',
+ // fontSize: AppConstants().small_text_fontSize,
+ // letterSpacing: 0.0,
+ // color: themeController.currentColor.sc3,
+ // ),
+ // maxLines: 1,
+ // overflow: TextOverflow.ellipsis,
+ // ),
+ // ),
+ // ],
+ // ),
+ // ),
+ Expanded(
+ child: Text.rich(
+ TextSpan(
+ children: [
+ TextSpan(
+ text: '${widget.data['value']}',
+ style: TextStyle(
fontFamily: 'Inter',
fontSize: 36.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc3,
),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
+ ),
+ WidgetSpan(child: SizedBox(width: 2.rpx)), // 可选间距
+ TextSpan(
+ text: widget.data['unit'] != null
+ ? '${widget.data['unit']}'
+ : '',
+ style: TextStyle(
+ fontFamily: 'Inter',
+ fontSize: AppConstants().small_text_fontSize,
+ letterSpacing: 0.0,
+ color: themeController.currentColor.sc3,
+ ),
+ ),
+ ],
),
- Padding(
- padding: EdgeInsetsDirectional.fromSTEB(0, 0, 0, 10.rpx),
- child: Text(
- '${widget.data['unit'] ?? ''}',
- style: FlutterFlowTheme.of(context).bodyMedium.override(
- fontFamily: 'Inter',
- fontSize: AppConstants().small_text_fontSize,
- letterSpacing: 0.0,
- color: themeController.currentColor.sc3,
- ),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- ),
- ],
+ maxLines: 1,
+ style: TextStyle(
+ color:
+ themeController.currentColor.sc3), // 强制 ellipsis 颜色
+ overflow: TextOverflow.ellipsis,
+ ),
),
+
if (widget.data['level'] != null)
ClickableContainer(
backgroundColor: (widget.data['color'] == null ||
diff --git a/lib/controller/device/blueteeth_bind_controller.dart b/lib/controller/device/blueteeth_bind_controller.dart
index f7886ec..4b27a5f 100644
--- a/lib/controller/device/blueteeth_bind_controller.dart
+++ b/lib/controller/device/blueteeth_bind_controller.dart
@@ -71,7 +71,8 @@ class BlueteethBindController extends GetControllerEx {
RxString search = "".obs; //搜索关键字
- RxInt connectStatus = 0.obs;
+ RxInt connectStatus = 0.obs;//当前wifi连接状态 0：未连接 1：已连接
+ RxInt blueConnectFlag = 0.obs;//当前蓝牙连接状态 0.正在连接 1.为连接 2.已连接
RxMap selectWifi = {}.obs; //正在连接wifi信息
diff --git a/lib/controller/weather/weather_controller.dart b/lib/controller/weather/weather_controller.dart
index b5d91e3..6fa1397 100644
--- a/lib/controller/weather/weather_controller.dart
+++ b/lib/controller/weather/weather_controller.dart
@@ -256,6 +256,9 @@ class WeatherModelController extends GetControllerEx {
Future _getCurrentLocation() async {
try {
Position position = await _determinePosition();
+ if (position == null) {
+ throw Exception("获取位置失败");
+ }
String? language = "zh_CN";
if (languageController.selectLanguage != null) {
diff --git a/lib/main.dart b/lib/main.dart
index 43503b0..a2be13c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -103,13 +103,13 @@ void startMessagePolling() {
// 避免重复启动
_messageTimer?.cancel();
- _messageTimer = Timer.periodic(Duration(seconds: 5), (timer) async {
+ _messageTimer = Timer.periodic(Duration(seconds: 10), (timer) async {
try {
MessageController messageController = Get.find();
messageController.getMessageStatus();
// print("轮询消息状态成功");
} catch (e) {
- print("轮询消息状态失败: $e");
+ print("轮询消息状态失败: $e");
}
});
}
diff --git a/lib/pages/device/component/DeviceDataComponentWidget.dart b/lib/pages/device/component/DeviceDataComponentWidget.dart
index ce61e34..1109440 100644
--- a/lib/pages/device/component/DeviceDataComponentWidget.dart
+++ b/lib/pages/device/component/DeviceDataComponentWidget.dart
@@ -1,9 +1,9 @@
import 'dart:async';
+import 'dart:math' as math;
+import 'dart:ui' as ui;
-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:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:vbvs_app/common/color/ServiceConstant.dart';
@@ -15,18 +15,12 @@ import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/component/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/ToggleColorContainer.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
-import 'package:vbvs_app/component/tool/cmd.dart';
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
import 'package:vbvs_app/controller/device/body_device_controller.dart';
import 'package:vbvs_app/controller/person/person_controller.dart';
-import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/enum/BindType.dart';
-import 'package:vbvs_app/model/BleDeviceData.dart';
import 'package:vbvs_app/model/api_response.dart';
-import 'package:vbvs_app/pages/device_bind/blueteeth_device_page.dart';
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
-import 'dart:math' as math;
-import 'dart:ui' as ui;
class DeviceDataComponentWidget extends StatefulWidget {
final Map device;
@@ -1040,7 +1034,7 @@ class _DeviceDataComponentWidgetState extends State {
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
- Expanded(
+ Expanded(
child: CustomCard(
borderRadius: AppConstants().button_container_radius,
onTap: () async {
@@ -1052,11 +1046,17 @@ class _DeviceDataComponentWidgetState extends State {
personController.gender.value =
widget.device['person']['gender'] ?? 1;
personController.weight?.value =
- widget.device['person']['weight'].toString() ??
- "";
+ widget.device['person']['weight'] == null
+ ? ''
+ : widget.device['person']['weight']
+ .toString();
+
personController.height.value =
- widget.device['person']['height'].toString() ??
- "";
+ widget.device['person']['height'] == null
+ ? ''
+ : widget.device['person']['height']
+ .toString();
+
personController.selectedDiseaseIds.value =
widget.device['person']['disease'] ?? [];
personController.birthday.value =
@@ -1165,7 +1165,8 @@ class _DeviceDataComponentWidgetState extends State {
borderRadius: AppConstants().button_container_radius,
onTap: () {
// TopSlideNotification.show(context, text: "待开发功能".tr);
- Get.toNamed("/messageReviewPage",arguments: widget.device);
+ Get.toNamed("/messageReviewPage",
+ arguments: widget.device);
},
colors: [
themeController.currentColor.sc1,
@@ -1463,19 +1464,3 @@ class _DeviceDataComponentWidgetState extends State {
}
}
}
-
-_showBluetoothNotEnabledDialog() async {
- await showDialog(
- context: Get.context!,
- builder: (_) => AlertDialog(
- title: Text("蓝牙未开启"),
- content: Text("请先打开蓝牙再进行WIFI配置"),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(Get.context!).pop(),
- child: Text("知道了"),
- ),
- ],
- ),
- );
-}
diff --git a/lib/pages/device/instant_body_page.dart b/lib/pages/device/instant_body_page.dart
index f280997..5f35174 100644
--- a/lib/pages/device/instant_body_page.dart
+++ b/lib/pages/device/instant_body_page.dart
@@ -325,6 +325,7 @@ class _InstantBodyPageState extends State {
),
].divide(SizedBox(height: 34.rpx)),
),
+
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
@@ -342,6 +343,8 @@ class _InstantBodyPageState extends State {
color: themeController
.currentColor.sc3,
),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
Text(
'${device['person']?['weight'] ?? '未知数据'.tr}kg',
@@ -358,6 +361,7 @@ class _InstantBodyPageState extends State {
),
].divide(SizedBox(height: 34.rpx)),
),
+
]
.divide(SizedBox(width: 33.rpx))
.addToStart(SizedBox(width: 37.rpx)),
diff --git a/lib/pages/device_bind/blueteeth_device_page.dart b/lib/pages/device_bind/blueteeth_device_page.dart
index ab7f719..3e95083 100644
--- a/lib/pages/device_bind/blueteeth_device_page.dart
+++ b/lib/pages/device_bind/blueteeth_device_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:permission_handler/permission_handler.dart'; // 引入permission_handler
+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/component/tool/ClickableContainer.dart';
@@ -15,6 +16,7 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/model/BleDeviceData.dart';
import 'package:vbvs_app/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart';
+import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
class BlueteethDevicePage extends StatefulWidget {
int tid = -1;
@@ -730,19 +732,40 @@ class _BlueteethDevicePageState extends State {
}
_showBluetoothNotEnabledDialog() async {
- await showDialog(
- context: context,
- builder: (_) => AlertDialog(
- title: Text("蓝牙未开启"),
- content: Text("请先打开蓝牙再进行设备扫描"),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(context).pop(),
- child: Text("知道了"),
- ),
- ],
- ),
- );
+ await showTipDialog(
+ context,
+ Column(
+ children: [
+ Text(
+ "蓝牙未开启".tr,
+ style: TextStyle(
+ fontSize: AppConstants().title_text_fontSize,
+ color: themeController.currentColor.sc3),
+ ),
+ SizedBox(
+ height: 20.rpx,
+ ),
+ Text(
+ "请先打开蓝牙在进行设备扫描".tr,
+ style: TextStyle(
+ fontSize: AppConstants().normal_text_fontSize,
+ color: themeController.currentColor.sc3),
+ ),
+ ],
+ ));
+ // await showDialog(
+ // context: context,
+ // builder: (_) => AlertDialog(
+ // title: Text("蓝牙未开启"),
+ // content: Text("请先打开蓝牙再进行设备扫描"),
+ // actions: [
+ // TextButton(
+ // onPressed: () => Navigator.of(context).pop(),
+ // child: Text("知道了"),
+ // ),
+ // ],
+ // ),
+ // );
}
}
diff --git a/lib/pages/device_bind/componnet/bind_dialog.dart b/lib/pages/device_bind/componnet/bind_dialog.dart
index 786020d..07f4e8d 100644
--- a/lib/pages/device_bind/componnet/bind_dialog.dart
+++ b/lib/pages/device_bind/componnet/bind_dialog.dart
@@ -860,7 +860,7 @@ void showWifiDialog(
);
}
-void showTipDialog(
+String showTipDialog(
BuildContext context,
Widget widget, {
Color? backgroundColor, // 新增可选参数
@@ -990,4 +990,5 @@ void showTipDialog(
);
},
);
+ return "";
}
diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart
index ef96d7d..e4b6a82 100644
--- a/lib/pages/device_bind/wifi_page.dart
+++ b/lib/pages/device_bind/wifi_page.dart
@@ -62,6 +62,7 @@ class _WifiPageState extends State {
// textColor: themeController.currentColor.sc2,
// );
// });
+ blueteethBindController.blueConnectFlag.value = 2;
blueteethBindController.currentDevice = bledevice;
if (lisObj != null) {
lisObj!.cancel();
@@ -116,6 +117,8 @@ class _WifiPageState extends State {
}
});
} else {
+ blueteethBindController.blueConnectFlag.value = 0;
+ blueteethBindController.updateAll();
dealWifi(widget.type['mac']).then((aa) {
print("object");
});
@@ -175,21 +178,50 @@ class _WifiPageState extends State {
SizedBox(
width: 14.rpx,
),
- Obx(() {
- if (blueteethBindController.connectStatus.value ==
- 0) {
- return SizedBox(
- width: 24.rpx,
- height: 24.rpx,
- child: CircularProgressIndicator(
- strokeWidth: 1,
- valueColor:
- AlwaysStoppedAnimation(Colors.white),
- ),
- );
- }
- return Container();
- }),
+ if (widget.type == null)
+ Obx(() {
+ if (blueteethBindController.connectStatus.value ==
+ 0) {
+ return SizedBox(
+ width: 24.rpx,
+ height: 24.rpx,
+ child: CircularProgressIndicator(
+ strokeWidth: 1,
+ valueColor: AlwaysStoppedAnimation(
+ Colors.white),
+ ),
+ );
+ }
+ return Container();
+ }),
+ if (widget.type != null)
+ Obx(() {
+ if (blueteethBindController.blueConnectFlag.value ==
+ 0) {
+ return SizedBox(
+ width: 24.rpx,
+ height: 24.rpx,
+ child: CircularProgressIndicator(
+ strokeWidth: 1,
+ valueColor: AlwaysStoppedAnimation(
+ Colors.white),
+ ),
+ );
+ }
+ if (blueteethBindController.connectStatus.value ==
+ 0&&blueteethBindController.blueConnectFlag.value ==0) {
+ return SizedBox(
+ width: 24.rpx,
+ height: 24.rpx,
+ child: CircularProgressIndicator(
+ strokeWidth: 1,
+ valueColor: AlwaysStoppedAnimation(
+ Colors.white),
+ ),
+ );
+ }
+ return Container();
+ }),
],
),
@@ -717,6 +749,20 @@ class _WifiPageState extends State {
horizontal: 20.rpx, vertical: 10.rpx),
borderRadius: 20.rpx,
onTap: () async {
+ if ((blueteethBindController
+ .blueConnectFlag ==
+ 0 ||
+ blueteethBindController
+ .blueConnectFlag ==
+ 1) &&
+ widget.type != null) {
+ blueteethBindController
+ .blueConnectFlag.value = 0;
+ dealWifi(widget.type['mac']).then((aa) {
+ print("object");
+ });
+ return;
+ }
blueteethBindController
.connectStatus.value = 0;
blueteethBindController.updateAll();
@@ -957,6 +1003,8 @@ class _WifiPageState extends State {
timeoutTimer = Timer(Duration(seconds: 20), () {
try {
if (!isConnected) {
+ blueteethBindController.blueConnectFlag.value = 1;
+ blueteethBindController.updateAll();
// Navigator.of(context).pop(); // 先关闭 dialog
WidgetsBinding.instance.addPostFrameCallback((_) {
TopSlideNotification.show(
@@ -1005,6 +1053,7 @@ class _WifiPageState extends State {
var res2 = bledevice.isConnected;
if (res2) {
// Navigator.pop(context);
+ blueteethBindController.blueConnectFlag.value = 2;
TopSlideNotification.show(
context,
text: "蓝牙绑定.连接成功".tr,
diff --git a/lib/pages/main_bottom/home_page.dart b/lib/pages/main_bottom/home_page.dart
index 5c32355..e60b380 100644
--- a/lib/pages/main_bottom/home_page.dart
+++ b/lib/pages/main_bottom/home_page.dart
@@ -1013,7 +1013,7 @@ class _HomePageState extends State {
(device) => device['mac'] == mac,
);
List stateModule = [];
-
+ String currentTime = "";
return DynamicReportDetailWidget(
targetDevice: targetDevice!,
sleepDateWidgets: List.generate(
@@ -1030,6 +1030,7 @@ class _HomePageState extends State {
dayData['selected'] == true &&
dayData['state'] != null) {
stateModule = dayData['state'];
+ currentTime = dayData['time'];
}
return SleepDateWidget(
mac: mac,
@@ -1053,9 +1054,13 @@ class _HomePageState extends State {
stateModule.isNotEmpty
? List.generate(
stateModule.length,
- (j) => SleepDataModuleWidget(
- data: stateModule[j],
- ),
+ (j) {
+ stateModule[j]['onto'] = true;
+ stateModule[j]['time'] = currentTime;
+ return SleepDataModuleWidget(
+ data: stateModule[j],
+ );
+ },
)
: [],
);
diff --git a/lib/pages/main_bottom/mine_page.dart b/lib/pages/main_bottom/mine_page.dart
index 916074d..5e0a95d 100644
--- a/lib/pages/main_bottom/mine_page.dart
+++ b/lib/pages/main_bottom/mine_page.dart
@@ -693,7 +693,7 @@ class _MinePageState extends State {
mainAxisSize: MainAxisSize.max,
children: [
Text(
- 'V1.0.2505.28',
+ 'V1.0.2505.29',
style:
FlutterFlowTheme.of(context)
.bodyMedium
diff --git a/lib/pages/sleep_report/chart/FatigueCircleIndicator.dart b/lib/pages/sleep_report/chart/FatigueCircleIndicator.dart
index 73778b5..b713d07 100644
--- a/lib/pages/sleep_report/chart/FatigueCircleIndicator.dart
+++ b/lib/pages/sleep_report/chart/FatigueCircleIndicator.dart
@@ -50,9 +50,7 @@ class FatigueCircleIndicator extends StatelessWidget {
'$percent%',
style: TextStyle(
fontSize: AppConstants().normal_text_fontSize,
- color: percent > 60
- ? themeController.currentColor.sc9
- : themeController.currentColor.sc3,
+ color: color,
),
),
SizedBox(height: 4.rpx),
@@ -60,9 +58,7 @@ class FatigueCircleIndicator extends StatelessWidget {
explain,
style: TextStyle(
fontSize: AppConstants().normal_text_fontSize,
- color: percent > 60
- ? themeController.currentColor.sc9
- : themeController.currentColor.sc3,
+ color: color,
),
),
],
diff --git a/lib/pages/sleep_report/chart/LineChartByRange.dart b/lib/pages/sleep_report/chart/LineChartByRange.dart
index 024e608..37ffa44 100644
--- a/lib/pages/sleep_report/chart/LineChartByRange.dart
+++ b/lib/pages/sleep_report/chart/LineChartByRange.dart
@@ -5,69 +5,517 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'dart:ui' as ui;
import 'dart:math';
-class LineChartByRange extends StatelessWidget {
+//根据数据自定义
+// class LineChartByRange extends StatefulWidget {
+// final List> showLabel;
+// final int startTime;
+// final int endTime;
+// final int? threshold;
+
+// const LineChartByRange({
+// Key? key,
+// required this.showLabel,
+// required this.startTime,
+// required this.endTime,
+// this.threshold, // 新增
+// }) : super(key: key);
+
+// @override
+// State createState() => _LineChartByRangeState();
+// }
+
+// class _LineChartByRangeState extends State {
+// Offset? selectedOffset;
+// Map? selectedData;
+
+// @override
+// Widget build(BuildContext context) {
+// if (widget.showLabel.isEmpty) return const SizedBox();
+
+// int maxTimes = widget.showLabel
+// .map((e) => e['times'] ?? 0)
+// .reduce((a, b) => a > b ? a : b);
+// int yMax = (maxTimes / 10).ceil() * 10;
+// if (yMax == 0) yMax = 10;
+
+// DateTime minTime = DateTime.fromMillisecondsSinceEpoch(widget.startTime);
+// DateTime maxTime = DateTime.fromMillisecondsSinceEpoch(widget.endTime);
+
+// return GestureDetector(
+// onTapDown: (details) {
+// RenderBox box = context.findRenderObject() as RenderBox;
+// final localPosition = box.globalToLocal(details.globalPosition);
+
+// // 查找是否点击到某个点
+// for (var item in widget.showLabel) {
+// int start = item['startTime'];
+// int end = item['endTime'];
+// int times = item['times'];
+
+// double chartWidth = box.size.width - 40.rpx; // 与 painter 内一致处理
+// double chartHeight = box.size.height - 30.rpx;
+// double xStart = 20.rpx + 12.rpx;
+
+// int totalDuration =
+// maxTime.millisecondsSinceEpoch - minTime.millisecondsSinceEpoch;
+
+// double startX = xStart +
+// chartWidth *
+// (start - minTime.millisecondsSinceEpoch) /
+// totalDuration;
+// double y = chartHeight * (1 - times / yMax);
+
+// // 判断点击范围（圆点半径±6.rpx范围）
+// if ((localPosition - Offset(startX, y)).distance < 10.rpx) {
+// setState(() {
+// selectedOffset = Offset(startX, y);
+// selectedData = item;
+// });
+// return;
+// }
+
+// double endX = xStart +
+// chartWidth *
+// (end - minTime.millisecondsSinceEpoch) /
+// totalDuration;
+// if ((localPosition - Offset(endX, y)).distance < 10.rpx) {
+// setState(() {
+// selectedOffset = Offset(endX, y);
+// selectedData = item;
+// });
+// return;
+// }
+// }
+
+// // 没点到，清除选中
+// setState(() {
+// selectedOffset = null;
+// selectedData = null;
+// });
+// },
+// child: Stack(
+// children: [
+// SizedBox(
+// height: 500.rpx,
+// child: CustomPaint(
+// size: Size(double.infinity, 500.rpx),
+// painter: _LineChartByRangePainter(
+// data: widget.showLabel,
+// yMax: yMax,
+// minTime: minTime,
+// maxTime: maxTime,
+// threshold: widget.threshold, // 新增
+// ),
+// ),
+// ),
+// if (selectedOffset != null && selectedData != null)
+// Positioned(
+// left: selectedOffset!.dx - 60.rpx,
+// top: selectedOffset!.dy - 50.rpx,
+// child: Container(
+// padding:
+// EdgeInsets.symmetric(horizontal: 12.rpx, vertical: 8.rpx),
+// decoration: BoxDecoration(
+// color: Colors.black.withOpacity(0.3),
+// borderRadius: BorderRadius.circular(10.rpx),
+// ),
+// child: Text(
+// '${DateFormat('HH:mm').format(DateTime.fromMillisecondsSinceEpoch(selectedData!['startTime']))} - '
+// '${DateFormat('HH:mm').format(DateTime.fromMillisecondsSinceEpoch(selectedData!['endTime']))}\n'
+// '次数: ${selectedData!['times']}',
+// style: TextStyle(
+// fontSize: 18.rpx,
+// color: Colors.white,
+// ),
+// ),
+// ),
+// ),
+// ],
+// ),
+// );
+// }
+// }
+
+// class _LineChartByRangePainter extends CustomPainter {
+// final List> data;
+// final int yMax;
+// final DateTime minTime;
+// final DateTime maxTime;
+// final int? threshold;
+
+// _LineChartByRangePainter({
+// required this.data,
+// required this.yMax,
+// required this.minTime,
+// required this.maxTime,
+// this.threshold,
+// });
+
+// @override
+// void paint(Canvas canvas, Size size) {
+// double padding = 20.rpx;
+// double labelInset = 12.rpx;
+
+// final double xStart = padding + labelInset;
+// final double xEnd = size.width - padding - labelInset;
+// final double chartWidth = xEnd - xStart;
+
+// double chartHeight = size.height - 30.rpx;
+
+// int totalDuration =
+// maxTime.millisecondsSinceEpoch - minTime.millisecondsSinceEpoch;
+// if (totalDuration <= 0) return;
+
+// Paint linePaint = Paint()
+// ..style = PaintingStyle.stroke
+// ..strokeWidth = 3.rpx
+// ..color = stringToColor("#00C1AA")
+// ..strokeCap = StrokeCap.round;
+
+// Paint axisPaint = Paint()
+// ..color = Colors.grey.withOpacity(0.4)
+// ..strokeWidth = 1.rpx;
+
+// Paint thresholdPaint = Paint()
+// ..color = themeController.currentColor.sc9
+// ..strokeWidth = 1.rpx;
+
+// // 1. 阈值虚线（红色）
+// if (threshold != null && threshold! >= 0 && threshold! <= yMax) {
+// double yThreshold = chartHeight * (1 - threshold! / yMax);
+// drawDashedLine(
+// canvas,
+// Offset(xStart, yThreshold),
+// Offset(xEnd, yThreshold),
+// thresholdPaint,
+// dashWidth: 8.rpx,
+// dashSpace: 6.rpx,
+// );
+// }
+
+// // 2. 绘制数据线段和圆点
+// for (var item in data) {
+// int start = item['startTime'];
+// int end = item['endTime'];
+// int times = item['times'];
+
+// double startX = xStart +
+// chartWidth * (start - minTime.millisecondsSinceEpoch) / totalDuration;
+// double endX = xStart +
+// chartWidth * (end - minTime.millisecondsSinceEpoch) / totalDuration;
+// double y = chartHeight * (1 - times / yMax);
+
+// // 设置颜色（根据 threshold 判断）
+// Color pointColor;
+// if (threshold != null && times >= threshold!) {
+// pointColor = themeController.currentColor.sc9;
+// } else {
+// pointColor = stringToColor("#00C1AA");
+// }
+
+// Paint dynamicLinePaint = Paint()
+// ..style = PaintingStyle.stroke
+// ..strokeWidth = 3.rpx
+// ..color = pointColor
+// ..strokeCap = StrokeCap.round;
+
+// Paint dynamicCirclePaint = Paint()
+// ..style = PaintingStyle.fill
+// ..color = pointColor;
+
+// // 画线段
+// canvas.drawLine(Offset(startX, y), Offset(endX, y), dynamicLinePaint);
+
+// // 画起点和终点圆点
+// canvas.drawCircle(Offset(startX, y), 6.rpx, dynamicCirclePaint);
+// canvas.drawCircle(Offset(endX, y), 6.rpx, dynamicCirclePaint);
+// }
+
+// // 3. Y轴辅助线和文字
+// for (int i = 0; i <= 6; i++) {
+// double y = chartHeight * i / 6;
+
+// if (i == 6) {
+// canvas.drawLine(Offset(xStart, y), Offset(xEnd, y), axisPaint);
+// } else {
+// drawDashedLine(
+// canvas,
+// Offset(xStart, y),
+// Offset(xEnd, y),
+// axisPaint,
+// dashWidth: 8.rpx,
+// dashSpace: 6.rpx,
+// );
+// }
+
+// TextPainter tp = TextPainter(
+// text: TextSpan(
+// text: '${yMax - (yMax * i / 6).round()}',
+// style: TextStyle(
+// fontSize: 18.rpx,
+// color: themeController.currentColor.sc4,
+// ),
+// ),
+// textDirection: ui.TextDirection.ltr,
+// );
+// tp.layout();
+// tp.paint(canvas, Offset(0, y - tp.height / 2));
+// }
+
+// // 4. X轴主线
+// canvas.drawLine(
+// Offset(xStart, chartHeight),
+// Offset(xEnd, chartHeight),
+// axisPaint,
+// );
+
+// // 5. X轴时间文字（左右两侧）
+// String leftLabel = DateFormat('HH:mm').format(minTime);
+// TextPainter leftTp = TextPainter(
+// text: TextSpan(
+// text: leftLabel,
+// style: TextStyle(
+// fontSize: 18.rpx,
+// color: themeController.currentColor.sc4,
+// ),
+// ),
+// textDirection: ui.TextDirection.ltr,
+// );
+// leftTp.layout();
+// leftTp.paint(canvas,
+// Offset(padding + labelInset - leftTp.width / 2, chartHeight + 8.rpx));
+
+// String rightLabel = DateFormat('HH:mm').format(maxTime);
+// TextPainter rightTp = TextPainter(
+// text: TextSpan(
+// text: rightLabel,
+// style: TextStyle(
+// fontSize: 18.rpx,
+// color: themeController.currentColor.sc4,
+// ),
+// ),
+// textDirection: ui.TextDirection.ltr,
+// );
+// rightTp.layout();
+// rightTp.paint(
+// canvas,
+// Offset(size.width - padding - labelInset - rightTp.width / 2,
+// chartHeight + 8.rpx));
+
+// // 6. 中间小时刻度
+// int totalHours = maxTime.difference(minTime).inHours + 1;
+// int startHour = minTime.hour;
+
+// for (int i = 1; i < totalHours; i++) {
+// double x = xStart + chartWidth * i / totalHours;
+
+// int hourLabelNum = (startHour + i) % 24;
+// String hourLabel = '$hourLabelNum';
+
+// TextPainter tp = TextPainter(
+// text: TextSpan(
+// text: hourLabel,
+// style: TextStyle(
+// fontSize: 18.rpx,
+// color: themeController.currentColor.sc4,
+// ),
+// ),
+// textDirection: ui.TextDirection.ltr,
+// );
+// tp.layout();
+// tp.paint(canvas, Offset(x - tp.width / 2, chartHeight + 8.rpx));
+// }
+// }
+
+// @override
+// bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+
+// void drawDashedLine(
+// Canvas canvas,
+// Offset start,
+// Offset end,
+// Paint paint, {
+// required double dashWidth,
+// required double dashSpace,
+// }) {
+// final dx = end.dx - start.dx;
+// final dy = end.dy - start.dy;
+// final distance = sqrt(dx * dx + dy * dy);
+// final direction = Offset(dx / distance, dy / distance);
+
+// double drawn = 0;
+// while (drawn < distance) {
+// final from = start + direction * drawn;
+// final to = start + direction * (drawn + dashWidth).clamp(0, distance);
+// canvas.drawLine(from, to, paint);
+// drawn += dashWidth + dashSpace;
+// }
+// }
+// }
+
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:vbvs_app/common/util/FitTool.dart';
+import 'package:vbvs_app/common/util/MyUtils.dart';
+import 'dart:ui' as ui;
+import 'dart:math';
+
+class LineChartByRange extends StatefulWidget {
final List> showLabel;
final int startTime;
final int endTime;
+ final int? threshold;
+
+ /// 新增外部指定的 Y 轴最大值
+ final int maxY;
+
+ /// Y 轴分段数，默认6段
+ final int ySegments;
const LineChartByRange({
Key? key,
required this.showLabel,
required this.startTime,
required this.endTime,
+ required this.maxY,
+ this.threshold,
+ this.ySegments = 6,
}) : super(key: key);
+ @override
+ State createState() => _LineChartByRangeState();
+}
+
+class _LineChartByRangeState extends State {
+ Offset? selectedOffset;
+ Map? selectedData;
+
@override
Widget build(BuildContext context) {
- if (showLabel.isEmpty) return const SizedBox();
+ if (widget.showLabel.isEmpty) return const SizedBox();
- int maxTimes =
- showLabel.map((e) => e['times'] ?? 0).reduce((a, b) => a > b ? a : b);
- int yMax = (maxTimes / 10).ceil() * 10;
- if (yMax == 0) yMax = 10;
+ DateTime minTime = DateTime.fromMillisecondsSinceEpoch(widget.startTime);
+ DateTime maxTime = DateTime.fromMillisecondsSinceEpoch(widget.endTime);
- DateTime minTime = DateTime.fromMillisecondsSinceEpoch(startTime);
- DateTime maxTime = DateTime.fromMillisecondsSinceEpoch(endTime);
+ return GestureDetector(
+ onTapDown: (details) {
+ RenderBox box = context.findRenderObject() as RenderBox;
+ final localPosition = box.globalToLocal(details.globalPosition);
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- SizedBox(
- height: 500.rpx,
- child: CustomPaint(
- size: Size(double.infinity, 500.rpx),
- painter: _LineChartByRangePainter(
- data: showLabel,
- yMax: yMax,
- minTime: minTime,
- maxTime: maxTime,
+ // 查找是否点击到某个点
+ for (var item in widget.showLabel) {
+ int start = item['startTime'];
+ int end = item['endTime'];
+ int times = item['times'];
+
+ double chartWidth = box.size.width - 40.rpx; // 与 painter 内一致处理
+ double chartHeight = box.size.height - 30.rpx;
+ double xStart = 20.rpx + 12.rpx;
+
+ int totalDuration =
+ maxTime.millisecondsSinceEpoch - minTime.millisecondsSinceEpoch;
+
+ double startX = xStart +
+ chartWidth *
+ (start - minTime.millisecondsSinceEpoch) /
+ totalDuration;
+ double y = chartHeight * (1 - times / widget.maxY);
+
+ // 判断点击范围（圆点半径±6.rpx范围）
+ if ((localPosition - Offset(startX, y)).distance < 10.rpx) {
+ setState(() {
+ selectedOffset = Offset(startX, y);
+ selectedData = item;
+ });
+ return;
+ }
+
+ double endX = xStart +
+ chartWidth *
+ (end - minTime.millisecondsSinceEpoch) /
+ totalDuration;
+ if ((localPosition - Offset(endX, y)).distance < 10.rpx) {
+ setState(() {
+ selectedOffset = Offset(endX, y);
+ selectedData = item;
+ });
+ return;
+ }
+ }
+
+ // 没点到，清除选中
+ setState(() {
+ selectedOffset = null;
+ selectedData = null;
+ });
+ },
+ child: Stack(
+ children: [
+ SizedBox(
+ height: 500.rpx,
+ child: CustomPaint(
+ size: Size(double.infinity, 500.rpx),
+ painter: _LineChartByRangePainter(
+ data: widget.showLabel,
+ maxY: widget.maxY,
+ minTime: minTime,
+ maxTime: maxTime,
+ threshold: widget.threshold,
+ ySegments: widget.ySegments,
+ ),
),
),
- ),
- ],
+ if (selectedOffset != null && selectedData != null)
+ Positioned(
+ left: selectedOffset!.dx - 60.rpx,
+ top: selectedOffset!.dy - 50.rpx,
+ child: Container(
+ padding:
+ EdgeInsets.symmetric(horizontal: 12.rpx, vertical: 8.rpx),
+ decoration: BoxDecoration(
+ color: Colors.black.withOpacity(0.3),
+ borderRadius: BorderRadius.circular(10.rpx),
+ ),
+ child: Text(
+ '${DateFormat('HH:mm').format(DateTime.fromMillisecondsSinceEpoch(selectedData!['startTime']))} - '
+ '${DateFormat('HH:mm').format(DateTime.fromMillisecondsSinceEpoch(selectedData!['endTime']))}\n'
+ '次数: ${selectedData!['times']}',
+ style: TextStyle(
+ fontSize: 18.rpx,
+ color: Colors.white,
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
);
}
}
class _LineChartByRangePainter extends CustomPainter {
final List> data;
- final int yMax;
+ final int maxY;
final DateTime minTime;
final DateTime maxTime;
+ final int? threshold;
+ final int ySegments;
_LineChartByRangePainter({
required this.data,
- required this.yMax,
+ required this.maxY,
required this.minTime,
required this.maxTime,
+ this.threshold,
+ this.ySegments = 6,
});
@override
void paint(Canvas canvas, Size size) {
double padding = 20.rpx;
- double labelInset = 12.rpx; // X轴标签缩进距离
+ double labelInset = 12.rpx;
- // 绘图X轴起止点，考虑内缩labelInset
final double xStart = padding + labelInset;
final double xEnd = size.width - padding - labelInset;
final double chartWidth = xEnd - xStart;
@@ -78,17 +526,28 @@ class _LineChartByRangePainter extends CustomPainter {
maxTime.millisecondsSinceEpoch - minTime.millisecondsSinceEpoch;
if (totalDuration <= 0) return;
- Paint linePaint = Paint()
- ..style = PaintingStyle.stroke
- ..strokeWidth = 3.rpx
- ..color = stringToColor("#00C1AA")
- ..strokeCap = StrokeCap.round;
+ Paint axisPaint = Paint()
+ ..color = Colors.grey.withOpacity(0.4)
+ ..strokeWidth = 1.rpx;
- Paint fillCirclePaint = Paint()
- ..style = PaintingStyle.fill
- ..color = stringToColor("#00C1AA");
+ Paint thresholdPaint = Paint()
+ ..color = themeController.currentColor.sc9
+ ..strokeWidth = 1.rpx;
- // 1. 先绘制数据线段及起止点圆点
+ // 阈值虚线（红色）
+ if (threshold != null && threshold! >= 0 && threshold! <= maxY) {
+ double yThreshold = chartHeight * (1 - threshold! / maxY);
+ drawDashedLine(
+ canvas,
+ Offset(xStart, yThreshold),
+ Offset(xEnd, yThreshold),
+ thresholdPaint,
+ dashWidth: 8.rpx,
+ dashSpace: 6.rpx,
+ );
+ }
+
+ // 绘制数据线段和圆点
for (var item in data) {
int start = item['startTime'];
int end = item['endTime'];
@@ -98,31 +557,41 @@ class _LineChartByRangePainter extends CustomPainter {
chartWidth * (start - minTime.millisecondsSinceEpoch) / totalDuration;
double endX = xStart +
chartWidth * (end - minTime.millisecondsSinceEpoch) / totalDuration;
- double y = chartHeight * (1 - times / yMax);
+ double y = chartHeight * (1 - times / maxY);
+
+ // 设置颜色（根据 threshold 判断）
+ Color pointColor;
+ if (threshold != null && times >= threshold!) {
+ pointColor = themeController.currentColor.sc9;
+ } else {
+ pointColor = stringToColor("#00C1AA");
+ }
+
+ Paint dynamicLinePaint = Paint()
+ ..style = PaintingStyle.stroke
+ ..strokeWidth = 3.rpx
+ ..color = pointColor
+ ..strokeCap = StrokeCap.round;
+
+ Paint dynamicCirclePaint = Paint()
+ ..style = PaintingStyle.fill
+ ..color = pointColor;
// 画线段
- canvas.drawLine(Offset(startX, y), Offset(endX, y), linePaint);
+ canvas.drawLine(Offset(startX, y), Offset(endX, y), dynamicLinePaint);
- // 画起点圆点
- canvas.drawCircle(Offset(startX, y), 4.rpx, fillCirclePaint);
-
- // 画终点圆点
- canvas.drawCircle(Offset(endX, y), 4.rpx, fillCirclePaint);
+ // 画起点和终点圆点
+ canvas.drawCircle(Offset(startX, y), 6.rpx, dynamicCirclePaint);
+ canvas.drawCircle(Offset(endX, y), 6.rpx, dynamicCirclePaint);
}
- // 2. Y轴辅助线及文字
- Paint axisPaint = Paint()
- ..color = Colors.grey.withOpacity(0.4)
- ..strokeWidth = 1.rpx;
+ // Y轴辅助线和文字
+ for (int i = 0; i <= ySegments; i++) {
+ double y = chartHeight * i / ySegments;
- for (int i = 0; i <= 6; i++) {
- double y = chartHeight * i / 6;
-
- if (i == 6) {
- // 实线
+ if (i == ySegments) {
canvas.drawLine(Offset(xStart, y), Offset(xEnd, y), axisPaint);
} else {
- // 虚线
drawDashedLine(
canvas,
Offset(xStart, y),
@@ -133,12 +602,13 @@ class _LineChartByRangePainter extends CustomPainter {
);
}
- // Y轴文字
TextPainter tp = TextPainter(
text: TextSpan(
- text: '${yMax - (yMax * i / 6).round()}',
+ text: '${maxY - (maxY * i / ySegments).round()}',
style: TextStyle(
- fontSize: 18.rpx, color: themeController.currentColor.sc4),
+ fontSize: 18.rpx,
+ color: themeController.currentColor.sc4,
+ ),
),
textDirection: ui.TextDirection.ltr,
);
@@ -146,29 +616,14 @@ class _LineChartByRangePainter extends CustomPainter {
tp.paint(canvas, Offset(0, y - tp.height / 2));
}
- // 3. X轴线
+ // X轴主线
canvas.drawLine(
- Offset(xStart, chartHeight), Offset(xEnd, chartHeight), axisPaint);
+ Offset(xStart, chartHeight),
+ Offset(xEnd, chartHeight),
+ axisPaint,
+ );
- // 4. 画X轴时间点对应的垂直虚线辅助线
- int totalHours = maxTime.difference(minTime).inHours;
- int startHour = minTime.hour;
-
- // for (int i = 1; i < totalHours; i++) {
- // double x = xStart + chartWidth * i / totalHours;
-
- // // 垂直虚线
- // drawDashedLine(
- // canvas,
- // Offset(x, 0),
- // Offset(x, chartHeight),
- // axisPaint,
- // dashWidth: 4.rpx,
- // dashSpace: 4.rpx,
- // );
- // }
-
- // 5. 画左侧完整时分 (HH:mm)，往内缩 labelInset
+ // X轴时间文字（左右两侧）
String leftLabel = DateFormat('HH:mm').format(minTime);
TextPainter leftTp = TextPainter(
text: TextSpan(
@@ -184,7 +639,6 @@ class _LineChartByRangePainter extends CustomPainter {
leftTp.paint(canvas,
Offset(padding + labelInset - leftTp.width / 2, chartHeight + 8.rpx));
- // 6. 画右侧完整时分 (HH:mm)，往内缩 labelInset
String rightLabel = DateFormat('HH:mm').format(maxTime);
TextPainter rightTp = TextPainter(
text: TextSpan(
@@ -202,7 +656,10 @@ class _LineChartByRangePainter extends CustomPainter {
Offset(size.width - padding - labelInset - rightTp.width / 2,
chartHeight + 8.rpx));
- // 7. 中间小时数字(23, 0, 1, 2, ...)
+ // 中间小时刻度
+ int totalHours = maxTime.difference(minTime).inHours + 1;
+ int startHour = minTime.hour;
+
for (int i = 1; i < totalHours; i++) {
double x = xStart + chartWidth * i / totalHours;
@@ -220,7 +677,6 @@ class _LineChartByRangePainter extends CustomPainter {
textDirection: ui.TextDirection.ltr,
);
tp.layout();
-
tp.paint(canvas, Offset(x - tp.width / 2, chartHeight + 8.rpx));
}
}
diff --git a/lib/pages/sleep_report/chart/SnoreChart.dart b/lib/pages/sleep_report/chart/SnoreChart.dart
new file mode 100644
index 0000000..f6295ce
--- /dev/null
+++ b/lib/pages/sleep_report/chart/SnoreChart.dart
@@ -0,0 +1,199 @@
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:vbvs_app/common/color/appConstants.dart';
+import 'package:vbvs_app/common/util/FitTool.dart';
+import 'package:vbvs_app/common/util/MyUtils.dart';
+
+class BarData {
+ final int st; // 起始时间（毫秒）
+ final int et; // 结束时间（毫秒）
+ final double value; // 柱子高度
+ final int id;
+ final String name;
+ final Color color;
+
+ BarData({
+ required this.st,
+ required this.et,
+ required this.value,
+ required this.id,
+ required this.name,
+ required this.color,
+ });
+}
+
+class BarChartWidget extends StatelessWidget {
+ final List data;
+ final int startTime; // 毫秒时间戳
+ final int endTime; // 毫秒时间戳
+ final double maxYValue; // Y轴最大值
+ final int yStepCount; // Y轴分段数
+
+ const BarChartWidget({
+ super.key,
+ required this.data,
+ required this.startTime,
+ required this.endTime,
+ required this.maxYValue,
+ this.yStepCount = 5,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ return CustomPaint(
+ size: Size(double.infinity, 500.rpx),
+ painter: BarChartPainter(
+ data,
+ startTime,
+ endTime,
+ maxYValue: maxYValue,
+ yStepCount: yStepCount,
+ ),
+ );
+ }
+}
+
+class BarChartPainter extends CustomPainter {
+ final List data;
+ final int startTime;
+ final int endTime;
+ final double maxYValue;
+ final int yStepCount;
+
+ final double topPadding = 0; // 控制顶部间距
+ final double bottomPadding = 0; // 控制底部间距
+ final double leftPadding = 30.rpx;
+ // final double labelHeight = 50.rpx;
+
+ BarChartPainter(
+ this.data,
+ this.startTime,
+ this.endTime, {
+ required this.maxYValue,
+ this.yStepCount = 5,
+ });
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ final chartWidth = size.width - leftPadding;
+ final chartHeight = size.height - topPadding - bottomPadding;
+ final totalDuration = endTime - startTime;
+
+ final textPainter = TextPainter(textDirection: ui.TextDirection.ltr);
+ final stepValue = maxYValue / yStepCount;
+
+ // 绘制 Y 轴刻度线和文字
+ for (int i = 0; i <= yStepCount; i++) {
+ final value = stepValue * i;
+ final y = topPadding + chartHeight - (value / maxYValue) * chartHeight;
+
+ // 横线
+ // canvas.drawLine(
+ // Offset(leftPadding, y),
+ // Offset(size.width, y),
+ // Paint()
+ // ..color = Colors.grey.withOpacity(0.3)
+ // ..strokeWidth = 0.5,
+ // );
+ final dashPaint = Paint()
+ ..color = Colors.grey.withOpacity(0.5)
+ ..strokeWidth = 0.5;
+
+ drawDashedLine(
+ canvas, Offset(leftPadding, y), Offset(size.width, y), dashPaint);
+
+ // Y轴刻度文字
+ textPainter.text = TextSpan(
+ text: value.toStringAsFixed(0),
+ style: TextStyle(
+ fontSize: 20.rpx,
+ color: themeController.currentColor.sc4,
+ ),
+ );
+ textPainter.layout();
+ textPainter.paint(
+ canvas,
+ Offset(
+ leftPadding - textPainter.width - 4, y - textPainter.height / 2));
+ }
+
+ // X轴时间刻度
+ final startDate = DateTime.fromMillisecondsSinceEpoch(startTime);
+ final endDate = DateTime.fromMillisecondsSinceEpoch(endTime);
+ final hourStep = const Duration(hours: 1);
+ final xPaint = Paint()..color = Colors.grey;
+
+ final xAxisY = topPadding + chartHeight;
+
+ // 绘制整点小时刻度
+ for (DateTime t = startDate; t.isBefore(endDate); t = t.add(hourStep)) {
+ final x = ((t.millisecondsSinceEpoch - startTime) / totalDuration) *
+ chartWidth +
+ leftPadding;
+
+ final timeLabel = (t == startDate || t == endDate)
+ ? DateFormat('HH:mm').format(t)
+ : DateFormat('h').format(t);
+
+ textPainter.text = TextSpan(
+ text: timeLabel,
+ style: TextStyle(
+ fontSize: AppConstants().smaller_text_fontSize,
+ color: themeController.currentColor.sc4,
+ ),
+ );
+ textPainter.layout();
+ textPainter.paint(canvas, Offset(x - textPainter.width / 2, xAxisY + 4));
+ }
+
+ // ✅ 强制绘制结束时间刻度（确保显示）
+ final endX =
+ ((endTime - startTime) / totalDuration) * chartWidth + leftPadding;
+ final endLabel = DateFormat('HH:mm').format(endDate);
+ textPainter.text = TextSpan(
+ text: endLabel,
+ style: TextStyle(
+ fontSize: AppConstants().smaller_text_fontSize,
+ color: themeController.currentColor.sc4,
+ ),
+ );
+ textPainter.layout();
+ textPainter.paint(canvas, Offset(endX - textPainter.width / 2, xAxisY + 4));
+
+ // 绘制柱子
+ for (final d in data) {
+ final left =
+ ((d.st - startTime) / totalDuration) * chartWidth + leftPadding;
+ final right =
+ ((d.et - startTime) / totalDuration) * chartWidth + leftPadding;
+ final barHeight = (d.value / maxYValue) * chartHeight;
+ final top = topPadding + chartHeight - barHeight;
+
+ final barPaint = Paint()..color = d.color;
+
+ canvas.drawRect(
+ Rect.fromLTRB(left, top, right, topPadding + chartHeight), barPaint);
+ }
+ }
+
+ @override
+ bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+
+ void drawDashedLine(Canvas canvas, Offset start, Offset end, Paint paint,
+ {double dashWidth = 5, double dashSpace = 3}) {
+ double totalLength = (end.dx - start.dx).abs();
+ double dashCount = (totalLength / (dashWidth + dashSpace)).floorToDouble();
+
+ double dx = start.dx;
+ final dy = start.dy;
+
+ for (int i = 0; i < dashCount; i++) {
+ final from = Offset(dx, dy);
+ final to = Offset(dx + dashWidth, dy);
+ canvas.drawLine(from, to, paint);
+ dx += dashWidth + dashSpace;
+ }
+ }
+}
diff --git a/lib/pages/sleep_report/chart/SnoreWaveform.dart b/lib/pages/sleep_report/chart/SnoreWaveform.dart
index 8320ea6..999e08f 100644
--- a/lib/pages/sleep_report/chart/SnoreWaveform.dart
+++ b/lib/pages/sleep_report/chart/SnoreWaveform.dart
@@ -164,6 +164,114 @@ class SnoreWaveform extends StatelessWidget {
}
}
+// class SnoreWaveformPainter extends CustomPainter {
+// final List snoreValues;
+// final int startTime;
+// final int endTime;
+
+// SnoreWaveformPainter({
+// required this.snoreValues,
+// required this.startTime,
+// required this.endTime,
+// });
+
+// @override
+// void paint(Canvas canvas, Size size) {
+// final double width = size.width;
+// final double height = size.height;
+// final double centerY = height / 2;
+// final double totalDuration = (endTime - startTime).toDouble();
+// final double pixelPerMs = width / totalDuration;
+
+// final Paint wavePaint = Paint()
+// ..color = stringToColor("#8E7DEF")
+// ..strokeWidth = 1.5
+// ..style = PaintingStyle.stroke;
+
+// final Path upperPath = Path();
+// final Path lowerPath = Path();
+// const double scaleY = 0.5; //波形图比例
+
+// for (int i = 0; i < snoreValues.length; i++) {
+// final timestamp = snoreValues[i]["st"];
+// final value = snoreValues[i]["value"]?.toDouble() ?? 0;
+
+// final x = (timestamp - startTime) * pixelPerMs;
+// final y = centerY - value * scaleY;
+// final yMirror = centerY + value * scaleY;
+
+// if (i == 0) {
+// upperPath.moveTo(x, y);
+// lowerPath.moveTo(x, yMirror);
+// } else {
+// upperPath.lineTo(x, y);
+// lowerPath.lineTo(x, yMirror);
+// }
+// }
+
+// canvas.drawPath(upperPath, wavePaint);
+// canvas.drawPath(lowerPath, wavePaint);
+
+// final Paint axisPaint = Paint()
+// ..color = Colors.grey
+// ..strokeWidth = 0.5;
+
+// // 画中心线
+// canvas.drawLine(Offset(0, centerY), Offset(width, centerY), axisPaint);
+
+// // 时间刻度绘制
+// final textPainter = TextPainter(
+// textAlign: TextAlign.center,
+// textDirection: ui.TextDirection.ltr,
+// );
+
+// final int hourMs = 60 * 60 * 1000;
+
+// // 循环绘制整点小时标签（不包含终点）
+// for (int t = startTime; t < endTime; t += hourMs) {
+// double x = (t - startTime) * pixelPerMs;
+
+// DateTime dt = DateTime.fromMillisecondsSinceEpoch(t);
+// String label;
+// if (t == startTime) {
+// label = DateFormat('HH:mm').format(dt); // 起点显示 HH:mm
+// } else {
+// label = DateFormat('h').format(dt); // 中间显示小时，不带前导0
+// }
+
+// textPainter.text = TextSpan(
+// text: label,
+// style: TextStyle(fontSize: 10, color: Colors.grey),
+// );
+// textPainter.layout();
+// textPainter.paint(
+// canvas,
+// Offset(x - textPainter.width / 2, height + 20.rpx),
+// );
+// }
+
+// // 单独绘制终点时间标签，确保显示具体时分
+// {
+// double x = (endTime - startTime) * pixelPerMs;
+// DateTime dt = DateTime.fromMillisecondsSinceEpoch(endTime);
+// String label = DateFormat('HH:mm').format(dt);
+
+// textPainter.text = TextSpan(
+// text: label,
+// style: TextStyle(fontSize: 10, color: Colors.grey),
+// );
+// textPainter.layout();
+// textPainter.paint(
+// canvas,
+// Offset(x - textPainter.width / 2, height + 20.rpx),
+// );
+// }
+// }
+
+// @override
+// bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+// }
+
class SnoreWaveformPainter extends CustomPainter {
final List snoreValues;
final int startTime;
@@ -184,13 +292,22 @@ class SnoreWaveformPainter extends CustomPainter {
final double pixelPerMs = width / totalDuration;
final Paint wavePaint = Paint()
- ..color = stringToColor("#8E7DEF")
+ ..color = stringToColor("#8E7DEF").withOpacity(0.8)
..strokeWidth = 1.5
..style = PaintingStyle.stroke;
final Path upperPath = Path();
final Path lowerPath = Path();
- const double scaleY = 0.5; //波形图比例
+
+ // ✅ 获取最大值用于自适应比例
+ double maxValue = snoreValues.fold(0, (prev, e) {
+ final value = e["value"]?.toDouble() ?? 0;
+ return value > prev ? value : prev;
+ });
+
+ // ✅ 自适应缩放比例，限制波形最大高度为 height * 0.45
+ final double maxWaveHeight = height * 1;
+ final double scaleY = maxValue > 0 ? (maxWaveHeight / maxValue) : 1;
for (int i = 0; i < snoreValues.length; i++) {
final timestamp = snoreValues[i]["st"];
@@ -212,32 +329,26 @@ class SnoreWaveformPainter extends CustomPainter {
canvas.drawPath(upperPath, wavePaint);
canvas.drawPath(lowerPath, wavePaint);
+ // ✅ 最后绘制中心线，防止被覆盖
final Paint axisPaint = Paint()
- ..color = Colors.grey
+ ..color = Colors.grey.withOpacity(0.6)
..strokeWidth = 0.5;
-
- // 画中心线
canvas.drawLine(Offset(0, centerY), Offset(width, centerY), axisPaint);
- // 时间刻度绘制
+ // ✅ 时间刻度绘制
final textPainter = TextPainter(
textAlign: TextAlign.center,
textDirection: ui.TextDirection.ltr,
);
final int hourMs = 60 * 60 * 1000;
-
- // 循环绘制整点小时标签（不包含终点）
for (int t = startTime; t < endTime; t += hourMs) {
double x = (t - startTime) * pixelPerMs;
DateTime dt = DateTime.fromMillisecondsSinceEpoch(t);
- String label;
- if (t == startTime) {
- label = DateFormat('HH:mm').format(dt); // 起点显示 HH:mm
- } else {
- label = DateFormat('h').format(dt); // 中间显示小时，不带前导0
- }
+ String label = t == startTime
+ ? DateFormat('HH:mm').format(dt)
+ : DateFormat('h').format(dt); // 12小时制
textPainter.text = TextSpan(
text: label,
@@ -246,11 +357,11 @@ class SnoreWaveformPainter extends CustomPainter {
textPainter.layout();
textPainter.paint(
canvas,
- Offset(x - textPainter.width / 2, height + 20.rpx),
+ Offset(x - textPainter.width / 2, height + 2), // 标签显示在底部
);
}
- // 单独绘制终点时间标签，确保显示具体时分
+ // ✅ 画终点时间
{
double x = (endTime - startTime) * pixelPerMs;
DateTime dt = DateTime.fromMillisecondsSinceEpoch(endTime);
@@ -263,7 +374,7 @@ class SnoreWaveformPainter extends CustomPainter {
textPainter.layout();
textPainter.paint(
canvas,
- Offset(x - textPainter.width / 2, height + 20.rpx),
+ Offset(x - textPainter.width / 2, height + 2),
);
}
}
diff --git a/lib/pages/sleep_report/component/AIAdviceWidget.dart b/lib/pages/sleep_report/component/AIAdviceWidget.dart
index 1e5d83d..4aef03d 100644
--- a/lib/pages/sleep_report/component/AIAdviceWidget.dart
+++ b/lib/pages/sleep_report/component/AIAdviceWidget.dart
@@ -7,6 +7,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
import 'package:vbvs_app/pages/sleep_report/chart/AdviceComponnetWidget.dart';
+import 'package:EasyDartModule/EasyDartModule.dart' as es;
class AIAdviceWidget extends StatefulWidget {
var sleepReport;
@@ -34,88 +35,94 @@ class _AIAdviceWidgetState extends State {
@override
Widget build(BuildContext context) {
- if (widget.sleepReport == null ||
- widget.sleepReport['sugges'] == null ||
- widget.sleepReport['sugges'].isEmpty) {
- return Container();
- }
- List advices = widget.sleepReport['sugges'];
+ try {
+ if (widget.sleepReport == null ||
+ widget.sleepReport['sugges'] == null ||
+ widget.sleepReport['sugges'].isEmpty) {
+ return Container();
+ }
+ List advices = widget.sleepReport['sugges'];
- return Container(
- width: double.infinity,
- decoration: BoxDecoration(
- color: themeController.currentColor.sc5,
- borderRadius: BorderRadius.circular(
- AppConstants().normal_container_radius), // 你可以按需调整圆角半径
- ),
- child: Padding(
- padding: EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 45.rpx),
- child: Column(
- mainAxisSize: MainAxisSize.max,
- children: [
- Container(
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- "AI分析".tr,
- style: TextStyle(
- color: themeController.currentColor.sc3,
- fontSize: AppConstants().title_text_fontSize),
- ),
- ClickableContainer(
- backgroundColor: Colors.transparent,
- highlightColor: Colors.white, // 或设置为你需要的水波纹颜色
- padding: EdgeInsetsDirectional.fromSTEB(
- 14.rpx, 0.rpx, 14.rpx, 0), //
- borderRadius: 0.rpx, // 圆形点击区域
- onTap: () {
- showTipDialog(
- context,
- Container(
- child: Text(
- "AI分析介绍".tr,
- style: TextStyle(
- fontSize: 26.rpx,
- color: themeController.currentColor.sc3,
+ return Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: themeController.currentColor.sc5,
+ borderRadius: BorderRadius.circular(
+ AppConstants().normal_container_radius), // 你可以按需调整圆角半径
+ ),
+ child: Padding(
+ padding:
+ EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 45.rpx),
+ child: Column(
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Container(
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(
+ "AI分析".tr,
+ style: TextStyle(
+ color: themeController.currentColor.sc3,
+ fontSize: AppConstants().title_text_fontSize),
+ ),
+ ClickableContainer(
+ backgroundColor: Colors.transparent,
+ highlightColor: Colors.white, // 或设置为你需要的水波纹颜色
+ padding: EdgeInsetsDirectional.fromSTEB(
+ 14.rpx, 0.rpx, 14.rpx, 0), //
+ borderRadius: 0.rpx, // 圆形点击区域
+ onTap: () {
+ showTipDialog(
+ context,
+ Container(
+ child: Text(
+ "AI分析介绍".tr,
+ style: TextStyle(
+ fontSize: 26.rpx,
+ color: themeController.currentColor.sc3,
+ ),
),
),
+ );
+ },
+ child: Container(
+ padding: EdgeInsetsDirectional.fromSTEB(
+ 0, 0.rpx, 0.rpx, 0), // 外部 padding 移到内部
+ width: 28.rpx,
+ height: 28.rpx,
+ child: SvgPicture.asset(
+ 'assets/img/icon/explain.svg',
+ fit: BoxFit.cover,
+ color: themeController.currentColor.sc4,
),
- );
- },
- child: Container(
- padding: EdgeInsetsDirectional.fromSTEB(
- 0, 0.rpx, 0.rpx, 0), // 外部 padding 移到内部
- width: 28.rpx,
- height: 28.rpx,
- child: SvgPicture.asset(
- 'assets/img/icon/explain.svg',
- fit: BoxFit.cover,
- color: themeController.currentColor.sc4,
),
),
- ),
- ],
+ ],
+ ),
),
- ),
- SizedBox(
- height: 31.rpx,
- ),
- Padding(
- padding:
- EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 30.rpx, 0.rpx),
- child: Column(
- children: advices.map((advice) {
- return AdviceComponnetWidget(
- title: advice["q"],
- description: advice["s"],
- ).paddingOnly(bottom: 0.rpx); // 在每个组件下方添加间隔
- }).toList(),
+ SizedBox(
+ height: 31.rpx,
),
- )
- ],
+ Padding(
+ padding:
+ EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 30.rpx, 0.rpx),
+ child: Column(
+ children: advices.map((advice) {
+ return AdviceComponnetWidget(
+ title: advice["q"],
+ description: advice["s"],
+ ).paddingOnly(bottom: 0.rpx); // 在每个组件下方添加间隔
+ }).toList(),
+ ),
+ )
+ ],
+ ),
),
- ),
- );
+ );
+ } catch (e) {
+ es.EasyDartModule.logger.error("打鼾监测绘制异常${e}");
+ return Container();
+ }
}
}
diff --git a/lib/pages/sleep_report/component/BreathPauseWidget.dart b/lib/pages/sleep_report/component/BreathPauseWidget.dart
index 6231075..03a6b9d 100644
--- a/lib/pages/sleep_report/component/BreathPauseWidget.dart
+++ b/lib/pages/sleep_report/component/BreathPauseWidget.dart
@@ -7,6 +7,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
import 'package:vbvs_app/pages/sleep_report/chart/DotBarChart.dart';
+import 'package:EasyDartModule/EasyDartModule.dart' as es;
class BreathPauseWidget extends StatefulWidget {
var sleepReport;
@@ -34,107 +35,100 @@ class _BreathPauseWidgetState extends State {
@override
Widget build(BuildContext context) {
- if (widget.sleepReport == null ||
- widget.sleepReport['asp'] == null ||
- widget.sleepReport['asp'].isEmpty) {
- return Container();
- }
+ try {
+ if (widget.sleepReport == null ||
+ widget.sleepReport['asp'] == null ||
+ widget.sleepReport['asp'].isEmpty) {
+ return Container();
+ }
- // List data = widget.sleepReport['asp'];
- // var showLabel = [
- // {"time": 1744547251000, "times": 25},
- // {"time": 1744550851000, "times": 27},
- // {"time": 1744554451000, "times": 40},
- // {"time": 1744558051000, "times": 28},
- // {"time": 1744561651000, "times": 15},
- // {"time": 1744565251000, "times": 48},
- // {"time": 1744568851000, "times": 25},
- // {"time": 1744572451000, "times": 17},
- // {"time": 1744583251000, "times": 35},
- // {"time": 1744586851000, "times": 40},
- // ];
- List data = widget.sleepReport['asp'];
- var showLabel = convertAspData(data);
- var threshold = 30;
- var startTime = widget.sleepReport['startTime'];
- var endTime = widget.sleepReport['endTime'];
- return Container(
- width: double.infinity,
- decoration: BoxDecoration(
- color: themeController.currentColor.sc5,
- borderRadius: BorderRadius.circular(
- AppConstants().normal_container_radius), // 你可以按需调整圆角半径
- ),
- child: Padding(
- padding: EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 0.rpx),
- child: Column(
- mainAxisSize: MainAxisSize.max,
- children: [
- Container(
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- "呼吸暂停监测".tr,
- style: TextStyle(
- color: themeController.currentColor.sc3,
- fontSize: AppConstants().title_text_fontSize),
- ),
- ClickableContainer(
- backgroundColor: Colors.transparent,
- highlightColor: Colors.white, // 或设置为你需要的水波纹颜色
- padding: EdgeInsetsDirectional.fromSTEB(
- 14.rpx, 0.rpx, 14.rpx, 0), //
- borderRadius: 0.rpx, // 圆形点击区域
- onTap: () {
- showTipDialog(
- context,
- Container(
- child: Text(
- "呼吸暂停监测介绍。",
- style: TextStyle(
- fontSize: 26.rpx,
- color: themeController.currentColor.sc3,
+ List data = widget.sleepReport['asp'];
+ var showLabel = convertAspData(data);
+ var threshold = 30;
+ var startTime = widget.sleepReport['startTime'];
+ var endTime = widget.sleepReport['endTime'];
+ return Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: themeController.currentColor.sc5,
+ borderRadius: BorderRadius.circular(
+ AppConstants().normal_container_radius), // 你可以按需调整圆角半径
+ ),
+ child: Padding(
+ padding:
+ EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 0.rpx),
+ child: Column(
+ mainAxisSize: MainAxisSize.max,
+ children: [
+ Container(
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(
+ "呼吸暂停监测".tr,
+ style: TextStyle(
+ color: themeController.currentColor.sc3,
+ fontSize: AppConstants().title_text_fontSize),
+ ),
+ ClickableContainer(
+ backgroundColor: Colors.transparent,
+ highlightColor: Colors.white, // 或设置为你需要的水波纹颜色
+ padding: EdgeInsetsDirectional.fromSTEB(
+ 14.rpx, 0.rpx, 14.rpx, 0), //
+ borderRadius: 0.rpx, // 圆形点击区域
+ onTap: () {
+ showTipDialog(
+ context,
+ Container(
+ child: Text(
+ "呼吸暂停监测介绍。",
+ style: TextStyle(
+ fontSize: 26.rpx,
+ color: themeController.currentColor.sc3,
+ ),
),
),
+ );
+ },
+ child: Container(
+ padding: EdgeInsetsDirectional.fromSTEB(
+ 0, 0.rpx, 0.rpx, 0), // 外部 padding 移到内部
+ width: 28.rpx,
+ height: 28.rpx,
+ child: SvgPicture.asset(
+ 'assets/img/icon/explain.svg',
+ fit: BoxFit.cover,
+ color: themeController.currentColor.sc4,
),
- );
- },
- child: Container(
- padding: EdgeInsetsDirectional.fromSTEB(
- 0, 0.rpx, 0.rpx, 0), // 外部 padding 移到内部
- width: 28.rpx,
- height: 28.rpx,
- child: SvgPicture.asset(
- 'assets/img/icon/explain.svg',
- fit: BoxFit.cover,
- color: themeController.currentColor.sc4,
),
),
- ),
- ],
+ ],
+ ),
),
- ),
- SizedBox(
- height: 32.rpx,
- ),
- Padding(
- padding:
- EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 0.rpx, 0.rpx),
- child: DotBarChart(
- showLabel: showLabel,
- threshold: threshold,
- startTime: startTime,
- endTime: endTime,
+ SizedBox(
+ height: 32.rpx,
),
- ),
- SizedBox(
- height: 52.rpx,
- ),
- ],
+ Padding(
+ padding:
+ EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 0.rpx, 0.rpx),
+ child: DotBarChart(
+ showLabel: showLabel,
+ threshold: threshold,
+ startTime: startTime,
+ endTime: endTime,
+ ),
+ ),
+ SizedBox(
+ height: 52.rpx,
+ ),
+ ],
+ ),
),
- ),
- );
+ );
+ } catch (e) {
+ es.EasyDartModule.logger.error("打鼾监测绘制异常${e}");
+ return Container();
+ }
}
List> convertAspData(List data) {
diff --git a/lib/pages/sleep_report/component/BreatheCard.dart b/lib/pages/sleep_report/component/BreatheCard.dart
index cdd6144..5b640f2 100644
--- a/lib/pages/sleep_report/component/BreatheCard.dart
+++ b/lib/pages/sleep_report/component/BreatheCard.dart
@@ -3,68 +3,137 @@ 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/component/home_page/SleepDataModuleWidget.dart';
+import 'package:EasyDartModule/EasyDartModule.dart' as es;
class BreatheCard extends StatefulWidget {
var sleepReport;
- BreatheCard({super.key, required this.sleepReport});
+ final int? highlightItem;
+ BreatheCard({super.key, required this.sleepReport, this.highlightItem});
@override
State createState() => _BreatheCardState();
}
-class _BreatheCardState extends State {
- @override
- void setState(VoidCallback callback) {
- super.setState(callback);
- }
+class _BreatheCardState extends State
+ with TickerProviderStateMixin {
+ final GlobalKey _highlightKey = GlobalKey();
+ AnimationController? _animationController;
+ bool _shouldAnimate = false;
+ int? _highlightedId;
+ int _flashCount = 0;
@override
void initState() {
super.initState();
+ if (widget.highlightItem != null) {
+ _highlightedId = widget.highlightItem;
+ _shouldAnimate = true;
+ _initAnimation();
+ }
+
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (widget.highlightItem != null &&
+ _highlightKey.currentContext != null) {
+ Scrollable.ensureVisible(
+ _highlightKey.currentContext!,
+ duration: Duration(milliseconds: 500),
+ curve: Curves.easeInOut,
+ alignment: 0.3,
+ );
+ }
+ });
+ }
+
+ void _initAnimation() {
+ _animationController = AnimationController(
+ vsync: this,
+ duration: Duration(milliseconds: 300),
+ )..addStatusListener((status) {
+ if (status == AnimationStatus.completed) {
+ _animationController!.reverse();
+ } else if (status == AnimationStatus.dismissed) {
+ _flashCount++;
+ if (_flashCount >= 3) {
+ _animationController!.dispose();
+ setState(() {
+ _shouldAnimate = false;
+ _highlightedId = null;
+ });
+ } else {
+ _animationController!.forward();
+ }
+ }
+ });
+
+ _animationController!.forward();
}
@override
void dispose() {
+ _animationController?.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
- if (widget.sleepReport == null ||
- widget.sleepReport is! Map ||
- widget.sleepReport.isEmpty) {
+ try {
+ if (widget.sleepReport == null ||
+ widget.sleepReport is! Map ||
+ widget.sleepReport.isEmpty) {
+ return Container();
+ }
+
+ List data = widget.sleepReport['brs'] ?? [];
+
+ return Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: themeController.currentColor.sc5,
+ borderRadius:
+ BorderRadius.circular(AppConstants().normal_container_radius),
+ ),
+ child: Padding(
+ padding:
+ EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 45.rpx),
+ child: Wrap(
+ spacing: 23.rpx,
+ runSpacing: 25.rpx,
+ children: List.generate(data.length, (index) {
+ final item = data[index];
+ item['showTip'] = true;
+ final bool isHighlighted =
+ _shouldAnimate && item['id'] == _highlightedId;
+
+ return SizedBox(
+ width: (MediaQuery.of(context).size.width - 160.rpx) / 3,
+ child: AnimatedBuilder(
+ animation: _animationController ?? AlwaysStoppedAnimation(0),
+ builder: (context, child) {
+ return Container(
+ key: isHighlighted ? _highlightKey : null,
+ decoration: isHighlighted
+ ? BoxDecoration(
+ border: Border.all(
+ color: themeController.currentColor.sc2
+ .withOpacity(
+ _animationController?.value ?? 0),
+ width: 1.rpx,
+ ),
+ borderRadius: BorderRadius.circular(8),
+ )
+ : null,
+ child: SleepDataModuleWidget(data: item),
+ );
+ },
+ ),
+ );
+ }),
+ ),
+ ),
+ );
+ } catch (e) {
+ es.EasyDartModule.logger.error("呼吸监测绘制异常${e}");
return Container();
}
-
- List data = widget.sleepReport['brs'] ?? [];
-
- return Container(
- width: double.infinity,
- decoration: BoxDecoration(
- color: themeController.currentColor.sc5,
- borderRadius:
- BorderRadius.circular(AppConstants().normal_container_radius),
- ),
- child: Padding(
- padding: EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 45.rpx),
- child: Wrap(
- spacing: 23.rpx, // 横向间距（左右间距如需加可设置）
- runSpacing: 25.rpx, // 每行之间的垂直间距
- children: List.generate(data.length, (index) {
- final item = data[index];
- item['showTip'] = true;
- return SizedBox(
- width: (MediaQuery.of(context).size.width - 160.rpx) / 3,
- child: SleepDataModuleWidget(data: item),
- // child: Container(
- // width: 20,
- // height: 20,
- // color: Colors.red,
- // ),
- );
- }),
- ),
- ),
- );
}
}
diff --git a/lib/pages/sleep_report/component/BreathePauseNewWidget.dart b/lib/pages/sleep_report/component/BreathePauseNewWidget.dart
index abc8f07..6c3d597 100644
--- a/lib/pages/sleep_report/component/BreathePauseNewWidget.dart
+++ b/lib/pages/sleep_report/component/BreathePauseNewWidget.dart
@@ -7,6 +7,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
import 'package:vbvs_app/pages/sleep_report/chart/LineChartByRange.dart';
+import 'package:EasyDartModule/EasyDartModule.dart' as es;
class BreathePauseNewWidget extends StatefulWidget {
var sleepReport;
@@ -34,102 +35,127 @@ class _SnoreViewWidgetWidgetState extends State {
@override
Widget build(BuildContext context) {
- if (widget.sleepReport == null ||
- widget.sleepReport is! Map ||
- widget.sleepReport.isEmpty) {
- return Container();
- }
+ try {
+ if (widget.sleepReport == null ||
+ widget.sleepReport is! Map ||
+ widget.sleepReport.isEmpty) {
+ return Container();
+ }
- List> data =
- (widget.sleepReport['asp'] as List).cast>();
- List> showLabel = convertToShowLabel(data);
- var startTime = widget.sleepReport['startTime'];
- var endTime = widget.sleepReport['endTime'];
- return Container(
- width: double.infinity,
- decoration: BoxDecoration(
- color: themeController.currentColor.sc5,
- borderRadius: BorderRadius.circular(
- AppConstants().normal_container_radius), // 你可以按需调整圆角半径
- ),
- child: Padding(
- padding: EdgeInsetsDirectional.fromSTEB(26.rpx, 29.rpx, 26.rpx, 0.rpx),
- child: Column(
- mainAxisSize: MainAxisSize.max,
- children: [
- Container(
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- "呼吸暂停监测".tr,
- style: TextStyle(
- color: themeController.currentColor.sc3,
- fontSize: AppConstants().title_text_fontSize),
- ),
- ClickableContainer(
- backgroundColor: Colors.transparent,
- highlightColor: Colors.white, // 或设置为你需要的水波纹颜色
- padding: EdgeInsetsDirectional.fromSTEB(
- 14.rpx, 0.rpx, 14.rpx, 0), //
- borderRadius: 0.rpx, // 圆形点击区域
- onTap: () {
- showTipDialog(
- context,
- Container(
- child: Text(
- "呼吸暂停监测介绍。",
- style: TextStyle(
- fontSize: 26.rpx,
- color: themeController.currentColor.sc3,
+ List standard = widget.sleepReport['brs'] ?? [];
+ final Map? result = standard.cast