diff --git a/lib/components/dioFun.dart b/lib/components/dioFun.dart index 2508c22..81ef31a 100644 --- a/lib/components/dioFun.dart +++ b/lib/components/dioFun.dart @@ -218,9 +218,23 @@ Future getLedXsxxGetData({@required int id, @required String theSbgllx}) async { print('map = ${map}'); Response response = await dio.post(mapHyshlx[theSbgllx]['apiItem'], data: map); printWrapped('response = ${response.toString()}'); + // [log] response = {"ret":200,"data":false,"msg":""} if (response.statusCode == 200) { Map _mapGetSbglGetDataRet = await getMapFromJson(response.data); + // 避免 response = {"ret":200,"data":false,"msg":""} 时,报错终止 + if (false == _mapGetSbglGetDataRet['data']) { + _mapGetSbglGetDataRet['data'] = { + "id": 1, + "dwip": "", + "xsnr": "", + "xsts": 0, //显示抓拍到的多少条违章记录 + "stime": "", + "etime": "", + "addtime": "", + "updatetime": "" + }; + } _mapGetSbglGetData = _mapGetSbglGetDataRet['data']; printWrapped('_mapGetSbglGetData[\'xsts\'] = ${_mapGetSbglGetData['xsts']}'); diff --git a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart index fd4f5ab..828d60b 100644 --- a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart +++ b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart @@ -90,9 +90,9 @@ class _LedXsxxPageState extends State { // "dwip": "172.16.3.2", // "dwmc": "宜飞路", // "dwbh": 2, - // "dwinfo": "宜宾市翠屏南收费站宜飞路入城方向", + // "dwinfo": "宜宾南收费站宜飞路入城方向", // "dwzb": "104.589904|28.787078", - // "dwms": "宜宾市翠屏南收费站宜飞路入城方向,识别屏山、菜坝入城排放黑烟车辆" + // "dwms": "宜宾南收费站宜飞路入城方向,识别屏山、菜坝入城排放黑烟车辆" //},]; _widthLeft = _screenWidth / 2.6; @@ -144,7 +144,7 @@ class _LedXsxxPageState extends State { Map _mapGetLedXsxxGetData = { "id": 2, "dwip": "172.16.3.2", - "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", + "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", "xsts": 0, //显示抓拍到的多少条违章记录 "stime": "07:00", "etime": "23:00", @@ -156,11 +156,11 @@ class _LedXsxxPageState extends State { // 全部 // 1 '江北振兴大道', // 2 '宜飞路', - // 3 '宜宾市翠屏南收费站', + // 3 '宜宾南收费站', // 4 '一曼路', // 5 '柏溪收费站', // 6 '七星路万达广场', - // 7 '宜宾市翠屏财政局', + // 7 '宜宾财政局', // 8 '宜威路南广镇', // 9 '宜长路', // 10 '宜南快速通道', @@ -173,11 +173,11 @@ class _LedXsxxPageState extends State { // '全部', // '1、江北振兴大道', // '2、宜飞路', - // '3、宜宾市翠屏南收费站', + // '3、宜宾南收费站', // '4、一曼路', // '5、柏溪收费站', // '6、七星路万达广场', - // '7、宜宾市翠屏财政局', + // '7、宜宾财政局', // '8、宜威路南广镇', // '9、宜长路', // '10、宜南快速通道', @@ -188,15 +188,15 @@ class _LedXsxxPageState extends State { String _selectedValue = '不显示'; int _xsts = 0; - String _startTime = '07:00'; - String _endTime = '23:00'; - String _ledMessage = '绿水青山就是金山银山 宜宾市翠屏生态环境局宣。'; + String _startTime = ''; + String _endTime = ''; + String _ledMessage = ''; //App.Car_Led.Get接口获取的记录数据结构(比App.Car_Led.GetList接口获取的丰富) // Map _mapGetLedXsxxGetData = { // "id": 2, // "dwip": "172.16.3.2", - // "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", + // "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", // "xsts": 0, //显示抓拍到的多少条违章记录 // "stime": "07:00", // "etime": "23:00", @@ -207,13 +207,9 @@ class _LedXsxxPageState extends State { Future getListFlields() async { //实时更新_listItems内容 _listItems = ['全部']; //LED点位名称List,除第一项外,后面都按ID号排列 - // int len = listDwinfoGetList2.length; - int len = 3; // 先强制设置为3 - //兴文县的led现在还未到位,只有3、没有1、2,这个设备是目前市区3号点位的,用来测试。安装完成后兴文县一共5个点位 - // 罗腾-子非鱼: 另外,系统里面的各个表,ID不一定是连续的哈,可能有跳号 + int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - // _listItems.add('${i + 1}、${listDwinfoGetList2[i]['dwmc']}'); - _listItems.add('${i + 1}、${listDwinfoGetList2[0]['dwmc']}'); // 设置为 + _listItems.add('${i + 1}、${listDwinfoGetList2[i]['dwmc']}'); } print('_listItems = $_listItems'); @@ -223,7 +219,7 @@ class _LedXsxxPageState extends State { //_mapGetLedXsxxGetData = { // "id": 1, // "dwip": "172.16.3.1", - // "xsnr": "绿水青山就是金山银山 宜宾市翠屏生态环境局宣。", + // "xsnr": "绿水青山就是金山银山 宜宾市生态环境局宣。", // "xsts": 0, // "stime": "07:00", // "etime": "23:00", @@ -231,10 +227,12 @@ class _LedXsxxPageState extends State { // "updatetime": "2021-02-03 19:57:55" // }; - _xsts = _mapGetLedXsxxGetData['xsts']; - _ledMessage = _mapGetLedXsxxGetData['xsnr']; - _startTime = _mapGetLedXsxxGetData['stime']; - _endTime = _mapGetLedXsxxGetData['etime']; + if (_mapGetLedXsxxGetData.length > 0) { + _xsts = _mapGetLedXsxxGetData['xsts']; + _ledMessage = _mapGetLedXsxxGetData['xsnr']; + _startTime = _mapGetLedXsxxGetData['stime']; + _endTime = _mapGetLedXsxxGetData['etime']; + } try { // _title =listDwinfoGetList2 @@ -306,22 +304,22 @@ class _LedXsxxPageState extends State { width: 350, text: "更新", color: Color.fromRGBO(45, 202, 115, 1), - // onTop: () { - // printWrapped('_message = ${_ledMessage}'); - // print('_xsts = ${_xsts}'); - // print('_startTime = ${_startTime}'); - // print('_endTime = ${_endTime}'); - // - // //updateLedData({@required int id, @required String theSbgllx, @required Map map}) - // //_modifyAll = true; //id = -1,处理全部记录 - // updateLedData(id: _modifyAll ? -1 : widget.id, theSbgllx: 'led_update', map: { - // 'xsnr': _ledMessage, - // 'xsts': _xsts, - // 'stime': _startTime, - // 'etime': _endTime, - // }); - // Navigator.pop(context); - // }, + onTop: () { + printWrapped('_message = ${_ledMessage}'); + print('_xsts = ${_xsts}'); + print('_startTime = ${_startTime}'); + print('_endTime = ${_endTime}'); + + //updateLedData({@required int id, @required String theSbgllx, @required Map map}) + //_modifyAll = true; //id = -1,处理全部记录 + updateLedData(id: _modifyAll ? -1 : widget.id, theSbgllx: 'led_update', map: { + 'xsnr': _ledMessage, + 'xsts': _xsts, + 'stime': _startTime, + 'etime': _endTime, + }); + Navigator.pop(context); + }, ), JdButton( height: 126, @@ -350,10 +348,8 @@ class _LedXsxxPageState extends State { DropdownItem( listItems: _listItems, //初始值 initValue 必须是 listItems 中的已有元素 - // initValue: _listItems[widget.id], initValue: _listItems[widget.id], - // dropdownEvent: 'SelectLedDwUpdateEvent', - dropdownEvent: '', // 兴文县LED还未到位,暂时禁用'选择点位:'功能 + dropdownEvent: 'SelectLedDwUpdateEvent', width: ScreenUtil().setWidth(590), height: _widgetHeight, ), //SizedBox(width: _marginLeft), @@ -370,6 +366,7 @@ class _LedXsxxPageState extends State { SizedBox(width: _marginLeft), getSizeText('显示违章记录:', width: _titleWidth), // Expanded(child: SizedBox.shrink()), + DropdownItem( listItems: _listItemsWzjl, initValue: getWzjlString(_xsts), @@ -509,7 +506,7 @@ class _LedXsxxPageState extends State { // borderSide: BorderSide(color: Colors.grey, width: 0)), ), controller: TextEditingController.fromValue(TextEditingValue( - text: _ledMessage, + text: null == _ledMessage ? '' : _ledMessage, // 保持光标在最后 // selection: TextSelection.fromPosition( // TextPosition(affinity: TextAffinity.downstream, offset: _message.length)) @@ -557,11 +554,16 @@ class _LedXsxxPageState extends State { // borderSide: BorderSide(color: Colors.grey, width: 0)), ), controller: TextEditingController.fromValue(TextEditingValue( - text: (_whichTime == 0 ? _startTime : _endTime), + text: (_whichTime == 0 + ? (null == _startTime ? '' : _startTime) + : (null == _endTime ? '' : _endTime)), // 保持光标在最后 - // selection: TextSelection.fromPosition(TextPosition( - // affinity: TextAffinity.downstream, - // offset: (_whichTime == 0 ? _startTime : _endTime).length)), + selection: TextSelection.fromPosition(TextPosition( + affinity: TextAffinity.downstream, + offset: (_whichTime == 0 + ? (null == _startTime ? '' : _startTime) + : (null == _endTime ? '' : _endTime)) + .length)), )), enabled: true, onChanged: (value) { diff --git a/lib/pages/tabs/page1_work.dart b/lib/pages/tabs/page1_work.dart index 4e33cea..b80c785 100644 --- a/lib/pages/tabs/page1_work.dart +++ b/lib/pages/tabs/page1_work.dart @@ -911,7 +911,7 @@ class _Page1_WorksState extends State int defauld_led_id = 1; switch (qxdm) { case 511528: // 兴文县 - defauld_led_id = 3; + //defauld_led_id = 3; break; default: break;