From 6662051feb5bd76f1eb76dda894c73961998efa1 Mon Sep 17 00:00:00 2001 From: czz <862977248@qq.com> Date: Fri, 12 Sep 2025 15:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=9D=A1=E7=9C=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sleep/sleep_report_controller.dart | 3 +- .../homepage/mht_sleep_report_page.dart | 10 ++----- lib/pages/mh_page/homepage/new_Home_page.dart | 30 ++++--------------- 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/lib/controller/sleep/sleep_report_controller.dart b/lib/controller/sleep/sleep_report_controller.dart index e403180..53b7467 100644 --- a/lib/controller/sleep/sleep_report_controller.dart +++ b/lib/controller/sleep/sleep_report_controller.dart @@ -38,13 +38,12 @@ class SleepReportController extends GetControllerEx { RxString mac = "".obs; // 日历选择的日期 - RxInt date = 0.obs; // 初始化方法（外部跳转时调用） void initParams({String? macValue, int? dateValue}) { if (macValue != null) mac.value = macValue; if (dateValue != null) { - date.value = dateValue; + selectedDate.value = DateTime.fromMillisecondsSinceEpoch(dateValue); } } diff --git a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart index 9876893..7aebac8 100644 --- a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart +++ b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart @@ -41,7 +41,7 @@ class _MhtSleepReportPageState extends State { final RxBool isRightLimit = false.obs; var formFieldController = FormFieldController(null); var personInfo = {}.obs; - + RxBool isDateInitialized = false.obs; @override void initState() { super.initState(); @@ -601,13 +601,7 @@ class _MhtSleepReportPageState extends State { } Widget getTimeWidget() { - if (sleepReportController.date.value > 0) { - selectedDate = - DateTime.fromMillisecondsSinceEpoch(sleepReportController.date.value); - } else { - selectedDate = sleepReportController.selectedDate.value!; - } - + selectedDate = sleepReportController.selectedDate.value!; final type = sleepReportController.model.type; bool isChinese = AppLanguage().isChinese(); String displayText = ''; diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index 8cbd69a..6260617 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -494,10 +494,12 @@ class _NewHomePageState extends State { selectedPerson; personInfo.value = selectedPerson; - + // homeController + // .selectedDayIndex = + // (6).obs; homeController - .selectedDayIndex = - (6).obs; + .selectedDayIndex + .value = 6; print("$val"); if (val == null) { homeController @@ -681,28 +683,6 @@ class _NewHomePageState extends State { int? timeMillis = parseToInt( day['time']); - // Get.toNamed( - // "/newSleepReportPage", - // arguments: { - // 'date': - // timeMillis, - // 'mac': - // formFieldController - // .value!, - // 'type': 1, - // "person": - // personInfo - // .value, - // 'backgroundImg': - // 'assets/images/new_background.png', - // // 'backgroundColor':stringToColor("#003058"), - // 'person_show': - // false, - // 'reportPadding': - // false, - // } - // //主页跳详情睡眠报告 - // ); sleepReportController .initParams( macValue: