From 7eaa5b917e3686982b86a77cd676b1c4f27a31a2 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sat, 8 Jan 2022 17:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=8B=E7=8E=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/icons/sos.png | Bin 0 -> 5380 bytes lib/constants/api.dart | 6 + lib/gen/assets.gen.dart | 3 + lib/models/bracelet/bracelet_model.dart | 48 ++++++++ lib/models/bracelet/bracelet_model.g.dart | 21 ++++ .../old_age/old_age_support_page_simple.dart | 103 ++++++++++++------ lib/utils/websocket/AlarmModel.dart | 36 ------ .../websocket/alarm_models/fall_model.dart | 24 ++++ .../websocket/alarm_models/fall_model.g.dart | 16 +++ .../websocket/alarm_models/fire_model.dart | 25 +++++ .../websocket/alarm_models/fire_model.g.dart | 16 +++ lib/utils/websocket/fire_dialog.dart | 59 +++++++--- lib/utils/websocket/web_socket_util.dart | 2 +- 13 files changed, 273 insertions(+), 86 deletions(-) create mode 100644 assets/icons/sos.png create mode 100644 lib/models/bracelet/bracelet_model.dart create mode 100644 lib/models/bracelet/bracelet_model.g.dart delete mode 100644 lib/utils/websocket/AlarmModel.dart create mode 100644 lib/utils/websocket/alarm_models/fall_model.dart create mode 100644 lib/utils/websocket/alarm_models/fall_model.g.dart create mode 100644 lib/utils/websocket/alarm_models/fire_model.dart create mode 100644 lib/utils/websocket/alarm_models/fire_model.g.dart diff --git a/assets/icons/sos.png b/assets/icons/sos.png new file mode 100644 index 0000000000000000000000000000000000000000..33569c785ec16e7592d9dc436c5c30badbc1b4ce GIT binary patch literal 5380 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 '/user/aqg/getData'; } class _Login { diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index cee00ca0..4dc06765 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -730,6 +730,9 @@ class $AssetsIconsGen { AssetGenImage get shoppingMall => const AssetGenImage('assets/icons/shopping_mall.png'); + /// File path: assets/icons/sos.png + AssetGenImage get sos => const AssetGenImage('assets/icons/sos.png'); + /// File path: assets/icons/system_notice.png AssetGenImage get systemNotice => const AssetGenImage('assets/icons/system_notice.png'); diff --git a/lib/models/bracelet/bracelet_model.dart b/lib/models/bracelet/bracelet_model.dart new file mode 100644 index 00000000..f51660d2 --- /dev/null +++ b/lib/models/bracelet/bracelet_model.dart @@ -0,0 +1,48 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'bracelet_model.g.dart'; + +@JsonSerializable() +class BraceletModel { + final int sbp; + final int todaySteps; + final int bloodOxygen; + final int switchType; + final int dbp; + final int heartRate; + final int remainingPower; + final int detectionDays; + final int alarmNums; + final int fallNums; + + factory BraceletModel.fromJson(Map json) => + _$BraceletModelFromJson(json); + + String get switchTypeString { + switch (switchType) { + case 0: + return '开机'; + case 1: + return '关机'; + case 2: + return '开机'; + case 3: + return '低电通知'; + default: + return ''; + } + } + + const BraceletModel({ + required this.sbp, + required this.todaySteps, + required this.bloodOxygen, + required this.switchType, + required this.dbp, + required this.heartRate, + required this.remainingPower, + required this.detectionDays, + required this.alarmNums, + required this.fallNums, + }); +} diff --git a/lib/models/bracelet/bracelet_model.g.dart b/lib/models/bracelet/bracelet_model.g.dart new file mode 100644 index 00000000..c53c1495 --- /dev/null +++ b/lib/models/bracelet/bracelet_model.g.dart @@ -0,0 +1,21 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'bracelet_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +BraceletModel _$BraceletModelFromJson(Map json) => + BraceletModel( + sbp: json['sbp'] as int, + todaySteps: json['todaySteps'] as int, + bloodOxygen: json['bloodOxygen'] as int, + switchType: json['switchType'] as int, + dbp: json['dbp'] as int, + heartRate: json['heartRate'] as int, + remainingPower: json['remainingPower'] as int, + detectionDays: json['detectionDays'] as int, + alarmNums: json['alarmNums'] as int, + fallNums: json['fallNums'] as int, + ); 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 c3fd6730..b5b5c071 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 @@ -1,6 +1,12 @@ +import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/models/bracelet/bracelet_model.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:dio/dio.dart'; +import 'package:flustars/flustars.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -15,6 +21,23 @@ class OldAgeSupportPageSimple extends StatefulWidget { } class _OldAgeSupportPageSimpleState extends State { + BraceletModel? _model; + DateTime? _date; + + @override + void initState() { + var cancel = BotToast.showLoading(); + getData(); + cancel(); + super.initState(); + } + + @override + void dispose() { + BotToast.closeAllLoading(); + super.dispose(); + } + @override Widget build(BuildContext context) { var open = Row( @@ -27,7 +50,7 @@ class _OldAgeSupportPageSimpleState extends State { color: Color(0xFF57DAD2), ), 4.w.widthBox, - '设备 已开机' + '设备 ${_model?.switchTypeString}' .text .size(26.sp) .lineHeight(1.2) @@ -50,35 +73,49 @@ class _OldAgeSupportPageSimpleState extends State { end: Alignment.bottomCenter, colors: [Colors.white, Color(0xFFC0E5DC).withOpacity(0.355)]), ), - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 32.w), - children: [ - 550.w.heightBox, - open, - 16.w.heightBox, - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - '数据更新自 2022年1月1日 18:21:15' - .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(), - ], - ), + 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(), + ], + ), ), ); } + Future getData() async { + Response base = + await NetUtil().dio!.get(API.bracelet.data, queryParameters: { + 'imei': 863204050238280, + }); + if (base.data != null) { + _model = BraceletModel.fromJson(base.data); + _date = DateTime.now(); + } + setState(() {}); + } + Container bottomCard() { var left = Column( children: [ @@ -204,7 +241,7 @@ class _OldAgeSupportPageSimpleState extends State { ], ), Spacer(), - '141' + '${_model?.heartRate}' .richText .withTextSpanChildren([ ' 次/分' @@ -248,7 +285,7 @@ class _OldAgeSupportPageSimpleState extends State { ], ), Spacer(), - '3' + '${_model?.fallNums}' .richText .withTextSpanChildren([ ' 次' @@ -292,7 +329,7 @@ class _OldAgeSupportPageSimpleState extends State { ], ), Spacer(), - '1042' + '${_model?.todaySteps}' .richText .withTextSpanChildren([ ' 步' @@ -332,7 +369,7 @@ class _OldAgeSupportPageSimpleState extends State { Spacer(), Row( children: [ - '98' + '${_model?.bloodOxygen}' .richText .withTextSpanChildren([ ' %' @@ -375,7 +412,7 @@ class _OldAgeSupportPageSimpleState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ '剩余电量'.text.size(28.sp).color(Colors.black.withOpacity(0.65)).make(), - '58' + '${_model?.remainingPower}' .richText .withTextSpanChildren([ ' %' @@ -401,7 +438,7 @@ class _OldAgeSupportPageSimpleState extends State { .size(28.sp) .color(Colors.black.withOpacity(0.45)) .make(), - '58' + '${_model?.detectionDays}' .richText .withTextSpanChildren([ ' 天' @@ -427,7 +464,7 @@ class _OldAgeSupportPageSimpleState extends State { .size(28.sp) .color(Colors.black.withOpacity(0.45)) .make(), - '5' + '${_model?.alarmNums}' .richText .withTextSpanChildren([ ' 次' diff --git a/lib/utils/websocket/AlarmModel.dart b/lib/utils/websocket/AlarmModel.dart deleted file mode 100644 index 90fe198b..00000000 --- a/lib/utils/websocket/AlarmModel.dart +++ /dev/null @@ -1,36 +0,0 @@ -class AlarmModel { - String? alarmNo; - String? alarmType; - String? deviceName; - String? deviceNo; - String? time; - int? type; - - AlarmModel( - {this.alarmNo, - this.alarmType, - this.deviceName, - this.deviceNo, - this.time, - this.type}); - - AlarmModel.fromJson(Map json) { - alarmNo = json['alarmNo']; - alarmType = json['alarmType']; - deviceName = json['deviceName']; - deviceNo = json['deviceNo']; - time = json['time']; - type = json['type']; - } - - Map toJson() { - final Map data = new Map(); - data['alarmNo'] = this.alarmNo; - data['alarmType'] = this.alarmType; - data['deviceName'] = this.deviceName; - data['deviceNo'] = this.deviceNo; - data['time'] = this.time; - data['type'] = this.type; - return data; - } -} diff --git a/lib/utils/websocket/alarm_models/fall_model.dart b/lib/utils/websocket/alarm_models/fall_model.dart new file mode 100644 index 00000000..87b2cb5c --- /dev/null +++ b/lib/utils/websocket/alarm_models/fall_model.dart @@ -0,0 +1,24 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'fall_model.g.dart'; + +@JsonSerializable() +class FallModel { + final String? userName; + final String? tel; + final String? address; + final num? lon; + final num? lat; + final int? type; + factory FallModel.fromJson(Map json) => + _$FallModelFromJson(json); + + const FallModel({ + this.userName, + this.tel, + this.address, + this.lon, + this.lat, + this.type, + }); +} diff --git a/lib/utils/websocket/alarm_models/fall_model.g.dart b/lib/utils/websocket/alarm_models/fall_model.g.dart new file mode 100644 index 00000000..7af23b29 --- /dev/null +++ b/lib/utils/websocket/alarm_models/fall_model.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'fall_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +FallModel _$FallModelFromJson(Map json) => FallModel( + userName: json['userName'] as String?, + tel: json['tel'] as String?, + address: json['address'] as String?, + lon: json['lon'] as num?, + lat: json['lat'] as num?, + type: json['type'] as int?, + ); diff --git a/lib/utils/websocket/alarm_models/fire_model.dart b/lib/utils/websocket/alarm_models/fire_model.dart new file mode 100644 index 00000000..751b55cc --- /dev/null +++ b/lib/utils/websocket/alarm_models/fire_model.dart @@ -0,0 +1,25 @@ +import 'package:json_annotation/json_annotation.dart'; + +part 'fire_model.g.dart'; + +@JsonSerializable() +class FireModel { + String? alarmNo; + String? alarmType; + String? deviceName; + String? deviceNo; + String? time; + int? type; + + factory FireModel.fromJson(Map json) => + _$FireModelFromJson(json); + + FireModel({ + this.alarmNo, + this.alarmType, + this.deviceName, + this.deviceNo, + this.time, + this.type, + }); +} diff --git a/lib/utils/websocket/alarm_models/fire_model.g.dart b/lib/utils/websocket/alarm_models/fire_model.g.dart new file mode 100644 index 00000000..092a4003 --- /dev/null +++ b/lib/utils/websocket/alarm_models/fire_model.g.dart @@ -0,0 +1,16 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'fire_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +FireModel _$FireModelFromJson(Map json) => FireModel( + alarmNo: json['alarmNo'] as String?, + alarmType: json['alarmType'] as String?, + deviceName: json['deviceName'] as String?, + deviceNo: json['deviceNo'] as String?, + time: json['time'] as String?, + type: json['type'] as int?, + ); diff --git a/lib/utils/websocket/fire_dialog.dart b/lib/utils/websocket/fire_dialog.dart index 39cce13e..8e04959e 100644 --- a/lib/utils/websocket/fire_dialog.dart +++ b/lib/utils/websocket/fire_dialog.dart @@ -1,29 +1,27 @@ import 'dart:convert'; -import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/pages/tab_navigator.dart'; import 'package:aku_new_community/utils/developer_util.dart'; 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:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'AlarmModel.dart'; - class FireDialog { static fireAlarm(String content) async { var json = jsonDecode(content); - AlarmModel alarmModel = AlarmModel.fromJson(json); + int type = json['type'] as int; await Get.dialog( CupertinoAlertDialog( - title: getImage(alarmModel), + title: getImage(type), content: Column( children: [ - Text(getTitle(alarmModel)), + Text(getTitle(type)), 10.hb, - Text(getContent(alarmModel)), + Text(getContent(json, type)), ], ), actions: [ @@ -44,37 +42,52 @@ class FireDialog { ); } - static String getTitle(AlarmModel alarmModel) { - switch (alarmModel.type) { + static String getTitle(int type) { + switch (type) { case 1: return '发现火灾！请立刻组织疏散人群！'; case 2: return '设备故障'; case 3: return '管家端APP报警'; + case 4: + return '跌倒报警'; + case 45: + return 'SOS紧急联系报警'; default: return ''; } } - static String getContent(AlarmModel alarmModel) { - switch (alarmModel.type) { + static String getContent(dynamic json, int type) { + switch (type) { case 1: + var alarmModel = FireModel.fromJson(json); return '于${alarmModel.time},${alarmModel.deviceName}附近出现了火灾报警，请各位业主、租户保持镇静，不要慌乱，有序开始撤离！'; case 2: + var alarmModel = FireModel.fromJson(json); return '于${alarmModel.time},小区内有设备${alarmModel.deviceName}发生了报警，请物业负责人员尽快前往现场排查故障！'; case 3: + var alarmModel = FireModel.fromJson(json); return '注意：\n于${alarmModel.time},${alarmModel.deviceNo}${alarmModel.deviceName}' + '在管家端app上点击了"一键报警",请尽快联系他沟通情况。\n' + '${alarmModel.deviceName}联系方式：${alarmModel.alarmNo}\n' + '如未能联系到${alarmModel.deviceName}。可择情报警'; + case 4: + var alarmModel = FallModel.fromJson(json); + return '注意：\n\n有住户 ${alarmModel.userName} 发生跌倒情况，请及时上门或联系人员前往查看，住户联系方式：${alarmModel.tel}\n\n' + + '跌倒位置————\n${alarmModel.address}，经度${alarmModel.lon}，纬度${alarmModel.lat}\n\n如未能联系到住户，可择情报警'; + case 5: + var alarmModel = FallModel.fromJson(json); + return '注意：\n\n有住户 ${alarmModel.userName} 使用了SOS紧急联系报警，请及时上门或联系人员前往查看，住户联系方式：${alarmModel.tel}\n\n' + + '跌倒位置————\n${alarmModel.address}，经度${alarmModel.lon}，纬度${alarmModel.lat}\n\n如未能联系到住户，可择情报警'; default: return ''; } } - static Widget getImage(AlarmModel alarmModel) { - switch (alarmModel.type) { + static Widget getImage(int type) { + switch (type) { case 1: return Image.asset( R.ASSETS_ICONS_FIRE_ALARM_PNG, @@ -96,8 +109,22 @@ class FireDialog { height: 110.w, fit: BoxFit.fill, ); + case 4: + return Image.asset( + R.ASSETS_ICONS_APP_ALARM_PNG, + width: 110.w, + height: 110.w, + fit: BoxFit.fill, + ); + case 5: + return Image.asset( + Assets.icons.sos.path, + width: 110.w, + height: 110.w, + fit: BoxFit.fill, + ); default: - return SizedBox(); + return SizedBox(width: 110.w, height: 110.w); } } } diff --git a/lib/utils/websocket/web_socket_util.dart b/lib/utils/websocket/web_socket_util.dart index fe5e00f4..e8892c37 100644 --- a/lib/utils/websocket/web_socket_util.dart +++ b/lib/utils/websocket/web_socket_util.dart @@ -6,7 +6,7 @@ import 'package:power_logger/power_logger.dart'; import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; -const String baseUri = 'wss://test.kaidalai.cn/websocket/app'; +const String baseUri = 'wss://shop.kaidalai.cn/websocket/app'; enum SOCKETSTATUS { CONNECTED, //已连接 BREAKOFF, //已断开