diff --git a/assets/file.json b/assets/file.json index 8dfdc0f..50d05df 100644 --- a/assets/file.json +++ b/assets/file.json @@ -1,3 +1,3 @@ [ - "assets/miniapp/mhtControl_1.0.59.zip" + "assets/miniapp/mhtControl_1.0.60.zip" ] \ No newline at end of file diff --git a/assets/miniapp/mhtControl_1.0.59.zip b/assets/miniapp/mhtControl_1.0.60.zip similarity index 97% rename from assets/miniapp/mhtControl_1.0.59.zip rename to assets/miniapp/mhtControl_1.0.60.zip index 3e941fe..e5976d3 100644 Binary files a/assets/miniapp/mhtControl_1.0.59.zip and b/assets/miniapp/mhtControl_1.0.60.zip differ diff --git a/lib/common/color/appConstants.dart b/lib/common/color/appConstants.dart index 3f951be..e361664 100644 --- a/lib/common/color/appConstants.dart +++ b/lib/common/color/appConstants.dart @@ -46,6 +46,13 @@ class AppConstants { stringToColor("006FA3"), // 浅蓝 ]; + List thNormalButton = [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ]; + + + //系统参数 //运行打包APP模式 // int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 diff --git a/lib/controller/device/body_device_controller.dart b/lib/controller/device/body_device_controller.dart index 8cb8bd1..23d73a1 100644 --- a/lib/controller/device/body_device_controller.dart +++ b/lib/controller/device/body_device_controller.dart @@ -57,7 +57,7 @@ class BodyDeviceController extends GetControllerEx { String queryUrl = "${serviceAddress}${serviceName}${serviceApi}?bindNum=1"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } @@ -105,7 +105,7 @@ class BodyDeviceController extends GetControllerEx { String queryUrl = "${serviceAddress}${serviceName}${serviceApi}?bindType=${model.type}${key != null ? '&key=$key' : ''}"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } @@ -153,7 +153,7 @@ class BodyDeviceController extends GetControllerEx { String serviceApi = ServiceConstant.device_bind; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } @@ -295,7 +295,7 @@ class BodyDeviceController extends GetControllerEx { String serviceApi = ServiceConstant.device_show; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } diff --git a/lib/controller/device/device_share_list_controller.dart b/lib/controller/device/device_share_list_controller.dart index 0ba40eb..7533c5e 100644 --- a/lib/controller/device/device_share_list_controller.dart +++ b/lib/controller/device/device_share_list_controller.dart @@ -55,7 +55,7 @@ class DeviceShareListController extends GetControllerEx { String queryUrl = "${serviceAddress}${serviceName}${serviceApi}" "${key != null ? '?key=$key&' : '?'}mac=$mac"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } @@ -105,7 +105,7 @@ class DeviceShareListController extends GetControllerEx { String serviceApi = ServiceConstant.share_deleted; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; String? language = ""; - if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (AppConstants().ent_type == APPPackageType.MHT.code) { if (mhLanguageController.selectLanguage != null) { language = mhLanguageController.selectLanguage.value!.language_code; } diff --git a/lib/main.dart b/lib/main.dart index c16418c..5847263 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -87,6 +87,7 @@ import 'controller/user_info_controller.dart'; import 'routers/routers.dart'; Future main() async { + final ThemeController themeController = Get.put(ThemeController()); WidgetsFlutterBinding.ensureInitialized(); final Locale? deviceLocale = Get.deviceLocale; @@ -569,7 +570,6 @@ Future dealBindProcess() async { class MyApp extends StatelessWidget { MyApp({super.key}); - final ThemeController themeController = Get.put(ThemeController()); Widget buildmht(BuildContext context, BoxConstraints cons) { return GetMaterialApp( diff --git a/lib/pages/device_bind/device_type.dart b/lib/pages/device_bind/device_type.dart index dccd9eb..0be37fe 100644 --- a/lib/pages/device_bind/device_type.dart +++ b/lib/pages/device_bind/device_type.dart @@ -384,14 +384,17 @@ class _EPageState extends State { Widget _buildDeviceCard(BuildContext context, {required String title, required String imageUrl, required double type}) { + if (type != 1) { + return Container(); + } return CustomCard( borderRadius: 20.rpx, // 圆角大小 onTap: () { if (type != null) { if (type == 1) { Get.toNamed("/blueteethDevice"); - }else{ - TopSlideNotification.show( + } else { + TopSlideNotification.show( context, text: "待开发.提示".tr, textColor: themeController.currentColor.sc2, diff --git a/lib/pages/device_bind/device_type_list.dart b/lib/pages/device_bind/device_type_list.dart index 9cbf81b..7fa3c41 100644 --- a/lib/pages/device_bind/device_type_list.dart +++ b/lib/pages/device_bind/device_type_list.dart @@ -135,6 +135,9 @@ class _DeviceTypeListPageState extends State { Widget _buildDeviceCard(BuildContext context, {required String title, required String imageUrl, required double type}) { + if (type != 1) { + return Container(); + } return CustomCard( borderRadius: 20.rpx, // 圆角大小 onTap: () { diff --git a/lib/pages/login/other_login.dart b/lib/pages/login/other_login.dart index 519f99b..3e73901 100644 --- a/lib/pages/login/other_login.dart +++ b/lib/pages/login/other_login.dart @@ -133,6 +133,31 @@ class _OtherLoginPageState extends State { child: Scaffold( resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, + appBar: AppBar( + // backgroundColor: themeController.currentColor.sc17, + backgroundColor: Colors.transparent, + automaticallyImplyLeading: false, + iconTheme: IconThemeData(color: themeController.currentColor.sc3), + titleSpacing: 0.rpx, + // leading: returnIconButtom, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + /// 左边返回按钮 + Positioned( + left: 0.rpx, + child: returnIconButtom, + ), + ], + ), + ), + + actions: [], + centerTitle: false, + ), body: SafeArea( top: true, child: Padding( @@ -141,29 +166,30 @@ class _OtherLoginPageState extends State { mainAxisSize: MainAxisSize.max, crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: 66.rpx, - ), - ClickableContainer( - backgroundColor: Colors.transparent, // 容器背景色 - highlightColor: - themeController.currentColor.sc21, // 点击时的背景色 - padding: EdgeInsets.zero, // 这里去掉外部的 padding，避免影响点击范围 - onTap: () { - Get.back(); - }, - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.rpx, 10.rpx, 16.rpx, 10.rpx), - // child: SvgPicture.asset( - // 'assets/img/icon/arrow_left.svg', - // width: 25.rpx, - // height: 25.rpx, // 如果 SVG 中没有固定颜色，使用 color 设置 - // color: themeController.currentColor.sc3, - // ), - child: returnIconButtomNew(), - ), - ), + // SizedBox( + // height: 66.rpx, + // ), + // ClickableContainer( + // backgroundColor: Colors.transparent, // 容器背景色 + // highlightColor: + // themeController.currentColor.sc21, // 点击时的背景色 + // padding: EdgeInsets.zero, // 这里去掉外部的 padding，避免影响点击范围 + // onTap: () { + // Get.back(); + // }, + // child: Padding( + // padding: EdgeInsetsDirectional.fromSTEB( + // 0.rpx, 10.rpx, 16.rpx, 10.rpx), + // // child: SvgPicture.asset( + // // 'assets/img/icon/arrow_left.svg', + // // width: 25.rpx, + // // height: 25.rpx, // 如果 SVG 中没有固定颜色，使用 color 设置 + // // color: themeController.currentColor.sc3, + // // ), + // child: returnIconButtomNew(), + // ), + // ), + Expanded( child: SingleChildScrollView( child: Column( diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart index 9eb62a0..838973d 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -63,7 +63,7 @@ class WebviewTestController extends GetControllerEx { web.jsbridge!.bind((bridge) { var minible = Minibleapp(bridge: bridge); // ef.kvroot.devicelist.listen((x) {}); - bridge.sdk.updateDeviceRoute((args) async { + bridge.sdk.updateDeviceRoute((args) async { ef.log('updateDeviceRoute: $args'); selectDevice['blueToothStatus'] = bluetooth; Get.toNamed("${args[0]}", arguments: selectDevice); diff --git a/lib/pages/sleep_report/chart/HorizontalBarChart.dart b/lib/pages/sleep_report/chart/HorizontalBarChart.dart index f47fa0d..c5506e3 100644 --- a/lib/pages/sleep_report/chart/HorizontalBarChart.dart +++ b/lib/pages/sleep_report/chart/HorizontalBarChart.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.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'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; class HorizontalBarChart extends StatelessWidget { @@ -146,17 +148,38 @@ class LabelWithSvg extends StatelessWidget { borderRadius: 0.rpx, onTap: () { // Get.toNamed("/deviceShareListPage", arguments: explain); - showTipDialog( - context, - Container( - child: Text( - explain, - style: TextStyle(fontSize: 26.rpx, color: Colors.black), + + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + explain, + style: TextStyle(fontSize: 26.rpx, color: Colors.black), + ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [Color(0XFF1592AA), Color(0xFF0C83A7), Color(0xFF006FA3)], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + explain, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: SizedBox( width: 17.rpx, diff --git a/lib/pages/sleep_report/component/BreathePauseNewWidget.dart b/lib/pages/sleep_report/component/BreathePauseNewWidget.dart index bc6c0a5..282ada8 100644 --- a/lib/pages/sleep_report/component/BreathePauseNewWidget.dart +++ b/lib/pages/sleep_report/component/BreathePauseNewWidget.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.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; @@ -90,28 +91,45 @@ class _SnoreViewWidgetWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx), // + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "呼吸暂停监测介绍。", - "呼吸暂停监测是指用户在睡眠过程中产生的呼吸暂停的图表说明。".tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "呼吸暂停监测介绍。", + "呼吸暂停监测是指用户在睡眠过程中产生的呼吸暂停的图表说明。".tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "呼吸暂停监测是指用户在睡眠过程中产生的呼吸暂停的图表说明。".tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/BreatheStandardWidget.dart b/lib/pages/sleep_report/component/BreatheStandardWidget.dart index 0129ae9..978ef58 100644 --- a/lib/pages/sleep_report/component/BreatheStandardWidget.dart +++ b/lib/pages/sleep_report/component/BreatheStandardWidget.dart @@ -6,6 +6,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/TimeSeriesChart.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -132,29 +133,47 @@ class _BreatheStandardWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx), // + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "呼吸数据介绍".tr, - "呼吸数据是指用户在睡眠过程中呼吸的基本数据，是评估睡眠呼吸质量、筛查睡眠呼吸障碍的核心指标。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "呼吸数据介绍".tr, + "呼吸数据是指用户在睡眠过程中呼吸的基本数据，是评估睡眠呼吸质量、筛查睡眠呼吸障碍的核心指标。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "呼吸数据是指用户在睡眠过程中呼吸的基本数据，是评估睡眠呼吸质量、筛查睡眠呼吸障碍的核心指标。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/CompareSleepWidget.dart b/lib/pages/sleep_report/component/CompareSleepWidget.dart index 0cd6b83..75a6573 100644 --- a/lib/pages/sleep_report/component/CompareSleepWidget.dart +++ b/lib/pages/sleep_report/component/CompareSleepWidget.dart @@ -6,6 +6,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/SleepRadarChart.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -80,29 +81,47 @@ class _CompareSleepWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx),// + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "与昨日对比分析介绍".tr, - "基于时间维度的横向比较分析方法，通过将当前（今日）的数据、状态、行为等与前一日（昨日）的同类信息进行对照，识别差异、趋势或变化规律，查看用户短期时间序列的动态变化。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT) { + showTipDialog( + context, + Container( + child: Text( + // "与昨日对比分析介绍".tr, + "基于时间维度的横向比较分析方法，通过将当前（今日）的数据、状态、行为等与前一日（昨日）的同类信息进行对照，识别差异、趋势或变化规律，查看用户短期时间序列的动态变化。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "基于时间维度的横向比较分析方法，通过将当前（今日）的数据、状态、行为等与前一日（昨日）的同类信息进行对照，识别差异、趋势或变化规律，查看用户短期时间序列的动态变化。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/DiseasePercentsWidget.dart b/lib/pages/sleep_report/component/DiseasePercentsWidget.dart index b11c852..89d99ae 100644 --- a/lib/pages/sleep_report/component/DiseasePercentsWidget.dart +++ b/lib/pages/sleep_report/component/DiseasePercentsWidget.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/HorizontalBarChart.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -74,26 +75,45 @@ class _DiseasePercentsWidgetState extends State { borderRadius: 0.rpx, // 圆形点击区域 onTap: () { // 你的点击逻辑 - showTipDialog( - context, - Container( - child: Text( - // "慢性病风险指数介绍".tr, - "慢性病风险指数是通过整合个体的生理指标、生活方式等多维度数据，构建的量化评估模型，用于预测用户未来患慢性非传染性疾病（如高血压、糖尿病、冠心病、癌症等）的风险概率。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心理健康评估介绍".tr, + "慢性病风险指数是通过整合个体的生理指标、生活方式等多维度数据，构建的量化评估模型，用于预测用户未来患慢性非传染性疾病（如高血压、糖尿病、冠心病、癌症等）的风险概率。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "慢性病风险指数是通过整合个体的生理指标、生活方式等多维度数据，构建的量化评估模型，用于预测用户未来患慢性非传染性疾病（如高血压、糖尿病、冠心病、癌症等）的风险概率。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/HeartChangeWidget.dart b/lib/pages/sleep_report/component/HeartChangeWidget.dart index 3f3f3ba..141f941 100644 --- a/lib/pages/sleep_report/component/HeartChangeWidget.dart +++ b/lib/pages/sleep_report/component/HeartChangeWidget.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/DataShowWidget.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -75,26 +76,44 @@ class _HeartChangeWidgetState extends State { 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "心率变异性（HRV）介绍".tr, - "心率变异性（HRV）是指心脏每次跳动间隔时间的差异程度，反映自主神经系统（交感神经和副交感神经）对心脏的调节能力，是评估心血管健康和压力状态的重要指标。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心率变异性（HRV）介绍".tr, + "心率变异性（HRV）是指心脏每次跳动间隔时间的差异程度，反映自主神经系统（交感神经和副交感神经）对心脏的调节能力，是评估心血管健康和压力状态的重要指标。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "心率变异性（HRV）是指心脏每次跳动间隔时间的差异程度，反映自主神经系统（交感神经和副交感神经）对心脏的调节能力，是评估心血管健康和压力状态的重要指标。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( @@ -176,24 +195,44 @@ class _HeartChangeWidgetState extends State { borderRadius: 0.rpx, onTap: () { // Get.toNamed("/deviceShareListPage", arguments: explain); - showTipDialog( - context, - Container( - child: Text( - '${data['desc']}', - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == + APPPackageType.MHT) { + showTipDialog( + context, + Container( + child: Text( + '${data['desc']}', + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + '${data['desc']}', + style: TextStyle( + fontSize: 26.rpx, + color: themeController + .currentColor.sc3, + ), + ), + ), + backgroundColor: + themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: SizedBox( width: 17.rpx, diff --git a/lib/pages/sleep_report/component/HeartHealthWidget.dart b/lib/pages/sleep_report/component/HeartHealthWidget.dart index e0069c4..839489c 100644 --- a/lib/pages/sleep_report/component/HeartHealthWidget.dart +++ b/lib/pages/sleep_report/component/HeartHealthWidget.dart @@ -6,6 +6,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/FatigueCircleIndicator.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -75,7 +76,9 @@ class _HeartHealthWidgetState extends State { 14.rpx, 10.rpx, 14.rpx, 10.rpx),// borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( + + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( context, Container( child: Text( @@ -94,6 +97,22 @@ class _HeartHealthWidgetState extends State { Color(0xFF006FA3) ], ); + } else { + showTipDialog( + context, + Container( + child: Text( + "心率健康评估主要通过用户睡眠报告中的时间点、体征数据及HRV数据等信息，来判断其心理健康水平、疲劳程度。".tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/HeartPointWidget.dart b/lib/pages/sleep_report/component/HeartPointWidget.dart index 7a03a34..9398a86 100644 --- a/lib/pages/sleep_report/component/HeartPointWidget.dart +++ b/lib/pages/sleep_report/component/HeartPointWidget.dart @@ -8,6 +8,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/ScatterPlotChart.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -89,29 +90,47 @@ class _HeartPointWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx),// + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "心率散点图介绍".tr, - "心电散点图是用非线性的图形方法描记的连续心冲击图的RR间期图，因图形由散点组成，又称散点图。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心率散点图介绍".tr, + "心电散点图是用非线性的图形方法描记的连续心冲击图的RR间期图，因图形由散点组成，又称散点图。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "心电散点图是用非线性的图形方法描记的连续心冲击图的RR间期图，因图形由散点组成，又称散点图。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/HeartRateStandardWidget.dart b/lib/pages/sleep_report/component/HeartRateStandardWidget.dart index 0dbe37e..b1ab36a 100644 --- a/lib/pages/sleep_report/component/HeartRateStandardWidget.dart +++ b/lib/pages/sleep_report/component/HeartRateStandardWidget.dart @@ -6,6 +6,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/TimeSeriesChart.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -132,29 +133,47 @@ class _HeartRateStandardWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx),// + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "心率数据介绍".tr, - "心率数据是指用户在睡眠过程中基本心率数据，可初步判断睡眠中的心血管负荷及自主神经功能状态，为睡眠健康评估提供重要依据。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心率数据介绍".tr, + "心率数据是指用户在睡眠过程中基本心率数据，可初步判断睡眠中的心血管负荷及自主神经功能状态，为睡眠健康评估提供重要依据。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "心率数据是指用户在睡眠过程中基本心率数据，可初步判断睡眠中的心血管负荷及自主神经功能状态，为睡眠健康评估提供重要依据。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/SkinPercentWidget.dart b/lib/pages/sleep_report/component/SkinPercentWidget.dart index d71bed7..2ef122e 100644 --- a/lib/pages/sleep_report/component/SkinPercentWidget.dart +++ b/lib/pages/sleep_report/component/SkinPercentWidget.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/StatusBarWithIndicator.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -91,26 +92,44 @@ class _SkinPercentWidgetState extends State { 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "皮肤指数介绍".tr, - "皮肤指数通过用户睡眠过程中的体征数据，计算皮肤电反应，生成综合评估指标，用于睡眠中的生理应激状态或自主神经活动。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心理健康评估介绍".tr, + "皮肤指数通过用户睡眠过程中的体征数据，计算皮肤电反应，生成综合评估指标，用于睡眠中的生理应激状态或自主神经活动。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "皮肤指数通过用户睡眠过程中的体征数据，计算皮肤电反应，生成综合评估指标，用于睡眠中的生理应激状态或自主神经活动。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/SleepCard.dart b/lib/pages/sleep_report/component/SleepCard.dart index b9cd549..9f36a5d 100644 --- a/lib/pages/sleep_report/component/SleepCard.dart +++ b/lib/pages/sleep_report/component/SleepCard.dart @@ -4,6 +4,7 @@ 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; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/language/AppLanguage.dart'; class SleepCard extends StatefulWidget { @@ -87,7 +88,16 @@ class _SleepCardState extends State with TickerProviderStateMixin { widget.sleepReport.isEmpty) { return Container(); } - String lcode = mhLanguageController.selectLanguage.value!.language_code!; + String? language = ""; + if (AppConstants().ent_type == APPPackageType.MHT.code) { + if (mhLanguageController.selectLanguage != null) { + language = mhLanguageController.selectLanguage.value!.language_code; + } + } else { + if (languageController.selectLanguage != null) { + language = languageController.selectLanguage.value!.language_code; + } + } int num = AppLanguage().isChinese() ? 3 : 2; List data = widget.sleepReport['bs'] ?? []; diff --git a/lib/pages/sleep_report/component/SleepChartWidget.dart b/lib/pages/sleep_report/component/SleepChartWidget.dart index d1198c2..08929b2 100644 --- a/lib/pages/sleep_report/component/SleepChartWidget.dart +++ b/lib/pages/sleep_report/component/SleepChartWidget.dart @@ -1,14 +1,11 @@ -import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.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'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; -import 'package:vbvs_app/pages/sleep_report/chart/GradientLine.dart'; -import 'package:vbvs_app/pages/sleep_report/chart/SnoreWaveform.dart'; -import 'package:EasyDartModule/EasyDartModule.dart' as es; class SleepChartContainer extends StatelessWidget { final Map sleepReport; @@ -54,24 +51,40 @@ class SleepChartContainer extends StatelessWidget { 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, onTap: () { - showTipDialog( - context, - Container( - child: Text( - tipText, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + tipText, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + tipText, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton); + } }, child: Container( width: 30.rpx, diff --git a/lib/pages/sleep_report/component/SleepView.dart b/lib/pages/sleep_report/component/SleepView.dart index 2dcfcbe..09f17e6 100644 --- a/lib/pages/sleep_report/component/SleepView.dart +++ b/lib/pages/sleep_report/component/SleepView.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/GradientLine.dart'; import 'package:vbvs_app/pages/sleep_report/chart/SnoreWaveform.dart'; @@ -91,28 +92,46 @@ class _SleepViewWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx),// + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - "睡眠规律性是指个体睡眠模式在时间、时长、环境等方面呈现出的稳定性和一致性，是衡量睡眠质量的重要指标之一。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + "睡眠规律性是指个体睡眠模式在时间、时长、环境等方面呈现出的稳定性和一致性，是衡量睡眠质量的重要指标之一。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "睡眠规律性是指个体睡眠模式在时间、时长、环境等方面呈现出的稳定性和一致性，是衡量睡眠质量的重要指标之一。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/SnoreViewWidget.dart b/lib/pages/sleep_report/component/SnoreViewWidget.dart index 78d2ea3..8b8b91b 100644 --- a/lib/pages/sleep_report/component/SnoreViewWidget.dart +++ b/lib/pages/sleep_report/component/SnoreViewWidget.dart @@ -8,6 +8,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/LineChartByRange.dart'; import 'package:vbvs_app/pages/sleep_report/chart/SnoreChart.dart'; @@ -120,28 +121,45 @@ class _SnoreViewWidgetWidgetState extends State { backgroundColor: Colors.transparent, highlightColor: Colors.white, // 或设置为你需要的水波纹颜色 padding: EdgeInsetsDirectional.fromSTEB( - 14.rpx, 10.rpx, 14.rpx, 10.rpx), // + 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "打鼾监测介绍。", - "打鼾监测是指用户在睡眠过程中打鼾频次的图表说明。".tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "打鼾监测介绍。", + "打鼾监测是指用户在睡眠过程中打鼾频次的图表说明。".tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "打鼾监测是指用户在睡眠过程中打鼾频次的图表说明。".tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/TrendDataTablePage.dart b/lib/pages/sleep_report/component/TrendDataTablePage.dart index 03c8467..435f783 100644 --- a/lib/pages/sleep_report/component/TrendDataTablePage.dart +++ b/lib/pages/sleep_report/component/TrendDataTablePage.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.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'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; class TrendDataTablePage extends StatefulWidget { @@ -54,24 +56,41 @@ class _TrendDataTablePageState extends State { 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, onTap: () { - showTipDialog( + if (AppConstants().ent_type == APPPackageType.MHT) { + showTipDialog( + context, + Container( + child: Text( + widget.tipText, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), + ), + ), + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( context, Container( child: Text( widget.tipText, style: TextStyle( fontSize: 26.rpx, - color: Colors.black, + color: themeController.currentColor.sc3, ), ), ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, ); + } }, child: Container( width: 30.rpx, diff --git a/lib/pages/sleep_report/component/TrendDataTextPage.dart b/lib/pages/sleep_report/component/TrendDataTextPage.dart index e43be33..f7086d5 100644 --- a/lib/pages/sleep_report/component/TrendDataTextPage.dart +++ b/lib/pages/sleep_report/component/TrendDataTextPage.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -57,26 +58,41 @@ class IndicatorCompareCard extends StatelessWidget { ClickableContainer( backgroundColor: Colors.transparent, highlightColor: Colors.white, - padding: - EdgeInsetsDirectional.fromSTEB(14.rpx, 10.rpx, 14.rpx, 10.rpx), + padding: EdgeInsetsDirectional.fromSTEB( + 14.rpx, 10.rpx, 14.rpx, 10.rpx), borderRadius: 0.rpx, onTap: () { - showTipDialog( - context, - Text( - tooltip!.tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Text( + tooltip!.tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Text( + tooltip!.tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( width: 30.rpx, diff --git a/lib/pages/sleep_report/component/ZiZhuShenJingPercentWidget.dart b/lib/pages/sleep_report/component/ZiZhuShenJingPercentWidget.dart index c651465..3c3fcea 100644 --- a/lib/pages/sleep_report/component/ZiZhuShenJingPercentWidget.dart +++ b/lib/pages/sleep_report/component/ZiZhuShenJingPercentWidget.dart @@ -5,6 +5,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/sleep_report/chart/StatusBarWithIndicator.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as es; @@ -94,25 +95,44 @@ class _ZiZhuShenJingPercentWidgetState 14.rpx, 10.rpx, 14.rpx, 10.rpx), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - // "自主神经平衡指数监测介绍".tr, - "自主神经平衡指数 是评估人体自主神经系统（ANS）功能状态的重要指标，主要反映交感神经和副交感神经的活性平衡关系。".tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + // "心理健康评估介绍".tr, + "自主神经平衡指数 是评估人体自主神经系统（ANS）功能状态的重要指标，主要反映交感神经和副交感神经的活性平衡关系。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } else { + showTipDialog( + context, + Container( + child: Text( + "自主神经平衡指数是评估人体自主神经系统（ANS）功能状态的重要指标，主要反映交感神经和副交感神经的活性平衡关系。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + backgroundColor: themeController.currentColor.sc17, + colors: AppConstants().thNormalButton, + ); + } }, child: Container( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/sleep_report/component/new_sleep_view.dart b/lib/pages/sleep_report/component/new_sleep_view.dart index 0efb00e..b0aff4a 100644 --- a/lib/pages/sleep_report/component/new_sleep_view.dart +++ b/lib/pages/sleep_report/component/new_sleep_view.dart @@ -6,6 +6,7 @@ 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'; +import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/sleep_report/chart/SnoreWaveform.dart'; @@ -119,25 +120,27 @@ class _NewSleepViewWidgetState extends State { 14.rpx, 0.rpx, 14.rpx, 0), // borderRadius: 0.rpx, // 圆形点击区域 onTap: () { - showTipDialog( - context, - Container( - child: Text( - "睡眠规律性是指个体睡眠模式在时间、时长、环境等方面呈现出的稳定性和一致性，是衡量睡眠质量的重要指标之一。" - .tr, - style: TextStyle( - fontSize: 26.rpx, - color: Colors.black, + if (AppConstants().ent_type == APPPackageType.MHT.code) { + showTipDialog( + context, + Container( + child: Text( + "睡眠规律性是指个体睡眠模式在时间、时长、环境等方面呈现出的稳定性和一致性，是衡量睡眠质量的重要指标之一。" + .tr, + style: TextStyle( + fontSize: 26.rpx, + color: Colors.black, + ), ), ), - ), - backgroundColor: Color(0xFFFFFFFF), - colors: [ - Color(0XFF1592AA), - Color(0xFF0C83A7), - Color(0xFF006FA3) - ], - ); + backgroundColor: Color(0xFFFFFFFF), + colors: [ + Color(0XFF1592AA), + Color(0xFF0C83A7), + Color(0xFF006FA3) + ], + ); + } }, child: Container( padding: 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 f52f87d..6547a99 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -563,8 +563,7 @@ class _NewSleepReportPageState extends State { CrossAxisAlignment.start, children: [ Text( - '${widget.data['code'] ?? '未知数据'.tr}', - // "D11250300003", + '${widget.data['code'] ?? widget.data['mac']}', style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, @@ -853,7 +852,8 @@ class _NewSleepReportPageState extends State { CrossAxisAlignment.start, children: [ Text( - '${widget.data['code'] ?? '未知数据'.tr}', + // '${widget.data['code'] ?? '未知数据'.tr}', + '${widget.data['code'] ?? widget.data['mac']}', // "D11250300003", style: TextStyle( fontFamily: 'Inter',