From b339e6df86f841ccf98c181697888a2d5f8d42f8 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sun, 16 Jan 2022 17:48:15 +0800 Subject: [PATCH] bug fix --- assets/home/sos.png | Bin 5380 -> 5513 bytes lib/const/resource.dart | 238 ++++++++++-------- .../websocket/alarm_models/fire_model.g.dart | 18 +- lib/utils/websocket/fier_dialog.dart | 35 ++- tool/grind.dart | 13 +- 5 files changed, 182 insertions(+), 122 deletions(-) diff --git a/assets/home/sos.png b/assets/home/sos.png index 33569c785ec16e7592d9dc436c5c30badbc1b4ce..023756519465410414e884fdea9bb8e54ac779f8 100644 GIT binary patch literal 5513 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 literal 5380 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 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?, - ); +FireModel _$FireModelFromJson(Map json) { + return 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/fier_dialog.dart b/lib/utils/websocket/fier_dialog.dart index ff19a97..deffc26 100644 --- a/lib/utils/websocket/fier_dialog.dart +++ b/lib/utils/websocket/fier_dialog.dart @@ -52,6 +52,10 @@ class FireDialog { return '设备故障'; case 3: return '管家端APP报警'; + case 4: + return '跌倒报警'; + case 5: + return 'SOS紧急联系报警'; default: return ''; } @@ -89,26 +93,43 @@ class FireDialog { case 1: return Image.asset( R.ASSETS_HOME_FIRE_ALARM_PNG, - width: 100.w, - height: 100.w, + width: 110.w, + height: 110.w, fit: BoxFit.fitHeight, ); case 2: return Image.asset( R.ASSETS_HOME_DEVICE_ALARM_PNG, - width: 100.w, - height: 100.w, + width: 110.w, + height: 110.w, fit: BoxFit.fitHeight, ); case 3: return Image.asset( R.ASSETS_HOME_APP_ALARM_PNG, - width: 100.w, - height: 100.w, + width: 110.w, + height: 110.w, + fit: BoxFit.fitHeight, + ); + case 4: + return Image.asset( + R.ASSETS_HOME_APP_ALARM_PNG, + width: 110.w, + height: 110.w, + fit: BoxFit.fitHeight, + ); + case 5: + return Image.asset( + R.ASSETS_HOME_SOS_PNG, + width: 110.w, + height: 110.w, fit: BoxFit.fitHeight, ); default: - return SizedBox(); + return SizedBox( + width: 110.w, + height: 110.w, + ); } } } diff --git a/tool/grind.dart b/tool/grind.dart index 0e21713..b859482 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -93,6 +93,15 @@ void gen() async { @Task('生成model') void genClean() async { - await Pub.run('build_runner', - arguments: ['build', '--delete-conflicting-outputs']); + await runAsync( + 'fvm', + arguments: [ + 'flutter', + 'pub', + 'run', + 'build_runner', + 'build', + '--delete-conflicting-outputs' + ], + ); }