enchantedwyf/tuiche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加载窗样式

Browse Source
This commit is contained in:
czz
2025-08-20 17:47:46 +08:00
parent 8b26c4b8fa
commit 4072541e7b
31 changed files with 161 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/mhlangs/en_US.json
View File

@@ -372,7 +372,7 @@
"型号:": "Model: ", "型号:": "Model: ",
"序列号:": "SN: ", "序列号:": "SN: ",
"报修单号:": "Ticket: ", "报修单号:": "Ticket: ",
"提交时间:": "Submitted: ", "提交时间：": "Submitted: ",
"问题描述:": "Issue: ", "问题描述:": "Issue: ",
"报修状态": "Repair Status", "报修状态": "Repair Status",
"页面返回事件": "Page Back", "页面返回事件": "Page Back",

2
assets/mhlangs/zh_CN.json
View File

@@ -372,7 +372,7 @@
"型号:": "型号: ", "型号:": "型号: ",
"序列号:": "序列号: ", "序列号:": "序列号: ",
"报修单号:": "报修单号: ", "报修单号:": "报修单号: ",
"提交时间:": "提交时间: ", "提交时间：": "提交时间: ",
"问题描述:": "问题描述: ", "问题描述:": "问题描述: ",
"报修状态": "报修状态", "报修状态": "报修状态",
"页面返回事件": "页面返回事件", "页面返回事件": "页面返回事件",

2
assets/mhlangs/zh_TW.json
View File

@@ -372,7 +372,7 @@
"型号:": "型號: ", "型号:": "型號: ",
"序列号:": "序列號: ", "序列号:": "序列號: ",
"报修单号:": "報修單號: ", "报修单号:": "報修單號: ",
"提交时间:": "提交時間: ", "提交时间：": "提交時間: ",
"问题描述:": "問題描述: ", "问题描述:": "問題描述: ",
"报修状态": "報修狀態", "报修状态": "報修狀態",
"页面返回事件": "頁面返回事件", "页面返回事件": "頁面返回事件",

2
lib/common/util/MyUtils.dart
View File

@@ -531,7 +531,7 @@ class LoadingDialog {
CircularProgressIndicator( CircularProgressIndicator(
strokeWidth: 2, strokeWidth: 2,
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
themeController.currentColor.sc3, themeController.currentColor.sc1,
), ),
), ),
], ],

26
lib/main.dart
View File

@@ -222,7 +222,6 @@ Future<void> startMessagePolling(int ent_type) async {
if (Get.isRegistered<MhMessageController>()) { if (Get.isRegistered<MhMessageController>()) {
Get.find<MhMessageController>().getMessageStatus(); Get.find<MhMessageController>().getMessageStatus();
await controller.getMessageStatus(); await controller.getMessageStatus();
if (controller.model.system_message_read == 1) { if (controller.model.system_message_read == 1) {
await controller.getMessageList("app_system"); await controller.getMessageList("app_system");
final unhandledShareMessages = final unhandledShareMessages =
@@ -236,31 +235,6 @@ Future<void> startMessagePolling(int ent_type) async {
(item['read_time'] == null); (item['read_time'] == null);
}).toList(); }).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) { if (unhandledShareMessages.isNotEmpty) {
for (final message in unhandledShareMessages) { for (final message in unhandledShareMessages) {
final messageId = message['_id']?.toString(); final messageId = message['_id']?.toString();

8
lib/pages/device_bind/after/after_wifi_page_person.dart
View File

@@ -121,7 +121,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -132,7 +132,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -144,7 +144,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -640,7 +640,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
valueColor: valueColor:
AlwaysStoppedAnimation< AlwaysStoppedAnimation<
Color>( Color>(
Colors.white), themeController.currentColor.sc1,),
), ),
) )
else else

4
lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart
View File

@@ -155,7 +155,7 @@ class _SingleBlueteethDeviceCompoentWidgetState
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -368,7 +368,7 @@ class _SingleBlueteethDeviceCompoentWidgetState
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>(Colors.white), valueColor: AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }

6
lib/pages/device_bind/wifi_page.dart
View File

@@ -177,7 +177,7 @@ class _WifiPageState extends State<WifiPage> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
Colors.white), themeController.currentColor.sc1,),
), ),
); );
} }
@@ -191,7 +191,7 @@ class _WifiPageState extends State<WifiPage> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
Colors.white), themeController.currentColor.sc1,),
), ),
); );
} }
@@ -693,7 +693,7 @@ class _WifiPageState extends State<WifiPage> {
valueColor: valueColor:
AlwaysStoppedAnimation< AlwaysStoppedAnimation<
Color>( Color>(
Colors.white), themeController.currentColor.sc1,),
), ),
) )
else else

