diff --git a/assets/icons/sos.png b/assets/icons/sos.png index 33569c78..02375651 100644 Binary files a/assets/icons/sos.png and b/assets/icons/sos.png differ diff --git a/lib/pages/services/old_age/old_age_support_page_simple.dart b/lib/pages/services/old_age/old_age_support_page_simple.dart index a9c9752a..64de95d6 100644 --- a/lib/pages/services/old_age/old_age_support_page_simple.dart +++ b/lib/pages/services/old_age/old_age_support_page_simple.dart @@ -75,30 +75,33 @@ class _OldAgeSupportPageSimpleState extends State { ), child: _model == null ? Container() - : ListView( - padding: EdgeInsets.symmetric(horizontal: 32.w), - children: [ - 550.w.heightBox, - open, - 16.w.heightBox, - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - '数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}' - .text - .size(22.sp) - .color(Colors.black.withOpacity(0.25)) - .make(), - 40.w.heightBox, - ], - ), - 40.w.heightBox, - overview(), - 24.w.heightBox, - statusCard(), - 40.w.heightBox, - bottomCard(), - ], + : SafeArea( + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w), + children: [ + 400.w.heightBox, + open, + 16.w.heightBox, + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + '数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}' + .text + .size(22.sp) + .color(Colors.black.withOpacity(0.25)) + .make(), + 40.w.heightBox, + ], + ), + 40.w.heightBox, + overview(), + 24.w.heightBox, + statusCard(), + 40.w.heightBox, + bottomCard(), + 40.w.heightBox, + ], + ), ), ), ); @@ -380,7 +383,9 @@ class _OldAgeSupportPageSimpleState extends State { ]) .size(56.sp) .bold - .color(Color(0xFF37C6BD)) + .color(_model!.bloodOxygen >= 95 + ? Color(0xFF37C6BD) + : Colors.red) .make(), Spacer(), '正常为95%以上' diff --git a/lib/utils/websocket/fire_dialog.dart b/lib/utils/websocket/fire_dialog.dart index 8e04959e..7afce655 100644 --- a/lib/utils/websocket/fire_dialog.dart +++ b/lib/utils/websocket/fire_dialog.dart @@ -7,6 +7,7 @@ import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/websocket/alarm_models/fall_model.dart'; import 'package:aku_new_community/utils/websocket/alarm_models/fire_model.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; import 'package:get/get.dart'; class FireDialog { @@ -19,9 +20,16 @@ class FireDialog { title: getImage(type), content: Column( children: [ - Text(getTitle(type)), + Text( + getTitle(type), + style: TextStyle(color: Colors.black, fontSize: 34.sp), + ), 10.hb, - Text(getContent(json, type)), + Text( + getContent(json, type), + style: TextStyle(color: Colors.black, fontSize: 26.sp), + textAlign: TextAlign.start, + ), ], ), actions: [ @@ -52,7 +60,7 @@ class FireDialog { return '管家端APP报警'; case 4: return '跌倒报警'; - case 45: + case 5: return 'SOS紧急联系报警'; default: return ''; @@ -93,35 +101,35 @@ class FireDialog { R.ASSETS_ICONS_FIRE_ALARM_PNG, width: 110.w, height: 110.w, - fit: BoxFit.fill, + fit: BoxFit.fitHeight, ); case 2: return Image.asset( R.ASSETS_ICONS_DEVICE_ALARM_PNG, width: 110.w, height: 110.w, - fit: BoxFit.fill, + fit: BoxFit.fitHeight, ); case 3: return Image.asset( R.ASSETS_ICONS_APP_ALARM_PNG, width: 110.w, height: 110.w, - fit: BoxFit.fill, + fit: BoxFit.fitHeight, ); case 4: return Image.asset( R.ASSETS_ICONS_APP_ALARM_PNG, width: 110.w, height: 110.w, - fit: BoxFit.fill, + fit: BoxFit.fitHeight, ); case 5: return Image.asset( Assets.icons.sos.path, width: 110.w, height: 110.w, - fit: BoxFit.fill, + fit: BoxFit.fitHeight, ); default: return SizedBox(width: 110.w, height: 110.w);