From 4072541e7b7819d85a8ff46ac9f6ba0523cca9ec Mon Sep 17 00:00:00 2001 From: czz <862977248@qq.com> Date: Wed, 20 Aug 2025 17:47:46 +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 +- lib/main.dart | 26 ------------ .../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 ++- 31 files changed, 161 insertions(+), 129 deletions(-) diff --git a/assets/mhlangs/en_US.json b/assets/mhlangs/en_US.json index 4a57778..7524e15 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 8fb907b..7e3bb48 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 f66f44d..2521fe7 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 2bf6fd2..6c93f5c 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.sc3, + themeController.currentColor.sc1, ), ), ], diff --git a/lib/main.dart b/lib/main.dart index abe2933..47611a6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -222,7 +222,6 @@ Future startMessagePolling(int ent_type) async { if (Get.isRegistered()) { Get.find().getMessageStatus(); await controller.getMessageStatus(); - if (controller.model.system_message_read == 1) { await controller.getMessageList("app_system"); final unhandledShareMessages = @@ -236,31 +235,6 @@ Future startMessagePolling(int ent_type) async { (item['read_time'] == null); }).toList(); - // if (unhandledShareMessages.isNotEmpty) { - // for (final message in unhandledShareMessages) { - // final messageId = message['_id']?.toString(); - // if (messageId == null || _poppedMessageIds.contains(messageId)) - // continue; - - // // 新增：如果当前页面是消息页，则跳过弹窗 - // if (Get.currentRoute == '/messagePage') { - // continue; - // } - - // _poppedMessageIds.add(messageId); - - // try { - // await controller.updateMessageReadStatus(Get.context!, messageId); - // } catch (e) { - // print("标记消息 $messageId 为已读失败: $e"); - // } - - // final result = await showMessageConfirmDialog(title: '设备分享提醒'.tr); - // if (result == 'confirm') { - // Get.toNamed('/messageDetail', arguments: message); - // } - // } - // } if (unhandledShareMessages.isNotEmpty) { for (final message in unhandledShareMessages) { final messageId = message['_id']?.toString(); 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 d9696a4..2fcbbfc 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(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -132,7 +132,7 @@ class _AfterWifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -144,7 +144,7 @@ class _AfterWifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -640,7 +640,7 @@ class _AfterWifiPagePersonState extends State { valueColor: AlwaysStoppedAnimation< Color>( - Colors.white), + themeController.currentColor.sc1,), ), ) else diff --git a/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart b/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart index f476ec0..46feea5 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(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -368,7 +368,7 @@ class _SingleBlueteethDeviceCompoentWidgetState height: 24.rpx, child: CircularProgressIndicator( strokeWidth: 1, - valueColor: AlwaysStoppedAnimation(Colors.white), + valueColor: AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index 25255d9..cfb1c3c 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( - Colors.white), + themeController.currentColor.sc1,), ), ); } @@ -191,7 +191,7 @@ class _WifiPageState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: AlwaysStoppedAnimation( - Colors.white), + themeController.currentColor.sc1,), ), ); } @@ -693,7 +693,7 @@ class _WifiPageState extends State { valueColor: AlwaysStoppedAnimation< Color>( - Colors.white), + themeController.currentColor.sc1,), ), ) else diff --git a/lib/pages/device_bind/wifi_page_person.dart b/lib/pages/device_bind/wifi_page_person.dart index dd4163d..2b838eb 100644 --- a/lib/pages/device_bind/wifi_page_person.dart +++ b/lib/pages/device_bind/wifi_page_person.dart @@ -120,8 +120,9 @@ class _WifiPagePersonState extends State { height: 24.rpx, child: CircularProgressIndicator( strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), ), ); } @@ -132,7 +133,7 @@ class _WifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -144,7 +145,7 @@ class _WifiPagePersonState extends State { child: CircularProgressIndicator( strokeWidth: 1, valueColor: - AlwaysStoppedAnimation(Colors.white), + AlwaysStoppedAnimation( themeController.currentColor.sc1,), ), ); } @@ -636,7 +637,7 @@ class _WifiPagePersonState extends State { valueColor: AlwaysStoppedAnimation< Color>( - Colors.white), + themeController.currentColor.sc1,), ), ) else diff --git a/lib/pages/main_bottom/component/MessageWidgetWidget.dart b/lib/pages/main_bottom/component/MessageWidgetWidget.dart index 0cc2bda..4baa6f6 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: 1, + maxLines: 2, style: TextStyle( fontFamily: 'Inter', fontSize: 26.rpx, @@ -184,15 +184,13 @@ class _MessageWidgetWidgetState extends State { Widget _buildValueItem(BuildContext context, value) { return Container( - constraints: BoxConstraints( - minHeight: 62.rpx, - ), + constraints: BoxConstraints(minHeight: 60.rpx, maxHeight: 60.rpx), child: Align( alignment: AlignmentDirectional(-1, 0), child: Text( "${value}", overflow: TextOverflow.ellipsis, - maxLines: 1, + maxLines: 2, 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 7c438ba..a0da9ba 100644 --- a/lib/pages/main_bottom/e_page.dart +++ b/lib/pages/main_bottom/e_page.dart @@ -135,7 +135,13 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { Widget _buildLoggedInContent() { return Obx(() { if (finalUri.isEmpty) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + )); } // 如果设备列表为空 @@ -173,7 +179,13 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { valueListenable: isPageLoading, builder: (context, isLoading, child) { return isLoading - ? Center(child: CircularProgressIndicator()) + ? Center( + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + )) : SizedBox.shrink(); }, ), diff --git a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart index 257376b..c565526 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( - stringToColor("#929699")), - ), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } return Container(); @@ -387,10 +387,11 @@ class _DeviceComponentWidgetState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } 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 458a2c3..aceee9c 100644 --- a/lib/pages/mh_page/device/mht_people_info.dart +++ b/lib/pages/mh_page/device/mht_people_info.dart @@ -140,7 +140,11 @@ class _MHTPeopleInfoPageState extends State { @override Widget build(BuildContext context) { if (isLoading) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } 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 9afb940..edd3f9d 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(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } 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(Colors.white), - ), + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } 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(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } return Container(); @@ -640,13 +640,11 @@ class _MHTWifiPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors.white), - ), + CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ) 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 ee92eee..6ea779f 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(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } 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(Colors.white), - ), + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } if (blueteethBindController.wifiConnectStatus.value == @@ -190,10 +190,10 @@ class _MHTWifiAfterPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ); } return Container(); @@ -613,13 +613,11 @@ class _MHTWifiAfterPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors.white), - ), + CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ) else getWifiIconByRsso( diff --git a/lib/pages/mh_page/experience_store_page.dart b/lib/pages/mh_page/experience_store_page.dart index c5478be..7425e24 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(Colors.white), + AlwaysStoppedAnimation(themeController.currentColor.sc1), ); } else { return Container(); diff --git a/lib/pages/mh_page/help/article.dart b/lib/pages/mh_page/help/article.dart index 4f7d6cb..0c444ac 100644 --- a/lib/pages/mh_page/help/article.dart +++ b/lib/pages/mh_page/help/article.dart @@ -99,10 +99,11 @@ class _HelpArticleState extends State { Container( color: const Color(0xFF042C46), alignment: Alignment.center, - child: const CircularProgressIndicator( - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ) ), ], ), 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 f9399f1..0e02fa4 100644 --- a/lib/pages/mh_page/homepage/mht_sleep_report_page.dart +++ b/lib/pages/mh_page/homepage/mht_sleep_report_page.dart @@ -501,7 +501,11 @@ class _MhtSleepReportPageState extends State { padding: EdgeInsets.fromLTRB( 0, 30.rpx, 0, 0), child: Center( - child: CircularProgressIndicator()), + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )), ) : hasValidData ? Column( diff --git a/lib/pages/mh_page/issue_list_page.dart b/lib/pages/mh_page/issue_list_page.dart index ed2a053..beee57d 100644 --- a/lib/pages/mh_page/issue_list_page.dart +++ b/lib/pages/mh_page/issue_list_page.dart @@ -73,7 +73,11 @@ class IssueListPage extends GetView { ), child: Obx(() { if (controller.model.isLoading) { - return Center(child: CircularProgressIndicator()); // ✅ 加载中 + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); // ✅ 加载中 } if (controller.model.issueList.isEmpty) { diff --git a/lib/pages/mh_page/privacy_policy.dart b/lib/pages/mh_page/privacy_policy.dart index fef2823..ed29a40 100644 --- a/lib/pages/mh_page/privacy_policy.dart +++ b/lib/pages/mh_page/privacy_policy.dart @@ -94,7 +94,11 @@ class _PrivacyPolicyPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } 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 838973d..172ba31 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -565,7 +565,11 @@ class WebviewTestView extends GetComponent { // return (controller.ready.value && (MainPageBBottomChange.getCurrentIndex() == 2)) return (controller.ready.value) ? controller.web.build() - : Center(child: CircularProgressIndicator()); + : Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); }), ), ), diff --git a/lib/pages/mh_page/user_agreement_page.dart b/lib/pages/mh_page/user_agreement_page.dart index 7edff94..8490888 100644 --- a/lib/pages/mh_page/user_agreement_page.dart +++ b/lib/pages/mh_page/user_agreement_page.dart @@ -98,7 +98,11 @@ class _UserAgreementPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/policy/privacy_policy.dart b/lib/pages/policy/privacy_policy.dart index 338dbc7..df4422b 100644 --- a/lib/pages/policy/privacy_policy.dart +++ b/lib/pages/policy/privacy_policy.dart @@ -114,7 +114,11 @@ class _PrivacyPolicyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/policy/user_policy.dart b/lib/pages/policy/user_policy.dart index 6483721..6d21de4 100644 --- a/lib/pages/policy/user_policy.dart +++ b/lib/pages/policy/user_policy.dart @@ -109,7 +109,11 @@ class _UserPrivacyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/repair/apply_repair_page.dart b/lib/pages/repair/apply_repair_page.dart index ba9c79b..9678af6 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 75a6573..4aebce0 100644 --- a/lib/pages/sleep_report/component/CompareSleepWidget.dart +++ b/lib/pages/sleep_report/component/CompareSleepWidget.dart @@ -141,14 +141,7 @@ 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 fc00bf5..38cfe3f 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -555,7 +555,11 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } if (sleepReport == null || sleepReport.isEmpty) { // 空数据 @@ -847,7 +851,11 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } 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 85231b2..c1c2a0d 100644 --- a/lib/pages/sleep_report/sleep_report_page.dart +++ b/lib/pages/sleep_report/sleep_report_page.dart @@ -104,7 +104,11 @@ class _SleepReportPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + ), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/user/privacy_scheme_page.dart b/lib/pages/user/privacy_scheme_page.dart index 35f0d0d..cdca3f0 100644 --- a/lib/pages/user/privacy_scheme_page.dart +++ b/lib/pages/user/privacy_scheme_page.dart @@ -93,7 +93,11 @@ class _PrivacySchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } 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 41de4a0..f5db84f 100644 --- a/lib/pages/user/user_scheme_page.dart +++ b/lib/pages/user/user_scheme_page.dart @@ -98,7 +98,11 @@ class _UserSchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 1, + valueColor: + AlwaysStoppedAnimation(themeController.currentColor.sc1), + )); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/xiaoe/xiaoe_page.dart b/lib/pages/xiaoe/xiaoe_page.dart index d36c716..1deb225 100644 --- a/lib/pages/xiaoe/xiaoe_page.dart +++ b/lib/pages/xiaoe/xiaoe_page.dart @@ -104,7 +104,11 @@ class _XiaoEPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child: CircularProgressIndicator( + strokeWidth: 1, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1), + ), // 加载指示器 ) : SizedBox.shrink(); },