From 2cbe9c271385bcd37cfe592e540444480f425439 Mon Sep 17 00:00:00 2001 From: czz <862977248@qq.com> Date: Wed, 20 Aug 2025 17:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=AA=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/mhlangs/en_US.json | 2 +- assets/mhlangs/zh_CN.json | 2 +- assets/mhlangs/zh_TW.json | 2 +- lib/common/util/MyUtils.dart | 2 +- .../after/after_wifi_page_person.dart | 8 ++-- .../SingleBlueteethDeviceCompoentWidget.dart | 4 +- lib/pages/device_bind/wifi_page.dart | 6 +-- lib/pages/device_bind/wifi_page_person.dart | 11 +++-- .../component/MessageWidgetWidget.dart | 8 ++-- lib/pages/main_bottom/e_page.dart | 16 +------- .../component/DeviceComponentWidget.dart | 19 +++++---- lib/pages/mh_page/device/mht_people_info.dart | 6 +-- lib/pages/mh_page/device/mht_wifi_page.dart | 40 ++++++++++--------- .../mh_page/device/mht_wifi_page_after.dart | 38 +++++++++--------- lib/pages/mh_page/experience_store_page.dart | 2 +- lib/pages/mh_page/help/article.dart | 9 ++--- .../homepage/mht_sleep_report_page.dart | 6 +-- lib/pages/mh_page/issue_list_page.dart | 6 +-- lib/pages/mh_page/privacy_policy.dart | 6 +-- lib/pages/mh_page/test/WebviewTestModel.dart | 6 +-- lib/pages/mh_page/user_agreement_page.dart | 6 +-- lib/pages/policy/privacy_policy.dart | 6 +-- lib/pages/policy/user_policy.dart | 6 +-- lib/pages/repair/apply_repair_page.dart | 2 +- .../component/CompareSleepWidget.dart | 9 ++++- .../sleep_report/new_sleep_report_page.dart | 12 +----- lib/pages/sleep_report/sleep_report_page.dart | 6 +-- lib/pages/user/privacy_scheme_page.dart | 6 +-- lib/pages/user/user_scheme_page.dart | 6 +-- lib/pages/xiaoe/xiaoe_page.dart | 6 +-- 30 files changed, 103 insertions(+), 161 deletions(-) diff --git a/assets/mhlangs/en_US.json b/assets/mhlangs/en_US.json index 7524e15..4a57778 100644 --- a/assets/mhlangs/en_US.json +++ b/assets/mhlangs/en_US.json @@ -372,7 +372,7 @@ "型号:": "Model: ", "序列号:": "SN: ", "报修单号:": "Ticket: ", - "提交时间：": "Submitted: ", + "提交时间:": "Submitted: ", "问题描述:": "Issue: ", "报修状态": "Repair Status", "页面返回事件": "Page Back", diff --git a/assets/mhlangs/zh_CN.json b/assets/mhlangs/zh_CN.json index 2ee80a5..caff2c9 100644 --- a/assets/mhlangs/zh_CN.json +++ b/assets/mhlangs/zh_CN.json @@ -372,7 +372,7 @@ "型号:": "型号: ", "序列号:": "序列号: ", "报修单号:": "报修单号: ", - "提交时间：": "提交时间: ", + "提交时间:": "提交时间: ", "问题描述:": "问题描述: ", "报修状态": "报修状态", "页面返回事件": "页面返回事件", diff --git a/assets/mhlangs/zh_TW.json b/assets/mhlangs/zh_TW.json index 7142183..8eab60a 100644 --- a/assets/mhlangs/zh_TW.json +++ b/assets/mhlangs/zh_TW.json @@ -372,7 +372,7 @@ "型号:": "型號: ", "序列号:": "序列號: ", "报修单号:": "報修單號: ", - "提交时间：": "提交時間: ", + "提交时间:": "提交時間: ", "问题描述:": "問題描述: ", "报修状态": "報修狀態", "页面返回事件": "頁面返回事件", diff --git a/lib/common/util/MyUtils.dart b/lib/common/util/MyUtils.dart index 6c93f5c..2bf6fd2 100644 --- a/lib/common/util/MyUtils.dart +++ b/lib/common/util/MyUtils.dart @@ -531,7 +531,7 @@ class LoadingDialog { CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, + themeController.currentColor.sc3, ), ), ], diff --git a/lib/pages/device_bind/after/after_wifi_page_person.dart b/lib/pages/device_bind/after/after_wifi_page_person.dart index 2fcbbfc..d9696a4 100644 --- a/lib/pages/device_bind/after/after_wifi_page_person.dart +++ b/lib/pages/device_bind/after/after_wifi_page_person.dart @@ -121,7 +121,7 @@ class _AfterWifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -132,7 +132,7 @@ class _AfterWifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -144,7 +144,7 @@ class _AfterWifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -640,7 +640,7 @@ class _AfterWifiPagePersonState extends State { valueColor: AlwaysStoppedAnimation< Color>( - themeController.currentColor.sc1,), + Colors.white), ), ) else diff --git a/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart b/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart index 46feea5..f476ec0 100644 --- a/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart +++ b/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart @@ -155,7 +155,7 @@ class _SingleBlueteethDeviceCompoentWidgetState child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -368,7 +368,7 @@ class _SingleBlueteethDeviceCompoentWidgetState height: 24.rpx, child: CircularProgressIndicator( strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( themeController.currentColor.sc1,), + valueColor: AlwaysStoppedAnimation(Colors.white), ), ); } diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index cfb1c3c..25255d9 100644 --- a/lib/pages/device_bind/wifi_page.dart +++ b/lib/pages/device_bind/wifi_page.dart @@ -177,7 +177,7 @@ class _WifiPageState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1,), + Colors.white), ), ); } @@ -191,7 +191,7 @@ class _WifiPageState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1,), + Colors.white), ), ); } @@ -693,7 +693,7 @@ class _WifiPageState extends State { valueColor: AlwaysStoppedAnimation< Color>( - themeController.currentColor.sc1,), + Colors.white), ), ) else diff --git a/lib/pages/device_bind/wifi_page_person.dart b/lib/pages/device_bind/wifi_page_person.dart index 2b838eb..dd4163d 100644 --- a/lib/pages/device_bind/wifi_page_person.dart +++ b/lib/pages/device_bind/wifi_page_person.dart @@ -120,9 +120,8 @@ class _WifiPagePersonState extends State { height: 24.rpx, child: CircularProgressIndicator( strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), + valueColor: + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -133,7 +132,7 @@ class _WifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -145,7 +144,7 @@ class _WifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation( themeController.currentColor.sc1,), + AlwaysStoppedAnimation(Colors.white), ), ); } @@ -637,7 +636,7 @@ class _WifiPagePersonState extends State { valueColor: AlwaysStoppedAnimation< Color>( - themeController.currentColor.sc1,), + Colors.white), ), ) else diff --git a/lib/pages/main_bottom/component/MessageWidgetWidget.dart b/lib/pages/main_bottom/component/MessageWidgetWidget.dart index 4baa6f6..0cc2bda 100644 --- a/lib/pages/main_bottom/component/MessageWidgetWidget.dart +++ b/lib/pages/main_bottom/component/MessageWidgetWidget.dart @@ -169,7 +169,7 @@ class _MessageWidgetWidgetState extends State { child: Text( label.tr, overflow: TextOverflow.ellipsis, - maxLines: 2, + maxLines: 1, style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, @@ -184,13 +184,15 @@ class _MessageWidgetWidgetState extends State { Widget _buildValueItem(BuildContext context, value) { return Container( - constraints: BoxConstraints(minHeight: 60.rpx, maxHeight: 60.rpx), + constraints: BoxConstraints( + minHeight: 62.rpx, + ), child: Align( alignment: AlignmentDirectional(-1, 0), child: Text( "${value}", overflow: TextOverflow.ellipsis, - maxLines: 2, + maxLines: 1, style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, diff --git a/lib/pages/main_bottom/e_page.dart b/lib/pages/main_bottom/e_page.dart index a0da9ba..7c438ba 100644 --- a/lib/pages/main_bottom/e_page.dart +++ b/lib/pages/main_bottom/e_page.dart @@ -135,13 +135,7 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { Widget _buildLoggedInContent() { return Obx(() { if (finalUri.isEmpty) { - return Center( - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - )); + return Center(child: CircularProgressIndicator()); } // 如果设备列表为空 @@ -179,13 +173,7 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { valueListenable: isPageLoading, builder: (context, isLoading, child) { return isLoading - ? Center( - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - )) + ? Center(child: CircularProgressIndicator()) : SizedBox.shrink(); }, ), diff --git a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart index c565526..257376b 100644 --- a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart +++ b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart @@ -78,11 +78,11 @@ class _DeviceComponentWidgetState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: AlwaysStoppedAnimation( + stringToColor("#929699")), + ), ); } return Container(); @@ -387,11 +387,10 @@ class _DeviceComponentWidgetState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: AlwaysStoppedAnimation(Colors.white), + ), ); } return Container(); diff --git a/lib/pages/mh_page/device/mht_people_info.dart b/lib/pages/mh_page/device/mht_people_info.dart index aceee9c..458a2c3 100644 --- a/lib/pages/mh_page/device/mht_people_info.dart +++ b/lib/pages/mh_page/device/mht_people_info.dart @@ -140,11 +140,7 @@ class _MHTPeopleInfoPageState extends State { @override Widget build(BuildContext context) { if (isLoading) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } return LayoutBuilder( diff --git a/lib/pages/mh_page/device/mht_wifi_page.dart b/lib/pages/mh_page/device/mht_wifi_page.dart index edd3f9d..9afb940 100644 --- a/lib/pages/mh_page/device/mht_wifi_page.dart +++ b/lib/pages/mh_page/device/mht_wifi_page.dart @@ -169,11 +169,11 @@ class _MHTWifiPageState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } if (blueteethBindController.netType.value == 0) { @@ -181,10 +181,10 @@ class _MHTWifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } if (blueteethBindController.wifiConnectStatus.value == @@ -192,11 +192,11 @@ class _MHTWifiPageState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } return Container(); @@ -640,11 +640,13 @@ class _MHTWifiPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation< + Color>( + Colors.white), + ), ) else getWifiIconByRsso( diff --git a/lib/pages/mh_page/device/mht_wifi_page_after.dart b/lib/pages/mh_page/device/mht_wifi_page_after.dart index 6ea779f..ee92eee 100644 --- a/lib/pages/mh_page/device/mht_wifi_page_after.dart +++ b/lib/pages/mh_page/device/mht_wifi_page_after.dart @@ -166,11 +166,11 @@ class _MHTWifiAfterPageState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } if (blueteethBindController.netType.value == 0) { @@ -178,10 +178,10 @@ class _MHTWifiAfterPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } if (blueteethBindController.wifiConnectStatus.value == @@ -190,10 +190,10 @@ class _MHTWifiAfterPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ); } return Container(); @@ -613,11 +613,13 @@ class _MHTWifiAfterPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation< + Color>( + Colors.white), + ), ) else getWifiIconByRsso( diff --git a/lib/pages/mh_page/experience_store_page.dart b/lib/pages/mh_page/experience_store_page.dart index 7425e24..c5478be 100644 --- a/lib/pages/mh_page/experience_store_page.dart +++ b/lib/pages/mh_page/experience_store_page.dart @@ -152,7 +152,7 @@ class _ExperienceStorePageState extends State { return CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), + AlwaysStoppedAnimation(Colors.white), ); } else { return Container(); diff --git a/lib/pages/mh_page/help/article.dart b/lib/pages/mh_page/help/article.dart index 0c444ac..4f7d6cb 100644 --- a/lib/pages/mh_page/help/article.dart +++ b/lib/pages/mh_page/help/article.dart @@ -99,11 +99,10 @@ class _HelpArticleState extends State { Container( color: const Color(0xFF042C46), alignment: Alignment.center, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ) + child: const CircularProgressIndicator( + valueColor: + AlwaysStoppedAnimation(Colors.white), + ), ), ], ), 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 0e02fa4..f9399f1 100644 --- a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart +++ b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart @@ -501,11 +501,7 @@ class _MhtSleepReportPageState extends State { padding: EdgeInsets.fromLTRB( 0, 30.rpx, 0, 0), child: Center( - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )), + child: CircularProgressIndicator()), ) : hasValidData ? Column( diff --git a/lib/pages/mh_page/issue_list_page.dart b/lib/pages/mh_page/issue_list_page.dart index beee57d..ed2a053 100644 --- a/lib/pages/mh_page/issue_list_page.dart +++ b/lib/pages/mh_page/issue_list_page.dart @@ -73,11 +73,7 @@ class IssueListPage extends GetView { ), child: Obx(() { if (controller.model.isLoading) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); // ✅ 加载中 + return Center(child: CircularProgressIndicator()); // ✅ 加载中 } if (controller.model.issueList.isEmpty) { diff --git a/lib/pages/mh_page/privacy_policy.dart b/lib/pages/mh_page/privacy_policy.dart index ed29a40..fef2823 100644 --- a/lib/pages/mh_page/privacy_policy.dart +++ b/lib/pages/mh_page/privacy_policy.dart @@ -94,11 +94,7 @@ class _PrivacyPolicyPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/mh_page/test/WebviewTestModel.dart b/lib/pages/mh_page/test/WebviewTestModel.dart index 172ba31..838973d 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -565,11 +565,7 @@ class WebviewTestView extends GetComponent { // return (controller.ready.value && (MainPageBBottomChange.getCurrentIndex() == 2)) return (controller.ready.value) ? controller.web.build() - : Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + : Center(child: CircularProgressIndicator()); }), ), ), diff --git a/lib/pages/mh_page/user_agreement_page.dart b/lib/pages/mh_page/user_agreement_page.dart index 8490888..7edff94 100644 --- a/lib/pages/mh_page/user_agreement_page.dart +++ b/lib/pages/mh_page/user_agreement_page.dart @@ -98,11 +98,7 @@ class _UserAgreementPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/policy/privacy_policy.dart b/lib/pages/policy/privacy_policy.dart index df4422b..338dbc7 100644 --- a/lib/pages/policy/privacy_policy.dart +++ b/lib/pages/policy/privacy_policy.dart @@ -114,11 +114,7 @@ class _PrivacyPolicyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ), // 加载指示器 + child: CircularProgressIndicator(), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/policy/user_policy.dart b/lib/pages/policy/user_policy.dart index 6d21de4..6483721 100644 --- a/lib/pages/policy/user_policy.dart +++ b/lib/pages/policy/user_policy.dart @@ -109,11 +109,7 @@ class _UserPrivacyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ), // 加载指示器 + child: CircularProgressIndicator(), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/repair/apply_repair_page.dart b/lib/pages/repair/apply_repair_page.dart index 9678af6..ba9c79b 100644 --- a/lib/pages/repair/apply_repair_page.dart +++ b/lib/pages/repair/apply_repair_page.dart @@ -87,7 +87,7 @@ class _ApplyRepairPageState extends State { .map((e) => (e['_id']) as String) .toList(); repairController.deviceListIdLabel = bodyDeviceController.deviceList - .map((e) => (e['code'] ?? e['mac']) as String) + .map((e) => (e['code']??e['mac']) as String) .toList(); } return LayoutBuilder( diff --git a/lib/pages/sleep_report/component/CompareSleepWidget.dart b/lib/pages/sleep_report/component/CompareSleepWidget.dart index 4aebce0..75a6573 100644 --- a/lib/pages/sleep_report/component/CompareSleepWidget.dart +++ b/lib/pages/sleep_report/component/CompareSleepWidget.dart @@ -141,7 +141,14 @@ class _CompareSleepWidgetState extends State { SizedBox( height: 31.rpx, ), - + // Padding( + // padding: + // EdgeInsetsDirectional.fromSTEB(30.rpx, 0.rpx, 30.rpx, 0.rpx), + // child: SleepRadarChart( + // today: today, + // yesterday: yesterday, + // ), + // ), Padding( padding: EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 30.rpx, 0.rpx), diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index 38cfe3f..fc00bf5 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -555,11 +555,7 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } if (sleepReport == null || sleepReport.isEmpty) { // 空数据 @@ -851,11 +847,7 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } switch (sleepReportController.model.type) { case 1: diff --git a/lib/pages/sleep_report/sleep_report_page.dart b/lib/pages/sleep_report/sleep_report_page.dart index c1c2a0d..85231b2 100644 --- a/lib/pages/sleep_report/sleep_report_page.dart +++ b/lib/pages/sleep_report/sleep_report_page.dart @@ -104,11 +104,7 @@ class _SleepReportPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - ), // 加载指示器 + child: CircularProgressIndicator(), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/user/privacy_scheme_page.dart b/lib/pages/user/privacy_scheme_page.dart index cdca3f0..35f0d0d 100644 --- a/lib/pages/user/privacy_scheme_page.dart +++ b/lib/pages/user/privacy_scheme_page.dart @@ -93,11 +93,7 @@ class _PrivacySchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/user/user_scheme_page.dart b/lib/pages/user/user_scheme_page.dart index f5db84f..41de4a0 100644 --- a/lib/pages/user/user_scheme_page.dart +++ b/lib/pages/user/user_scheme_page.dart @@ -98,11 +98,7 @@ class _UserSchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child:CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(themeController.currentColor.sc1), - )); + return Center(child: CircularProgressIndicator()); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/xiaoe/xiaoe_page.dart b/lib/pages/xiaoe/xiaoe_page.dart index 1deb225..d36c716 100644 --- a/lib/pages/xiaoe/xiaoe_page.dart +++ b/lib/pages/xiaoe/xiaoe_page.dart @@ -104,11 +104,7 @@ class _XiaoEPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1), - ), // 加载指示器 + child: CircularProgressIndicator(), // 加载指示器 ) : SizedBox.shrink(); },