diff --git a/android/app/release/output.json b/android/app/release/output.json index 99d2bac..e9ecaef 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220426,"versionName":"1.4.27","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":20220426,"versionName":"1.4.28","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/HYSH/hysh_content_new.dart b/lib/pages/Works/HYSH/hysh_content_new.dart index 640db2f..621dd94 100644 --- a/lib/pages/Works/HYSH/hysh_content_new.dart +++ b/lib/pages/Works/HYSH/hysh_content_new.dart @@ -97,7 +97,7 @@ class _HyshPageState extends State with SingleTickerProviderStat // getListFlields(); // }); - //黑监听烟初审数据审核Radio选项改变事件 + //监听黑烟初审数据审核Radio选项改变事件 eventBus.on().listen((event) { print(event.str); print('event.selectedRadio = ${event.selectedRadio.toString()}'); diff --git a/lib/pages/Works/HYSH/hysh_group.dart b/lib/pages/Works/HYSH/hysh_group.dart index 95a5245..9107bdc 100644 --- a/lib/pages/Works/HYSH/hysh_group.dart +++ b/lib/pages/Works/HYSH/hysh_group.dart @@ -92,7 +92,8 @@ class _HyshGroupState extends State { getHyshItems(int index) { return Container( width: ScreenUtil().setWidth(1022), - height: ScreenUtil().setHeight(550), + // height: ScreenUtil().setHeight(550), + height: ScreenUtil().setHeight(480), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all( @@ -325,6 +326,88 @@ class _HyshGroupState extends State { //5.3、得到审核结果组件 Widget getShjg(int index) { + return Container( + width: ScreenUtil().setWidth(1022), + // height: ScreenUtil().setHeight(175), + height: ScreenUtil().setHeight(110), + child: Column( + children: [ + SizedBox(height: ScreenUtil().setHeight(15)), + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox(width: my_marginLeft), + Text((widget.hyshlx == 'hyfh' ? '复审' : '初审') + '结果: ', + style: TextStyle( + fontSize: widget.fontSize, + color: 0 == _selectedRadio ? Colors.red : Colors.green)), + CustomRadioWidget( + value: 0, + title: mapHyshlx[hyshlx]['nick_text'] + "为黑烟车", + fontSize: widget.fontSize, + width: ScreenUtil().setWidth(400), + groupValue: _selectedRadio, + onChanged: (int value) { + _selectedRadio = value; + fh_hyc = true; //复审为黑烟车 + tsjj = true; //同时推送交警 + //黑烟初审数据审核Radio选项改变广播 + eventBus.fire(HycsDataAuditRadioEvent('黑烟初审数据审核Radio选项已改变', _selectedRadio)); + setState(() {}); + print('selectedRadio = ${_selectedRadio.toString()}'); + }, + ), + SizedBox(height: ScreenUtil().setWidth(20)), + CustomRadioWidget( + value: 1, + title: "非黑烟车", + fontSize: widget.fontSize, + width: ScreenUtil().setWidth(340), + groupValue: _selectedRadio, + onChanged: (int value) { + _selectedRadio = value; + fh_hyc = false; //复审为黑烟车 + tsjj = false; //同时推送交警 + //黑烟初审数据审核Radio选项改变广播 + eventBus.fire(HycsDataAuditRadioEvent('黑烟初审数据审核Radio选项已改变', _selectedRadio)); + setState(() {}); + print('selectedRadio = ${_selectedRadio.toString()}'); + }, + ), + ], + ), + SizedBox(height: ScreenUtil().setHeight(15)), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // SizedBox(width: my_marginLeft), + // Text((widget.hyshlx == 'hyfh' ? '复审' : '初审') + '结果: ', + // style: TextStyle(fontSize: widget.fontSize, color: Colors.red)), + // CustomRadioWidget( + // value: 1, + // title: "非黑烟车", + // fontSize: widget.fontSize, + // width: ScreenUtil().setWidth(400), + // groupValue: _selectedRadio, + // onChanged: (int value) { + // _selectedRadio = value; + // fh_hyc = false; //复审为黑烟车 + // tsjj = false; //同时推送交警 + // //黑烟初审数据审核Radio选项改变广播 + // eventBus.fire(HycsDataAuditRadioEvent('黑烟初审数据审核Radio选项已改变', _selectedRadio)); + // setState(() {}); + // print('selectedRadio = ${_selectedRadio.toString()}'); + // }, + // ), + // ], + // ), + ], + ), + ); + } + + //5.3-0、得到审核结果组件 + Widget getShjg0(int index) { return Container( width: ScreenUtil().setWidth(1022), height: ScreenUtil().setHeight(175),