1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix

Browse Source
hmxc
张萌 3 years ago
parent f99caa685c
commit 7c197cdc07
3 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/icons/sos.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

55
lib/pages/services/old_age/old_age_support_page_simple.dart
Unescape View File

@ -75,30 +75,33 @@ class _OldAgeSupportPageSimpleState extends State<OldAgeSupportPageSimple> {
), ),
child: _model == null child: _model == null
? Container() ? Container()
: ListView( : SafeArea(
padding: EdgeInsets.symmetric(horizontal: 32.w), child: ListView(
children: [ padding: EdgeInsets.symmetric(horizontal: 32.w),
550.w.heightBox, children: [
open, 400.w.heightBox,
16.w.heightBox, open,
Row( 16.w.heightBox,
mainAxisAlignment: MainAxisAlignment.center, Row(
children: [ mainAxisAlignment: MainAxisAlignment.center,
'数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}' children: [
.text '数据更新自 ${DateUtil.formatDate(_date!, format: DateFormats.full)}'
.size(22.sp) .text
.color(Colors.black.withOpacity(0.25)) .size(22.sp)
.make(), .color(Colors.black.withOpacity(0.25))
40.w.heightBox, .make(),
], 40.w.heightBox,
), ],
40.w.heightBox, ),
overview(), 40.w.heightBox,
24.w.heightBox, overview(),
statusCard(), 24.w.heightBox,
40.w.heightBox, statusCard(),
bottomCard(), 40.w.heightBox,
], bottomCard(),
40.w.heightBox,
],
),
), ),
), ),
); );
@ -380,7 +383,9 @@ class _OldAgeSupportPageSimpleState extends State<OldAgeSupportPageSimple> {
]) ])
.size(56.sp) .size(56.sp)
.bold .bold
.color(Color(0xFF37C6BD)) .color(_model!.bloodOxygen >= 95
? Color(0xFF37C6BD)
: Colors.red)
.make(), .make(),
Spacer(), Spacer(),
'正常为95%以上' '正常为95%以上'

24
lib/utils/websocket/fire_dialog.dart
Unescape View File

@ -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/fall_model.dart';
import 'package:aku_new_community/utils/websocket/alarm_models/fire_model.dart'; import 'package:aku_new_community/utils/websocket/alarm_models/fire_model.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
class FireDialog { class FireDialog {
@ -19,9 +20,16 @@ class FireDialog {
title: getImage(type), title: getImage(type),
content: Column( content: Column(
children: [ children: [
Text(getTitle(type)), Text(
getTitle(type),
style: TextStyle(color: Colors.black, fontSize: 34.sp),
),
10.hb, 10.hb,
Text(getContent(json, type)), Text(
getContent(json, type),
style: TextStyle(color: Colors.black, fontSize: 26.sp),
textAlign: TextAlign.start,
),
], ],
), ),
actions: [ actions: [
@ -52,7 +60,7 @@ class FireDialog {
return '管家端APP报警'; return '管家端APP报警';
case 4: case 4:
return '跌倒报警'; return '跌倒报警';
case 45: case 5:
return 'SOS紧急联系报警'; return 'SOS紧急联系报警';
default: default:
return ''; return '';
@ -93,35 +101,35 @@ class FireDialog {
R.ASSETS_ICONS_FIRE_ALARM_PNG, R.ASSETS_ICONS_FIRE_ALARM_PNG,
width: 110.w, width: 110.w,
height: 110.w, height: 110.w,
fit: BoxFit.fill, fit: BoxFit.fitHeight,
); );
case 2: case 2:
return Image.asset( return Image.asset(
R.ASSETS_ICONS_DEVICE_ALARM_PNG, R.ASSETS_ICONS_DEVICE_ALARM_PNG,
width: 110.w, width: 110.w,
height: 110.w, height: 110.w,
fit: BoxFit.fill, fit: BoxFit.fitHeight,
); );
case 3: case 3:
return Image.asset( return Image.asset(
R.ASSETS_ICONS_APP_ALARM_PNG, R.ASSETS_ICONS_APP_ALARM_PNG,
width: 110.w, width: 110.w,
height: 110.w, height: 110.w,
fit: BoxFit.fill, fit: BoxFit.fitHeight,
); );
case 4: case 4:
return Image.asset( return Image.asset(
R.ASSETS_ICONS_APP_ALARM_PNG, R.ASSETS_ICONS_APP_ALARM_PNG,
width: 110.w, width: 110.w,
height: 110.w, height: 110.w,
fit: BoxFit.fill, fit: BoxFit.fitHeight,
); );
case 5: case 5:
return Image.asset( return Image.asset(
Assets.icons.sos.path, Assets.icons.sos.path,
width: 110.w, width: 110.w,
height: 110.w, height: 110.w,
fit: BoxFit.fill, fit: BoxFit.fitHeight,
); );
default: default:
return SizedBox(width: 110.w, height: 110.w); return SizedBox(width: 110.w, height: 110.w);

Write Preview
Loading…
Cancel
Save