From 38ce51614847f5166ff0a16f112d85bfac03e767 Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Sat, 9 Apr 2022 21:50:15 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit119=EF=BC=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E4=B8=BA1.4.24+20220409?= =?UTF-8?q?=E3=80=82=E6=8C=89=E5=85=AC=E5=8F=B8=E8=A6=81=E6=B1=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8D=B3?= =?UTF-8?q?=E4=BD=BF=20=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=20>=20?= =?UTF-8?q?=E6=8A=93=E6=8B=8D=E6=97=B6=E9=97=B4=20+=20=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=97=B4=E9=9A=94=EF=BC=8C=E4=B9=9F=E5=85=81=E8=AE=B8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=BF=9B=E8=A1=8C=E5=88=9D=E5=AE=A1=E5=92=8C=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=8F=AA=E6=98=AF=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/UserInfo.dart | 8 +- lib/pages/Works/HYSH/hysh_group.dart | 184 +++++++++++++-------------- 2 files changed, 95 insertions(+), 97 deletions(-) diff --git a/lib/components/UserInfo.dart b/lib/components/UserInfo.dart index 07f9b64..d39a785 100644 --- a/lib/components/UserInfo.dart +++ b/lib/components/UserInfo.dart @@ -99,10 +99,10 @@ class UserInfo { copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有，' + service_tel.substring(1); copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM'; // 中心地址： - // mapPoi = {text: 四川轻化工大学宜宾校区, pt: {latitude: 28.811272454489966, longitude: 104.67718748580859}, uid: f79d3a036020ce5fa3d23041} - center_latitude = 28.811272454489966; // 区县中心纬度 - center_longitude = 104.69745647939359; // 区县中心经度 - g_zoomLevel = g_zoomLevel_default = 12; //地图默认缩放倍数 + // 点击底图空白处响应：coordinate = {latitude: 28.822633806922394, longitude: 104.75964294854222} + center_latitude = 28.822633806922394; // 区县中心纬度 + center_longitude = 104.75964294854222; // 区县中心经度 + g_zoomLevel = g_zoomLevel_default = 13; //地图默认缩放倍数 break; case 511523: // 江安县 service_tel = ''; diff --git a/lib/pages/Works/HYSH/hysh_group.dart b/lib/pages/Works/HYSH/hysh_group.dart index bd0d1d0..95a5245 100644 --- a/lib/pages/Works/HYSH/hysh_group.dart +++ b/lib/pages/Works/HYSH/hysh_group.dart @@ -176,72 +176,70 @@ class _HyshGroupState extends State { getBtnSizeX( text: '复审提交', fontColor: 0 == _selectedRadio ? Colors.red : Colors.green, - onPressedFun: 1 == sfyc - ? null - : () async { - int ret = -1; - print('等待复审提交确认'); - await Navigator.of(context) - .push( - PageRouteBuilder( - opaque: false, - pageBuilder: (context, animation, secondaryAnimation) => - CustomDialogHysh( - shjg: 0 == _selectedRadio ? hyc_text : fhyc_text, - title: '复审', - content: - '是否进行复审提交${tsjj && 0 == sfyc ? '、同时推送交警' : ''}？\n${1 == sfyc ? _sfcyTextTrue : ''}'), - ), - ) - .then((value) async { - print('value = $value'); - if (value) { - print('用户已确认，开始处理复审提交！'); + // onPressedFun: 1 == sfyc + // ? null + // : () async { + onPressedFun: () async { + int ret = -1; + print('等待复审提交确认'); + await Navigator.of(context) + .push( + PageRouteBuilder( + opaque: false, + pageBuilder: (context, animation, secondaryAnimation) => CustomDialogHysh( + shjg: 0 == _selectedRadio ? hyc_text : fhyc_text, + title: '复审', + content: + '是否进行复审提交${tsjj && 0 == sfyc ? '、同时推送交警' : ''}？\n${1 == sfyc ? _sfcyTextTrue : ''}'), + ), + ) + .then((value) async { + print('value = $value'); + if (value) { + print('用户已确认，开始处理复审提交！'); //复审接口增加是否延迟字段 sfyc （是否延迟）整型 必须 是否延误，0-正常 1-延误。延误状态的不推送 // 初审不用判断，sfyc 直接提交0即可。只有复审的时候才判断时间 // A、若在规定时间内，则 int sfyc = 0，审核完毕后正常推送交警。 // B、若超出规定时间，即当前时间>抓拍时间+间隔时间，则 sfyc = 1，不推送交警。 - //设置 sfyc 和 tsjj - set_sfyc_tsjj(int.parse(listGetZpjl[widget.index]['zpsj'])) - .then((value) async { - hyshContentFirstAudit( - widget.id, - widget.index, - mapHyshlx[hyshlx]['audit_workflow'], - topTabs_map['auditShuoming_Controller_List'][widget.index] - .text, - topTabs_map['auditTitle'][widget.index], - sfyc: sfyc, - ).then((value) { - eventBus.fire(HycsDataUpdateEvent( - '${mapHyshlx[hyshlx]['text']}数据已更新')); - //必须等待审核过程完成后，再处理同时推送交警，否则推送交警总是失败 - print('tsjj = $tsjj'); - if (tsjj) { - print('before tsjjFun(widget.id, _plateAndID)'); + //设置 sfyc 和 tsjj + set_sfyc_tsjj(int.parse(listGetZpjl[widget.index]['zpsj'])) + .then((value) async { + hyshContentFirstAudit( + widget.id, + widget.index, + mapHyshlx[hyshlx]['audit_workflow'], + topTabs_map['auditShuoming_Controller_List'][widget.index].text, + topTabs_map['auditTitle'][widget.index], + sfyc: sfyc, + ).then((value) { + eventBus.fire( + HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新')); + //必须等待审核过程完成后，再处理同时推送交警，否则推送交警总是失败 + print('tsjj = $tsjj'); + if (tsjj) { + print('before tsjjFun(widget.id, _plateAndID)'); - String _plateAndID = - topTabs_map['car_number_List'].toString() + - '(ID:${widget.id.toString()})'; + String _plateAndID = topTabs_map['car_number_List'].toString() + + '(ID:${widget.id.toString()})'; - tsjjFun(widget.id, _plateAndID); + tsjjFun(widget.id, _plateAndID); - print('after tsjjFun(widget.id, _plateAndID)'); + print('after tsjjFun(widget.id, _plateAndID)'); - Fluttertoast.showToast( - msg: '$_plateAndID 已推送交警，请等待返回结果。', - gravity: ToastGravity.CENTER); - } - }); - }); - } else { - print('用户取消了复审提交'); + Fluttertoast.showToast( + msg: '$_plateAndID 已推送交警，请等待返回结果。', + gravity: ToastGravity.CENTER); } }); - Navigator.pop(context, ret); - }, + }); + } else { + print('用户取消了复审提交'); + } + }); + Navigator.pop(context, ret); + }, width: 90.0, height: 34.0), //'复审提交' getBtnSizeX( @@ -271,46 +269,46 @@ class _HyshGroupState extends State { getBtnSizeX( text: '初审提交', fontColor: 0 == _selectedRadio ? Colors.red : Colors.green, - onPressedFun: 1 == sfyc - ? null - : () async { - int ret = -1; - print('等待初审提交确认'); - await Navigator.of(context) - .push( - PageRouteBuilder( - opaque: false, - pageBuilder: (context, animation, secondaryAnimation) => - CustomDialogHysh( - shjg: 0 == _selectedRadio ? hyc_text : fhyc_text, - title: '初审', - content: '是否进行初审提交？'), - ), - ) - .then((value) async { - print('value = $value'); - if (value) { - print('用户已确认，开始处理初审提交！'); - //return; + // onPressedFun: 1 == sfyc + // ? null + // : () async { + onPressedFun: () async { + int ret = -1; + print('等待初审提交确认'); + await Navigator.of(context) + .push( + PageRouteBuilder( + opaque: false, + pageBuilder: (context, animation, secondaryAnimation) => + CustomDialogHysh( + shjg: 0 == _selectedRadio ? hyc_text : fhyc_text, + title: '初审', + content: '是否进行初审提交？'), + ), + ) + .then((value) async { + print('value = $value'); + if (value) { + print('用户已确认，开始处理初审提交！'); + //return; - hyshContentFirstAudit( - widget.id, - widget.index, - mapHyshlx[hyshlx]['audit_workflow'], - topTabs_map['auditShuoming_Controller_List'][widget.index] - .text, - topTabs_map['auditTitle'][widget.index], - sfyc: 0, - ).then((value) { - eventBus.fire( - HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新')); - }); - } else { - print('用户取消了初审提交'); - } - }); - Navigator.pop(context, ret); - }, + hyshContentFirstAudit( + widget.id, + widget.index, + mapHyshlx[hyshlx]['audit_workflow'], + topTabs_map['auditShuoming_Controller_List'][widget.index].text, + topTabs_map['auditTitle'][widget.index], + sfyc: 0, + ).then((value) { + eventBus + .fire(HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新')); + }); + } else { + print('用户取消了初审提交'); + } + }); + Navigator.pop(context, ret); + }, width: 90.0), //'初审提交' getBtnSizeX( text: "取消",