From b736d2df69046cc010e466149f7142f236575a78 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sat, 8 Jan 2022 17:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .fvm/fvm_config.json | 2 +- android/app/build.gradle | 1 - android/build.gradle | 1 - assets/home/sos.png | Bin 0 -> 5380 bytes lib/const/api.dart | 4 +- lib/utils/websocket/AlarmModel.dart | 36 ------- .../websocket/alarm_models/fall_model.dart | 24 +++++ .../websocket/alarm_models/fall_model.g.dart | 18 ++++ .../websocket/alarm_models/fire_model.dart | 25 +++++ .../websocket/alarm_models/fire_model.g.dart | 16 +++ lib/utils/websocket/fier_dialog.dart | 94 +++++++++++------- lib/utils/websocket/web_socket_util.dart | 3 +- tool/config.dart | 4 +- tool/grind.dart | 2 +- 14 files changed, 148 insertions(+), 82 deletions(-) create mode 100644 assets/home/sos.png 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/.fvm/fvm_config.json b/.fvm/fvm_config.json index de7d397..7f3778c 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.0.2", + "flutterSdkVersion": "2.2.0", "flavors": {} } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 4ccc02a..cf9133d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,7 +23,6 @@ if (flutterVersionName == null) { apply plugin: 'com.android.application' apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" diff --git a/android/build.gradle b/android/build.gradle index 649d8f3..e62a641 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,6 @@ buildscript { classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.5' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1' } } diff --git a/assets/home/sos.png b/assets/home/sos.png new file mode 100644 index 0000000000000000000000000000000000000000..33569c785ec16e7592d9dc436c5c30badbc1b4ce GIT binary patch literal 5380 zcmX9?2UJr_*9|0^(85iKfDj=GK|m=%5u&sNf`l&UXMrc}DNP<4LFq^d5|9>DiqgC9 zDI%bN)Ib1{4i-RqQ9zI)z5dtr-?e7lHT&+_XU>^Bv*w)03+9GG{1W^S2t>$;PP2kQ zco2UY;xLHhth*h6FTOkUYn~7Yp8Tir7$mCNgCLKmm7yM_s1rL2c3{p_Gb#k~CQe}2 z;SdCZNim{PFZu8+3=iMNe)Vlx{?V>%_vOaa=SMPCi3>v5e&y(A7zv#DbG1uhhYj2{ zdJX(OvxpZ4=AKUPLPb^lY-H&*)fYc%Ipuu?MQ`MwFfhudJGU4myE; z%Vy&4==U4xd6y^Jl)arc+S`4%0wLB>712tH8*M*Q2U1Y5FV8jczsugKr~kuJO+if( zT~p;ZPaFB7IW5pOS~k%rF?3XgPa#UE%Pv(X&F1)>1Y9xN5bs}pYS!P2?2{l@sN2RV zH?~AP7_TbuG~ji{0f{M^w&_c`J{PH&bJx~$y-U8I2?}j(2tqJr(TK+T2~Lvf0RmaY zV!RF&m4ACTYpeL5=png(NtNIK-af_~at}a+r3JoS$;Ye^XB{f>Q+QL6`&67DMp2HR zbJtP1=|$FKE0S4iy_$n?T)ljC?gu)H5Y zip$3$av2VtPsOR-aK>5#e2;O!vp1SZB^FZwK*Us_B1CBoFa-1XP?Wv^Axjgc2le

6(G1mKC892k=p_+w1`1N4vdoCT{W0(xQ}1c+$EEQ7p_yG2v?kDcKcchB(ZN zI?bhqZ_02imvS|ZnjWT#qy3Ab(hYw@ZKp$v-cWFkOmbna4!Sy^@JobU643(4+rjcF z{Mb8x@Aw9XeX|$AixT1Dk#2;ni{gXw#%}FXBM-9_r5nOBNDfM^0D zh_pD`mc_oWvCjm?RqEkCuny$S6Q^AlEO7uo9%;lc7P<0BSDE!PRYv=^8pixi|D~vA zFNrqf&@~fOZI${&Jn`&W=dGueX;PM3gH;h>cu!O_`$?xWZ(V21Ym78>%q={zcDhfY(rLlLrUh7qR^ZH<kP*Z5j!RoS=hi9AnGIi;VpDUVcOQkcQynF6n!zfU|ZTHF->LBJPYcqQDy z)cC;%vogn8zX{BiCdxsf+oodOZRc@`DfHYF4n+NugMB(60HQl1Ba`( z@PX^IW^+mUZ85zU-mQcO70HJ1IYPNqJ1y-(7Sz)v;lu0C@SSG_faMRsYr?hNP>Cnm z0MT~wM-2)A!z15cJge3 z8T$GH-g%gpLDH{GZEs5bCyx0f$f8Y94jMvEo_yTf@&wZ+quSGUs<9Fr_kC>IprG{3 zq@ySC#M>-|s1Gkd(8qu%16#%g5ON$09vuj^I})) zxb-CsrqiF%TeaIWw40-M8=tdQT}s3!?2F0@B4XU5nDHY%Pg-mw5nPUY&0oLq=Ib=Q zSOed(ry&$<`;`|%vcp$VeAICH#fV~MfE9MkEx?7QuTIOpd`y8E`0{@sYu@tp75bHY zLp`V6f(D&0&p>z9yT@k?G>#iK+*Z3E5%}`RA6Bo+j5NZ@omjo(t*fB}N(IiHsfo3p z=dPDhV)mcok(tovG7j^j{0vB1zXYGm!Fg8LaCLM_0b)R$Z*pIq6}G3y=SE1B`Fwk&Dm!xZe$;|?Ty)+>hAEM4Lp z3ij31)Qr`;RncKdb(P}lZ>-^<#@G6K(tutmof!-5QwQhu?XXe`&blm;iIFz&tw;pt zj!XKv6;wLdD}yc(pY9n14MUnu1SMmg+@Ibj=DH+TaVc2)9ClC5jU0@O<;R)>W7Ush zE+Pmn&$|*vN>73@F?W;CAlCo~z+IfZyrc&dXX!piePap6+5ijc)!+}PTc8wM>4H8_ z1u&NXf)+EM@BV6Oy>CR*qo0+YPV`rL0U8Y^`GgiPyEI>B7&eIQ^RD5Zf}sXPTksj> z52Ebf80huh{gfl76bU*NT)0vtOjb20CKJYQ&Jfq+dq8TpKvF&;Uk%M!C2jWIUMs7% zkNl$=RH0@-`X777+0P|NTNVNWmFfn?wK6?FR_h(XA0P7X5{BI|=qceNzDH|#yn`m>r+3nzl3c;gmwA78n9}n@yb>^0f8-MqyQJ?-+$g&L&VbPG9l!QbO(CBM%H-Z0tySs$aeqNhY&Z_q zl4W@|*KO1xr*`z&Lo#Jh%6IC~rB_3F#?#2k?{jxzb$sWyCPq6KZSuue&rm^!pd)1g zyYzlET-Jam$bsL>T7b$93Gd_&eapI$8(b|80h3gBW z2iS#y9n64Yl7Dh~z)GA3H_IT9NC4LXGQ2QwF|%v&!IzJvx?6=ElkjHm&8inMv|KQP z_EFcXr1Io83tq}DR!rfv*5O?maf4n3%IGZcS)oLGc%k}$?j^(>T3!K{EPv89)Xt?^BWtH5EJ;Lb zO-+NaQ|o)-0lQxn@ND@N?HqvG^3a03pQz!py+0!!by@sbTekh2WqIp~g3elN-^YI4 z%XPS9EdSAg=rEf_9Ui$m@|!t-Dfbj)jAVA{)EK#r=Ls*W%=>Nj^v71y@fNke=LY2r zy9B$=Z@rH_ICFIN5F`E&Z?SmYPJ-^HoO;VdDNb~HMGjMbJxu1w-jL3qB$JAau_D0I zo@riIGC!EKpE+svR){+=`BWqC$s}wHF_I%Lel_DnK;1~Rf$!T-T6Ovcq>=&rN9`vC z5pY9SV*eGFp>JMKp1h3ykpbQgh0VL7E|iad6Ghls!x&^ENbH2_gP(Z|WX#&O#OHr+ zb=XN#X>)Jin%T9eZ22uUNF#06un?UU62=sc&4@9HIGp!y{I!368CIjdbH4G88@U_v zx;LqK?PsD+Wn_vt$0ex*YL$3yHB z?SW)OJ}c5Au1Xq_E){CW4}+K^P8$pfGe5A5cp=V97!u>+gYr_kGLw%NQsDF7 zExG%_AvC)p;qJ?8F9wFyAHZ!&dzW<721`-m_4 zL+&JF(%`VJ4OMMOg(CTx>X%v1bYMiBC%BD24e5P2B)(z<8vOIu7ygC)egSoP0dOL} zwFcHd)&?Y(QXpe$<2zN~_9_#q{Gq{V00J_D2!RC0l7Tjm_c-0VYB=NXPzYp&IlBI_ znu?>%nAn57xnq~n>AB5@Fo^O=vy4uq@*NuKntdqbP6~0ZAM%==MF7nwo(pWK(y&$( zfsk88RsveOmUW3+VhG4zmj-7KpX;Fb=%va9OAT*b@AXcG-Mb&OpaJC^VkhVgw~MS= zU2l3M;wJ`%T9~`NIAsHCev#N0$6Yu=`$*%IzSG*;%Q{vr_6y!%XY;%X$V~Cr&9HE-teN;*xPj6!JHEgP_lW!ErF=Laae8mgIIQ>X znxh{hREL=?^-TENrmjyEaP%3T#J{NjQZethUd@&OtU=A80RC>ly));wa2J1w_myYg zoewS*dTUzr%9&#-;vzIhTmHyBMA(uo zZF#}^cY%LuVkqFS$Wg3b1QeC>6$m{GJOZy@b@H#+%8{C9Y^kHWBaoQ+h3(bz&5X^h zxZ*NWYYiD2RZ`}{w|1;-$<5amp=x9=_?cb!%6Pj=TFpv3m%nFC1TMN=1!t4`1XP?| z=cfhNCeIhAR)lK9Cs!rmqO&am1c&44$88aW<(bpAxsjob^=*9f8p(zR*sD`pB5cw( zk-w!D9(>6ehSN@Cb2dUbCaf+G)UfsPi!#FOAY7*tbLPpvA5l zQsAlbcg{cf8a8%e_owcsJK8K} z-Z6OMRh&41jn#?SQK{9qbKvE1#OK-7hUxF=1hvZFe1eH4bV4{EJ5~_sJp^ z2eU7Qw4Sb1P`FuGwN3GQ)ryZLla3@6hjn^IK~1#4`LGO!7%t;rS8`Wn-BE&Eg`PI=LzT}zFZ-2}Z z&_6e=h3vL}Dr)yk-kkL@dLxc~wYfx4CtiO9E#0OC(I$9mOE>!LmSX0ql>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%1GjJGn02TI0AErf*Xf&fOb@NtB|k{X*m z@?tE{FBwggeHwZ@^C**Ji(ndbN~u_E>XGyzhJe^7xJ$D '$host/static'; diff --git a/lib/utils/websocket/AlarmModel.dart b/lib/utils/websocket/AlarmModel.dart deleted file mode 100644 index a02f7ee..0000000 --- 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; - } -} \ No newline at end of file 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 0000000..87b2cb5 --- /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 0000000..68471e8 --- /dev/null +++ b/lib/utils/websocket/alarm_models/fall_model.g.dart @@ -0,0 +1,18 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'fall_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +FallModel _$FallModelFromJson(Map json) { + return 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 0000000..751b55c --- /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 0000000..092a400 --- /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/fier_dialog.dart b/lib/utils/websocket/fier_dialog.dart index f3e4a42..ff19a97 100644 --- a/lib/utils/websocket/fier_dialog.dart +++ b/lib/utils/websocket/fier_dialog.dart @@ -1,36 +1,36 @@ - import 'dart:convert'; +import 'package:aku_new_community_manager/style/app_style.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_new_community_manager/style/app_style.dart'; - -import 'AlarmModel.dart'; +import 'alarm_models/fall_model.dart'; +import 'alarm_models/fire_model.dart'; class FireDialog { - static Future fireAlert(String subTitle) async { - var json = jsonDecode(subTitle); - AlarmModel alarmModel = AlarmModel.fromJson(json); - - + static Future fireAlert(String subTitle) async { + Map json = jsonDecode(subTitle); + int type = json['type'] as int; await Get.dialog( CupertinoAlertDialog( - title: getImage(alarmModel), + title: getImage(type), content: Column( children: [ - 20.w.heightBox, - Text(getTitle(alarmModel),style: TextStyle(color: Colors.black,fontSize: 34.sp),), - + Text( + getTitle(type), + style: TextStyle(color: Colors.black, fontSize: 34.sp), + ), 10.w.heightBox, - - Text(getContent(alarmModel),style: TextStyle(color: Colors.black,fontSize: 26.sp),textAlign: TextAlign.start,), - + Text( + getContent(json, type), + style: TextStyle(color: Colors.black, fontSize: 26.sp), + textAlign: TextAlign.start, + ), ], ), actions: [ @@ -44,9 +44,8 @@ class FireDialog { ); } - - static String getTitle(AlarmModel alarmModel){ - switch(alarmModel.type){ + static String getTitle(int type) { + switch (type) { case 1: return '发现火灾！请立刻组织疏散人群！'; case 2: @@ -55,40 +54,61 @@ class FireDialog { return '管家端APP报警'; default: return ''; - } } - static String getContent(AlarmModel alarmModel){ - switch(alarmModel.type){ + static String getContent(Map 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: - return '注意：\n于${alarmModel.time},${alarmModel.deviceNo}${alarmModel.deviceName}'+ - '在管家端app上点击了"一键报警",请尽快联系他沟通情况。\n'+ - '${alarmModel.deviceName}联系方式：${alarmModel.alarmNo}\n'+ - '如未能联系到${alarmModel.deviceName}。可择情报警' - ; + 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_HOME_FIRE_ALARM_PNG,width: 100.w,height: 100.w,fit: BoxFit.fitHeight,); + return Image.asset( + R.ASSETS_HOME_FIRE_ALARM_PNG, + width: 100.w, + height: 100.w, + fit: BoxFit.fitHeight, + ); case 2: - return Image.asset(R.ASSETS_HOME_DEVICE_ALARM_PNG,width: 100.w,height: 100.w,fit: BoxFit.fitHeight,); + return Image.asset( + R.ASSETS_HOME_DEVICE_ALARM_PNG, + width: 100.w, + height: 100.w, + fit: BoxFit.fitHeight, + ); case 3: - return Image.asset(R.ASSETS_HOME_APP_ALARM_PNG,width: 100.w,height: 100.w,fit: BoxFit.fitHeight,); + return Image.asset( + R.ASSETS_HOME_APP_ALARM_PNG, + width: 100.w, + height: 100.w, + fit: BoxFit.fitHeight, + ); default: return SizedBox(); - } } - -} \ No newline at end of file +} diff --git a/lib/utils/websocket/web_socket_util.dart b/lib/utils/websocket/web_socket_util.dart index 969edb7..da1ba00 100644 --- a/lib/utils/websocket/web_socket_util.dart +++ b/lib/utils/websocket/web_socket_util.dart @@ -1,10 +1,11 @@ import 'dart:async'; + import 'package:bot_toast/bot_toast.dart'; 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/butlerApp'; +const String baseUri = 'wss://shop.kaidalai.cn/websocket/butlerApp'; enum SOCKETSTATUS { CONNECTED, //已连接 BREAKOFF, //已断开 diff --git a/tool/config.dart b/tool/config.dart index 837f1d9..b9ea4a7 100644 --- a/tool/config.dart +++ b/tool/config.dart @@ -11,9 +11,9 @@ class Config { ///测试包文件夹 static String get apkDevDir => - '/users/datang/team/bee/app/aku_new_community_manager/dev'; + '/users/zhangmeng/team/bee/app/aku_new_community_manager/dev'; ///正式包文件夹aku_new_community_manager static String get apkDir => - '/users/datang/team/bee/app/aku_new_community_manager/release'; + '/users/zhangmeng/team/bee/app/aku_new_community_manager/release'; } diff --git a/tool/grind.dart b/tool/grind.dart index fa1ddf4..0e21713 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -93,6 +93,6 @@ void gen() async { @Task('生成model') void genClean() async { - await Pub.runAsync('build_runner', + await Pub.run('build_runner', arguments: ['build', '--delete-conflicting-outputs']); }