11
lib/pages/device_bind/wifi_page_person.dart
View File

@@ -120,8 +120,9 @@ class _WifiPagePersonState extends State<WifiPagePerson> {
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor: AlwaysStoppedAnimation<Color>(
AlwaysStoppedAnimation<Color>(Colors.white), themeController.currentColor.sc1,
),
), ),
); );
} }
@@ -132,7 +133,7 @@ class _WifiPagePersonState extends State<WifiPagePerson> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -144,7 +145,7 @@ class _WifiPagePersonState extends State<WifiPagePerson> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>( themeController.currentColor.sc1,),
), ),
); );
} }
@@ -636,7 +637,7 @@ class _WifiPagePersonState extends State<WifiPagePerson> {
valueColor: valueColor:
AlwaysStoppedAnimation< AlwaysStoppedAnimation<
Color>( Color>(
Colors.white), themeController.currentColor.sc1,),
), ),
) )
else else

8
lib/pages/main_bottom/component/MessageWidgetWidget.dart
View File

@@ -169,7 +169,7 @@ class _MessageWidgetWidgetState extends State<MessageWidgetWidget> {
child: Text( child: Text(
label.tr, label.tr,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 2,
style: TextStyle( style: TextStyle(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
@@ -184,15 +184,13 @@ class _MessageWidgetWidgetState extends State<MessageWidgetWidget> {
Widget _buildValueItem(BuildContext context, value) { Widget _buildValueItem(BuildContext context, value) {
return Container( return Container(
constraints: BoxConstraints( constraints: BoxConstraints(minHeight: 60.rpx, maxHeight: 60.rpx),
minHeight: 62.rpx,
),
child: Align( child: Align(
alignment: AlignmentDirectional(-1, 0), alignment: AlignmentDirectional(-1, 0),
child: Text( child: Text(
"${value}", "${value}",
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 2,
style: TextStyle( style: TextStyle(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,

16
lib/pages/main_bottom/e_page.dart
View File

@@ -135,7 +135,13 @@ class _EPageState extends State<EPage> with AutomaticKeepAliveClientMixin {
Widget _buildLoggedInContent() { Widget _buildLoggedInContent() {
return Obx(() { return Obx(() {
if (finalUri.isEmpty) { if (finalUri.isEmpty) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator(
strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>(
themeController.currentColor.sc1,
),
));
} }
// 如果设备列表为空 // 如果设备列表为空
@@ -173,7 +179,13 @@ class _EPageState extends State<EPage> with AutomaticKeepAliveClientMixin {
valueListenable: isPageLoading, valueListenable: isPageLoading,
builder: (context, isLoading, child) { builder: (context, isLoading, child) {
return isLoading return isLoading
? Center(child: CircularProgressIndicator()) ? Center(
child: CircularProgressIndicator(
strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>(
themeController.currentColor.sc1,
),
))
: SizedBox.shrink(); : SizedBox.shrink();
}, },
), ),

15
lib/pages/mh_page/device/component/DeviceComponentWidget.dart
View File

@@ -78,11 +78,11 @@ class _DeviceComponentWidgetState extends State<DeviceComponentWidget> {
return SizedBox( return SizedBox(
width: 24.rpx, width: 24.rpx,
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child:CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>( valueColor:
stringToColor("#929699")), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
return Container(); return Container();
@@ -387,10 +387,11 @@ class _DeviceComponentWidgetState extends State<DeviceComponentWidget> {
return SizedBox( return SizedBox(
width: 24.rpx, width: 24.rpx,
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child:CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>(Colors.white), valueColor:
), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
)
); );
} }
return Container(); return Container();

6
lib/pages/mh_page/device/mht_people_info.dart
View File

@@ -140,7 +140,11 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (isLoading) { if (isLoading) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} }
return LayoutBuilder( return LayoutBuilder(

22
lib/pages/mh_page/device/mht_wifi_page.dart
View File

@@ -169,11 +169,11 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
return SizedBox( return SizedBox(
width: 24.rpx, width: 24.rpx,
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child:CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
if (blueteethBindController.netType.value == 0) { if (blueteethBindController.netType.value == 0) {
@@ -183,8 +183,8 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
if (blueteethBindController.wifiConnectStatus.value == if (blueteethBindController.wifiConnectStatus.value ==
@@ -192,11 +192,11 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
return SizedBox( return SizedBox(
width: 24.rpx, width: 24.rpx,
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child:CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
return Container(); return Container();
@@ -643,10 +643,8 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
CircularProgressIndicator( CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation< AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
Color>( )
Colors.white),
),
) )
else else
getWifiIconByRsso( getWifiIconByRsso(

20
lib/pages/mh_page/device/mht_wifi_page_after.dart
View File

@@ -166,11 +166,11 @@ class _MHTWifiAfterPageState extends State<MHTWifiAfterPage> {
return SizedBox( return SizedBox(
width: 24.rpx, width: 24.rpx,
height: 24.rpx, height: 24.rpx,
child: CircularProgressIndicator( child:CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
if (blueteethBindController.netType.value == 0) { if (blueteethBindController.netType.value == 0) {
@@ -180,8 +180,8 @@ class _MHTWifiAfterPageState extends State<MHTWifiAfterPage> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
if (blueteethBindController.wifiConnectStatus.value == if (blueteethBindController.wifiConnectStatus.value ==
@@ -192,8 +192,8 @@ class _MHTWifiAfterPageState extends State<MHTWifiAfterPage> {
child: CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
); );
} }
return Container(); return Container();
@@ -616,10 +616,8 @@ class _MHTWifiAfterPageState extends State<MHTWifiAfterPage> {
CircularProgressIndicator( CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation< AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
Color>( )
Colors.white),
),
) )
else else
getWifiIconByRsso( getWifiIconByRsso(

2
lib/pages/mh_page/experience_store_page.dart
View File

@@ -152,7 +152,7 @@ class _ExperienceStorePageState extends State<ExperienceStorePage> {
return CircularProgressIndicator( return CircularProgressIndicator(
strokeWidth: 1, strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
); );
} else { } else {
return Container(); return Container();

7
lib/pages/mh_page/help/article.dart
View File

@@ -99,10 +99,11 @@ class _HelpArticleState extends State<HelpArticle> {
Container( Container(
color: const Color(0xFF042C46), color: const Color(0xFF042C46),
alignment: Alignment.center, alignment: Alignment.center,
child: const CircularProgressIndicator( child: CircularProgressIndicator(
strokeWidth: 1,
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(Colors.white), AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), )
), ),
], ],
), ),

6
lib/pages/mh_page/homepage/mht_sleep_report_page.dart
View File

@@ -501,7 +501,11 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
padding: EdgeInsets.fromLTRB( padding: EdgeInsets.fromLTRB(
0, 30.rpx, 0, 0), 0, 30.rpx, 0, 0),
child: Center( child: Center(
child: CircularProgressIndicator()), child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
)),
) )
: hasValidData : hasValidData
? Column( ? Column(

6
lib/pages/mh_page/issue_list_page.dart
View File

@@ -73,7 +73,11 @@ class IssueListPage extends GetView<IssueListController> {
), ),
child: Obx(() { child: Obx(() {
if (controller.model.isLoading) { if (controller.model.isLoading) {
return Center(child: CircularProgressIndicator()); // ✅ 加载中 return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
)); // ✅ 加载中
} }
if (controller.model.issueList.isEmpty) { if (controller.model.issueList.isEmpty) {

6
lib/pages/mh_page/privacy_policy.dart
View File

@@ -94,7 +94,11 @@ class _PrivacyPolicyPageState extends State<PrivacyPolicyPage> {
Expanded( Expanded(
child: Obx(() { child: Obx(() {
if (pdfController.localPdfPath.value == null) { if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} else { } else {
return PDFView( return PDFView(
filePath: pdfController.localPdfPath.value!, filePath: pdfController.localPdfPath.value!,

6
lib/pages/mh_page/test/WebviewTestModel.dart
View File

@@ -565,7 +565,11 @@ class WebviewTestView extends GetComponent<WebviewTestController> {
// return (controller.ready.value && (MainPageBBottomChange.getCurrentIndex() == 2)) // return (controller.ready.value && (MainPageBBottomChange.getCurrentIndex() == 2))
return (controller.ready.value) return (controller.ready.value)
? controller.web.build() ? controller.web.build()
: Center(child: CircularProgressIndicator()); : Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
}), }),
), ),
), ),

6
lib/pages/mh_page/user_agreement_page.dart
View File

@@ -98,7 +98,11 @@ class _UserAgreementPageState extends State<UserAgreementPage> {
Expanded( Expanded(
child: Obx(() { child: Obx(() {
if (pdfController.localPdfPath.value == null) { if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator()); return Center(child: CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} else { } else {
return PDFView( return PDFView(
filePath: pdfController.localPdfPath.value!, filePath: pdfController.localPdfPath.value!,

6
lib/pages/policy/privacy_policy.dart
View File

@@ -114,7 +114,11 @@ class _PrivacyPolicyNewPageState extends State<PrivacyPolicyNewPage> {
builder: (context, isLoading, child) { builder: (context, isLoading, child) {
return isLoading return isLoading
? Center( ? Center(
child: CircularProgressIndicator(), // 加载指示器 child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), // 加载指示器
) )
: SizedBox.shrink(); : SizedBox.shrink();
}, },

6
lib/pages/policy/user_policy.dart
View File

@@ -109,7 +109,11 @@ class _UserPrivacyNewPageState extends State<UserPrivacyNewPage> {
builder: (context, isLoading, child) { builder: (context, isLoading, child) {
return isLoading return isLoading
? Center( ? Center(
child: CircularProgressIndicator(), // 加载指示器 child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), // 加载指示器
) )
: SizedBox.shrink(); : SizedBox.shrink();
}, },

2
lib/pages/repair/apply_repair_page.dart
View File

@@ -87,7 +87,7 @@ class _ApplyRepairPageState extends State<ApplyRepairPage> {
.map((e) => (e['_id']) as String) .map((e) => (e['_id']) as String)
.toList(); .toList();
repairController.deviceListIdLabel = bodyDeviceController.deviceList repairController.deviceListIdLabel = bodyDeviceController.deviceList
.map((e) => (e['code']??e['mac']) as String) .map((e) => (e['code'] ?? e['mac']) as String)
.toList(); .toList();
} }
return LayoutBuilder( return LayoutBuilder(

9
lib/pages/sleep_report/component/CompareSleepWidget.dart
View File

@@ -141,14 +141,7 @@ class _CompareSleepWidgetState extends State<CompareSleepWidget> {
SizedBox( SizedBox(
height: 31.rpx, height: 31.rpx,
), ),
// Padding(
// padding:
// EdgeInsetsDirectional.fromSTEB(30.rpx, 0.rpx, 30.rpx, 0.rpx),
// child: SleepRadarChart(
// today: today,
// yesterday: yesterday,
// ),
// ),
Padding( Padding(
padding: padding:
EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 30.rpx, 0.rpx), EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 30.rpx, 0.rpx),

12
lib/pages/sleep_report/new_sleep_report_page.dart
View File

@@ -555,7 +555,11 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
), ),
Obx(() { Obx(() {
if (sleepReportController.isLoading.value) { if (sleepReportController.isLoading.value) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} }
if (sleepReport == null || sleepReport.isEmpty) { if (sleepReport == null || sleepReport.isEmpty) {
// 空数据 // 空数据
@@ -847,7 +851,11 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
), ),
Obx(() { Obx(() {
if (sleepReportController.isLoading.value) { if (sleepReportController.isLoading.value) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} }
switch (sleepReportController.model.type) { switch (sleepReportController.model.type) {
case 1: case 1:

6
lib/pages/sleep_report/sleep_report_page.dart
View File

@@ -104,7 +104,11 @@ class _SleepReportPageState extends State<SleepReportPage> {
builder: (context, isLoading, child) { builder: (context, isLoading, child) {
return isLoading return isLoading
? Center( ? Center(
child: CircularProgressIndicator(), // 加载指示器 child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
), // 加载指示器
) )
: SizedBox.shrink(); : SizedBox.shrink();
}, },

6
lib/pages/user/privacy_scheme_page.dart
View File

@@ -93,7 +93,11 @@ class _PrivacySchemePageState extends State<PrivacySchemePage> {
Expanded( Expanded(
child: Obx(() { child: Obx(() {
if (pdfController.localPdfPath.value == null) { if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} else { } else {
return PDFView( return PDFView(
filePath: pdfController.localPdfPath.value!, filePath: pdfController.localPdfPath.value!,

6
lib/pages/user/user_scheme_page.dart
View File

@@ -98,7 +98,11 @@ class _UserSchemePageState extends State<UserSchemePage> {
Expanded( Expanded(
child: Obx(() { child: Obx(() {
if (pdfController.localPdfPath.value == null) { if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator()); return Center(child:CircularProgressIndicator(
strokeWidth: 1,
valueColor:
AlwaysStoppedAnimation<Color>(themeController.currentColor.sc1),
));
} else { } else {
return PDFView( return PDFView(
filePath: pdfController.localPdfPath.value!, filePath: pdfController.localPdfPath.value!,

6
lib/pages/xiaoe/xiaoe_page.dart
View File

@@ -104,7 +104,11 @@ class _XiaoEPageState extends State<XiaoEPage> {
builder: (context, isLoading, child) { builder: (context, isLoading, child) {
return isLoading return isLoading
? Center( ? Center(
child: CircularProgressIndicator(), // 加载指示器 child: CircularProgressIndicator(
strokeWidth: 1,
valueColor: AlwaysStoppedAnimation<Color>(
themeController.currentColor.sc1),
), // 加载指示器
) )
: SizedBox.shrink(); : SizedBox.shrink();
}, },