From abc724bc4df0e203d0067459724ee5db6a336a9c Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Thu, 30 Dec 2021 23:14:06 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit052=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E4=B8=BAversion:=201.4.4+20211230?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=88=B7=E6=96=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8E=E6=A1=8C=E9=9D=A2=E2=80=9C=E4=BB=8A?= =?UTF-8?q?=E6=97=A5xx=E2=80=9D=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/release/output.json | 2 +- lib/pages/Works/TJXX/tj_data.dart | 135 +++++++++++++++++------------- lib/pages/tabs/page1_work.dart | 3 + pubspec.yaml | 2 +- 4 files changed, 82 insertions(+), 60 deletions(-) diff --git a/android/app/release/output.json b/android/app/release/output.json index 2fcea2a..b6d3cf7 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20211230,"versionName":"1.4.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20211230,"versionName":"1.4.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/lib/pages/Works/TJXX/tj_data.dart b/lib/pages/Works/TJXX/tj_data.dart index e8331c8..d57b025 100644 --- a/lib/pages/Works/TJXX/tj_data.dart +++ b/lib/pages/Works/TJXX/tj_data.dart @@ -298,20 +298,36 @@ Future getZptjStatisAlone() async { listZptjStatisAlone.clear(); int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - Map map = await getStatisData(statisType: 'zptj', ip: listDwinfoGetList2[i]['dwip']); - map['dwbh'] = listDwinfoGetList2[i]['dwbh']; - map['dwmc'] = listDwinfoGetList2[i]['dwmc']; - map['dwip'] = listDwinfoGetList2[i]['dwip']; - listZptjStatisAlone.add(map); - // if (listZptjStatisAlone.length >= dwSum) { - // //发送统计数据已更新广播 - // eventBus.fire(StatisDataUpdate('统计数据已更新')); - // } - getAllSum('today', listZptjStatisAlone).then((value) { - //mapStatisInfo['今日抓拍'] = value[1]; - listTodayZpjl = value[2]; - //try_setState(); + getStatisData(statisType: 'zptj', ip: listDwinfoGetList2[i]['dwip']).then((map) { + map['dwbh'] = listDwinfoGetList2[i]['dwbh']; + map['dwmc'] = listDwinfoGetList2[i]['dwmc']; + map['dwip'] = listDwinfoGetList2[i]['dwip']; + listZptjStatisAlone.add(map); + // if (listZptjStatisAlone.length >= dwSum) { + // //发送统计数据已更新广播 + // eventBus.fire(StatisDataUpdate('统计数据已更新')); + // } + getAllSum('today', listZptjStatisAlone).then((value) { + //mapStatisInfo['今日抓拍'] = value[1]; + listTodayZpjl = value[2]; + //try_setState(); + }); }); + + // Map map = await getStatisData(statisType: 'zptj', ip: listDwinfoGetList2[i]['dwip']); + // map['dwbh'] = listDwinfoGetList2[i]['dwbh']; + // map['dwmc'] = listDwinfoGetList2[i]['dwmc']; + // map['dwip'] = listDwinfoGetList2[i]['dwip']; + // listZptjStatisAlone.add(map); + // // if (listZptjStatisAlone.length >= dwSum) { + // // //发送统计数据已更新广播 + // // eventBus.fire(StatisDataUpdate('统计数据已更新')); + // // } + // getAllSum('today', listZptjStatisAlone).then((value) { + // //mapStatisInfo['今日抓拍'] = value[1]; + // listTodayZpjl = value[2]; + // //try_setState(); + // }); } //print('listZptjStatis = ${listZptjStatis}'); //StorageDataToFile.writeCounter(json_print(listZptjStatis, 1)); @@ -351,31 +367,32 @@ Future getTodayShtj() async { print('date = $date'); int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - Map map = - await getStatisData(statisType: 'sh_hyc_tj', ip: listDwinfoGetList2[i]['dwip'], date: date); - map['dwbh'] = listDwinfoGetList2[i]['dwbh']; - map['dwmc'] = listDwinfoGetList2[i]['dwmc']; - map['dwip'] = listDwinfoGetList2[i]['dwip']; - listTodayShtj.add(map); - // if (listTodayShtj.length >= dwSum) { - // print('listTodayShtj = $listTodayShtj'); - // //发送统计数据已更新广播 - // eventBus.fire(StatisDataUpdate('统计数据已更新')); - // } - getAllSum('csnum', listTodayShtj).then((value) { - //mapStatisInfo['今日初审'] = value[1]; - listTodayChjl = value[2]; - //try_setState(); - }); - getAllSum('fsnum', listTodayShtj).then((value) { - //mapStatisInfo['今日复审'] = value[1]; - listTodayFhjl = value[2]; - //try_setState(); - }); - getAllSum('sends', listTodayShtj).then((value) { - //mapStatisInfo['今日推送'] = value[1]; - listTodayTsjl = value[2]; - //try_setState(); + getStatisData(statisType: 'sh_hyc_tj', ip: listDwinfoGetList2[i]['dwip'], date: date) + .then((map) { + map['dwbh'] = listDwinfoGetList2[i]['dwbh']; + map['dwmc'] = listDwinfoGetList2[i]['dwmc']; + map['dwip'] = listDwinfoGetList2[i]['dwip']; + listTodayShtj.add(map); + // if (listTodayShtj.length >= dwSum) { + // print('listTodayShtj = $listTodayShtj'); + // //发送统计数据已更新广播 + // eventBus.fire(StatisDataUpdate('统计数据已更新')); + // } + getAllSum('csnum', listTodayShtj).then((value) { + //mapStatisInfo['今日初审'] = value[1]; + listTodayChjl = value[2]; + //try_setState(); + }); + getAllSum('fsnum', listTodayShtj).then((value) { + //mapStatisInfo['今日复审'] = value[1]; + listTodayFhjl = value[2]; + //try_setState(); + }); + getAllSum('sends', listTodayShtj).then((value) { + //mapStatisInfo['今日推送'] = value[1]; + listTodayTsjl = value[2]; + //try_setState(); + }); }); } //print('listZptjStatis = ${listZptjStatis}'); @@ -401,18 +418,19 @@ Future getShtjStatisAlone() async { listShtjStatisAlone.clear(); int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - Map map = await getStatisData(statisType: 'sh_hyc_tj', ip: listDwinfoGetList2[i]['dwip']); - map['dwbh'] = listDwinfoGetList2[i]['dwbh']; - map['dwmc'] = listDwinfoGetList2[i]['dwmc']; - map['dwip'] = listDwinfoGetList2[i]['dwip']; - listShtjStatisAlone.add(map); - // if (listShtjStatisAlone.length >= dwSum) { - // //发送统计数据已更新广播 - // eventBus.fire(StatisDataUpdate('统计数据已更新')); - // } + getStatisData(statisType: 'sh_hyc_tj', ip: listDwinfoGetList2[i]['dwip']).then((map) { + map['dwbh'] = listDwinfoGetList2[i]['dwbh']; + map['dwmc'] = listDwinfoGetList2[i]['dwmc']; + map['dwip'] = listDwinfoGetList2[i]['dwip']; + listShtjStatisAlone.add(map); + // if (listShtjStatisAlone.length >= dwSum) { + // //发送统计数据已更新广播 + // eventBus.fire(StatisDataUpdate('统计数据已更新')); + // } + }); + //print('listZptjStatis = ${listZptjStatis}'); + //StorageDataToFile.writeCounter(json_print(listZptjStatis, 1)); } - //print('listZptjStatis = ${listZptjStatis}'); - //StorageDataToFile.writeCounter(json_print(listZptjStatis, 1)); } ///独立获取车流量统计数据 @@ -434,15 +452,16 @@ Future getClltjStatisAlone() async { listClltjStatisAlone.clear(); int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - Map map = await getStatisData(statisType: 'clltj', ip: listDwinfoGetList2[i]['dwip']); - map['dwbh'] = listDwinfoGetList2[i]['dwbh']; - map['dwmc'] = listDwinfoGetList2[i]['dwmc']; - map['dwip'] = listDwinfoGetList2[i]['dwip']; - listClltjStatisAlone.add(map); - // if (listClltjStatisAlone.length >= dwSum) { - // //发送统计数据已更新广播 - // eventBus.fire(StatisDataUpdate('统计数据已更新')); - // } + getStatisData(statisType: 'clltj', ip: listDwinfoGetList2[i]['dwip']).then((map) { + map['dwbh'] = listDwinfoGetList2[i]['dwbh']; + map['dwmc'] = listDwinfoGetList2[i]['dwmc']; + map['dwip'] = listDwinfoGetList2[i]['dwip']; + listClltjStatisAlone.add(map); + // if (listClltjStatisAlone.length >= dwSum) { + // //发送统计数据已更新广播 + // eventBus.fire(StatisDataUpdate('统计数据已更新')); + // } + }); } //print('listZptjStatis = ${listZptjStatis}'); //StorageDataToFile.writeCounter(json_print(listZptjStatis, 1)); diff --git a/lib/pages/tabs/page1_work.dart b/lib/pages/tabs/page1_work.dart index d14fa4f..ccec771 100644 --- a/lib/pages/tabs/page1_work.dart +++ b/lib/pages/tabs/page1_work.dart @@ -78,6 +78,9 @@ class _Page1_WorksState extends State //监听统计数据改变事件 eventBus.on().listen((event) { print(event.str); + print('listZptjStatisAlone.length：${listZptjStatisAlone.length}，dwSum：${dwSum}'); + // I/flutter (18666): listZptjStatisAlone.length：1，dwSum：5 + updateStatisData(); }); diff --git a/pubspec.yaml b/pubspec.yaml index 5832787..6b06629 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,7 +42,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # version: 1.3.13+20211026 # version: 1.4.1+20211226 # version: 1.4.2+20211227 -version: 1.4.3+20211230 +version: 1.4.4+20211230 environment: sdk: ">=2.7.0 <3.0.0"