From 7c197cdc07672ed308d663ba11801941816ace4b Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Mon, 10 Jan 2022 09:34:23 +0800
Subject: [PATCH] bugfix

---
 assets/icons/sos.png                          | Bin 5380 -> 5513 bytes
 .../old_age/old_age_support_page_simple.dart  |  55 ++++++++++--------
 lib/utils/websocket/fire_dialog.dart          |  24 +++++---
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/assets/icons/sos.png b/assets/icons/sos.png
index 33569c785ec16e7592d9dc436c5c30badbc1b4ce..023756519465410414e884fdea9bb8e54ac779f8 100644
GIT binary patch
literal 5513
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

literal 5380
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%0AIv|glf
zt!a$j1otT*da5GZw@(J*(BBw}oBL@pJ1`;libUw5>X0ql>vs~`vcLW_nIxxth)Jis
z{wo&h`Q6%q1*1)aLBA*_LL=f7xejTbS0oLHnUdUb9yt}mXgWoX)#%h|`x?s*eg#A<
zq}FEf5O|bW`u?4x%P=;Cn{|2!9SQIy;gOp9xL;J_P#D=Og5n-buYfWT@Q{99cCqvX
zAjR8rnBbto#Y@1lp|l1amcAE)iv;-mamX4f?mdOr9zkA3h9G#@B(aHZX&8Y>YtUlp
z9{?-_z~_lWy5Rs69=)xP{Y1t21=D8)7#9RWX24Q~G?%Ik%NAxab$|#TFg4aA_C}Do
z@Q@1-HeGlEP=V>8XarxD{w{zB2lp-x*-F7-^obJ@WFkC-#X~?zbMe;@G*f_Y4TzY+
z1FCw&PgHDg2!$)io{^r2mx2*^ShPhT!V3@ZQHk05*xm>V5y3_XGrFO?Y!WS7lS`FG
z(D;GKPB3-E0SZ*&JALeG7$q0M_5t%$5wN^M<7I$lmMoqmnGo`fP)IlP5gW{-BPcH1
zJUW>0QE+OLdPD#Y-YX?a&Z1di*8qeWnCWmiS_o#ddlYQK{y0p}Qyr8cfki0DV^Ahp
zD1^j}1ZCPIDB|2)Q0D#;B3jk=xQ1+aD!v1cT&Lg!Py3$pw)#PbG32)^v%<iPt(Z&t
zG_-t|^LWB)2_{MxOBf;hIr${kOC;k2n{>1GjJGn02TI0AErf*Xf&fOb@NtB|k{X*m
z@?tE{FBwggeHwZ@^C**Ji(ndbN~u_E>X<bJ=7u#=(gWJ0rP9;VkI3@g!ULl3%XJxq
z&4u#+Em*1*9I{Bg9bX41-j0HqQ*eqJ-t(OmKW^4ZY4wP3Y^nIods^*Z&lJF@k2trJ
zLiH1Wxcc~@`a=ByL`!>GyzhJe^7xJ$D<yAy-@72{Fi#v(PNkrc7kR<@<o`dExgg;o
W3FV`A)z?@5AVvn}v?4wG(EkIFhKXJP

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<OldAgeSupportPageSimple> {
         ),
         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<OldAgeSupportPageSimple> {
                   ])
                   .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);