diff --git a/lib/common/color/appConstants.dart b/lib/common/color/appConstants.dart index 3000150..0ccbd71 100644 --- a/lib/common/color/appConstants.dart +++ b/lib/common/color/appConstants.dart @@ -54,8 +54,8 @@ class AppConstants { //系统参数 //运行打包APP模式 - // int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 - int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖 + int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 + // int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖 int text_length = 8; } diff --git a/lib/common/util/MyUtils.dart b/lib/common/util/MyUtils.dart index 2bf6fd2..cdacbb1 100644 --- a/lib/common/util/MyUtils.dart +++ b/lib/common/util/MyUtils.dart @@ -528,10 +528,10 @@ class LoadingDialog { SizedBox( height: 30.rpx, ), - CircularProgressIndicator( + CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc3, + themeController.currentColor.sc1, ), ), ], 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..d648247 100644 --- a/lib/pages/device_bind/after/after_wifi_page_person.dart +++ b/lib/pages/device_bind/after/after_wifi_page_person.dart @@ -118,22 +118,24 @@ class _AfterWifiPagePersonState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.netType.value == 0) { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.wifiConnectStatus.value == @@ -141,11 +143,12 @@ class _AfterWifiPagePersonState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } return Container(); @@ -635,13 +638,12 @@ class _AfterWifiPagePersonState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors.white), - ), + CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ) else getWifiIconByRsso( diff --git a/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart b/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart index f476ec0..adeb89b 100644 --- a/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart +++ b/lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart @@ -152,11 +152,12 @@ class _SingleBlueteethDeviceCompoentWidgetState return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, ), + ), ); } return Container(); @@ -367,9 +368,11 @@ class _SingleBlueteethDeviceCompoentWidgetState width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } return Container(); diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index 25255d9..3895a68 100644 --- a/lib/pages/device_bind/wifi_page.dart +++ b/lib/pages/device_bind/wifi_page.dart @@ -175,9 +175,10 @@ class _WifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, + strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - Colors.white), + themeController.currentColor.sc1, + ), ), ); } @@ -189,9 +190,10 @@ class _WifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, + strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - Colors.white), + themeController.currentColor.sc1, + ), ), ); } @@ -689,11 +691,14 @@ class _WifiPageState extends State { height: 32.rpx, child: CircularProgressIndicator( - strokeWidth: 1, + strokeWidth: 2, valueColor: AlwaysStoppedAnimation< - Color>( - Colors.white), + Color>( + 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..7b5cc4a 100644 --- a/lib/pages/device_bind/wifi_page_person.dart +++ b/lib/pages/device_bind/wifi_page_person.dart @@ -119,9 +119,10 @@ class _WifiPagePersonState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), ), ); } @@ -130,9 +131,10 @@ class _WifiPagePersonState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), ), ); } @@ -142,9 +144,10 @@ class _WifiPagePersonState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), ), ); } @@ -632,11 +635,14 @@ class _WifiPagePersonState extends State { height: 32.rpx, child: CircularProgressIndicator( - strokeWidth: 1, + strokeWidth: 2, valueColor: AlwaysStoppedAnimation< - Color>( - Colors.white), + Color>( + themeController + .currentColor + .sc1, + ), ), ) else diff --git a/lib/pages/main_bottom/e_page.dart b/lib/pages/main_bottom/e_page.dart index 7c438ba..59e45f3 100644 --- a/lib/pages/main_bottom/e_page.dart +++ b/lib/pages/main_bottom/e_page.dart @@ -135,7 +135,12 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { Widget _buildLoggedInContent() { return Obx(() { if (finalUri.isEmpty) { - return Center(child: CircularProgressIndicator()); + return Center(child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ),); } // 如果设备列表为空 @@ -173,7 +178,12 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { valueListenable: isPageLoading, builder: (context, isLoading, child) { return isLoading - ? Center(child: CircularProgressIndicator()) + ? Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..654224e 100644 --- a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart +++ b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart @@ -78,11 +78,12 @@ class _DeviceComponentWidgetState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation( - stringToColor("#929699")), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } return Container(); @@ -387,10 +388,12 @@ class _DeviceComponentWidgetState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + 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..6c1cb65 100644 --- a/lib/pages/mh_page/device/mht_people_info.dart +++ b/lib/pages/mh_page/device/mht_people_info.dart @@ -140,7 +140,12 @@ class _MHTPeopleInfoPageState extends State { @override Widget build(BuildContext context) { if (isLoading) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..4afd10d 100644 --- a/lib/pages/mh_page/device/mht_wifi_page.dart +++ b/lib/pages/mh_page/device/mht_wifi_page.dart @@ -170,10 +170,11 @@ class _MHTWifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.netType.value == 0) { @@ -181,10 +182,11 @@ class _MHTWifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.wifiConnectStatus.value == @@ -193,10 +195,11 @@ class _MHTWifiPageState extends State { width: 24.rpx, height: 24.rpx, child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } return Container(); @@ -640,13 +643,12 @@ class _MHTWifiPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors.white), - ), + CircularProgressIndicator( + strokeWidth: 2, + 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..7c60537 100644 --- a/lib/pages/mh_page/device/mht_wifi_page_after.dart +++ b/lib/pages/mh_page/device/mht_wifi_page_after.dart @@ -166,22 +166,24 @@ class _MHTWifiAfterPageState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.netType.value == 0) { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } if (blueteethBindController.wifiConnectStatus.value == @@ -189,11 +191,12 @@ class _MHTWifiAfterPageState extends State { return SizedBox( width: 24.rpx, height: 24.rpx, - child: CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ); } return Container(); @@ -613,13 +616,12 @@ class _MHTWifiAfterPageState extends State { width: 32.rpx, height: 32.rpx, child: - CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation< - Color>( - Colors.white), - ), + CircularProgressIndicator( + strokeWidth: 2, + 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..1b29d78 100644 --- a/lib/pages/mh_page/experience_store_page.dart +++ b/lib/pages/mh_page/experience_store_page.dart @@ -150,10 +150,11 @@ class _ExperienceStorePageState extends State { if (controller.model.experienceStoreModelList.length == 0) { return CircularProgressIndicator( - strokeWidth: 1, - valueColor: - AlwaysStoppedAnimation(Colors.white), - ); + strokeWidth: 2, + valueColor: 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..b2ef501 100644 --- a/lib/pages/mh_page/help/article.dart +++ b/lib/pages/mh_page/help/article.dart @@ -99,10 +99,12 @@ class _HelpArticleState extends State { Container( color: const Color(0xFF042C46), alignment: Alignment.center, - child: const CircularProgressIndicator( - valueColor: - AlwaysStoppedAnimation(Colors.white), - ), + child: CircularProgressIndicator( + strokeWidth: 2, + 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..6421bd1 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,12 @@ class _MhtSleepReportPageState extends State { padding: EdgeInsets.fromLTRB( 0, 30.rpx, 0, 0), child: Center( - child: CircularProgressIndicator()), + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ),), ) : hasValidData ? Column( diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index c94d1a3..5cfc7d8 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -580,7 +580,23 @@ class _NewHomePageState extends State { if (homeController .homeSleepDays.value.length == 0) - Expanded(child: NullDataWidget()), + Expanded( + child: Center( + child: SizedBox( + width: 40.rpx, // 宽度 + height: 40.rpx, // 高度 + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: + AlwaysStoppedAnimation< + Color>( + themeController + .currentColor.sc1, + ), + ), + ), + ), + ), if (homeController .homeSleepDays.value.length != 0) @@ -632,7 +648,7 @@ class _NewHomePageState extends State { personInfo .value, 'backgroundImg': - 'assets/images/new_background.png', + 'assets/images/new_background.png', // 'backgroundColor':stringToColor("#003058"), 'person_show': false, diff --git a/lib/pages/mh_page/issue_list_page.dart b/lib/pages/mh_page/issue_list_page.dart index ed2a053..ede06dc 100644 --- a/lib/pages/mh_page/issue_list_page.dart +++ b/lib/pages/mh_page/issue_list_page.dart @@ -73,7 +73,12 @@ class IssueListPage extends GetView { ), child: Obx(() { if (controller.model.isLoading) { - return Center(child: CircularProgressIndicator()); // ✅ 加载中 + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..a4f276e 100644 --- a/lib/pages/mh_page/privacy_policy.dart +++ b/lib/pages/mh_page/privacy_policy.dart @@ -94,7 +94,12 @@ class _PrivacyPolicyPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..c842aff 100644 --- a/lib/pages/mh_page/test/WebviewTestModel.dart +++ b/lib/pages/mh_page/test/WebviewTestModel.dart @@ -565,7 +565,12 @@ 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: 2, + 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..eb3058a 100644 --- a/lib/pages/mh_page/user_agreement_page.dart +++ b/lib/pages/mh_page/user_agreement_page.dart @@ -98,7 +98,12 @@ class _UserAgreementPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..ee162be 100644 --- a/lib/pages/policy/privacy_policy.dart +++ b/lib/pages/policy/privacy_policy.dart @@ -114,7 +114,12 @@ class _PrivacyPolicyNewPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), // 加载指示器 ) : SizedBox.shrink(); }, diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index fc00bf5..96717c1 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -555,7 +555,12 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ),); } if (sleepReport == null || sleepReport.isEmpty) { // 空数据 @@ -847,7 +852,12 @@ class _NewSleepReportPageState extends State { ), Obx(() { if (sleepReportController.isLoading.value) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..7677d73 100644 --- a/lib/pages/sleep_report/sleep_report_page.dart +++ b/lib/pages/sleep_report/sleep_report_page.dart @@ -104,7 +104,12 @@ class _SleepReportPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child:CircularProgressIndicator( + strokeWidth: 2, + 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..63068ef 100644 --- a/lib/pages/user/privacy_scheme_page.dart +++ b/lib/pages/user/privacy_scheme_page.dart @@ -93,7 +93,12 @@ class _PrivacySchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..dc31086 100644 --- a/lib/pages/user/user_scheme_page.dart +++ b/lib/pages/user/user_scheme_page.dart @@ -98,7 +98,12 @@ class _UserSchemePageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child: CircularProgressIndicator()); + return Center(child:CircularProgressIndicator( + strokeWidth: 2, + 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..8136bc5 100644 --- a/lib/pages/xiaoe/xiaoe_page.dart +++ b/lib/pages/xiaoe/xiaoe_page.dart @@ -104,7 +104,12 @@ class _XiaoEPageState extends State { builder: (context, isLoading, child) { return isLoading ? Center( - child: CircularProgressIndicator(), // 加载指示器 + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), // 加载指示器 ) : SizedBox.shrink(); },