diff --git a/android/app/release/output.json b/android/app/release/output.json index 64b8303..dee50e1 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220103,"versionName":"1.4.9","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":20220104,"versionName":"1.4.10","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/DWDT/basic_map.dart b/lib/pages/Works/DWDT/basic_map.dart index f18da2a..74371fb 100644 --- a/lib/pages/Works/DWDT/basic_map.dart +++ b/lib/pages/Works/DWDT/basic_map.dart @@ -278,8 +278,9 @@ class _BasicMapState extends State { getStatisData(statisType: 'zptj', ip: listDwinfoGetList2[dwIndex]['dwip']) .then((mapStatisData) async { - String title = - listDwinfoGetList2[dwIndex]["id"].toString() + '、' + listDwinfoGetList2[dwIndex]["dwmc"]; + // String title = + // listDwinfoGetList2[dwIndex]["id"].toString() + '、' + listDwinfoGetList2[dwIndex]["dwmc"]; + String title = (dwIndex + 1).toString() + '、' + listDwinfoGetList2[dwIndex]["dwmc"]; List listCoordinate = listDwinfoGetList2[dwIndex]["dwzb"].trim().split('|'); String content = listDwinfoGetList2[dwIndex]["dwms"] + diff --git a/lib/pages/Works/DWDT/dwInfo_data.dart b/lib/pages/Works/DWDT/dwInfo_data.dart index 52ddec1..461824f 100644 --- a/lib/pages/Works/DWDT/dwInfo_data.dart +++ b/lib/pages/Works/DWDT/dwInfo_data.dart @@ -34,9 +34,11 @@ Future getListBMFMarker({List listDwinfo}) async { for (int i = 0; i < len; i++) { BMFMarker marker = BMFMarker( position: getBMFCoordinate(listDwinfo[i]["dwzb"]), - title: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + // title: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + title: '${(i + 1).toString()}、${listDwinfo[i]["dwmc"]}', subtitle: 'test', - identifier: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + // identifier: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + identifier: '${(i + 1).toString()}、${listDwinfo[i]["dwmc"]}', icon: 'assets/images/location.png', /// 默认情况下, annotation view的中心位于annotation的坐标位置, @@ -58,7 +60,8 @@ Future getListBMFMarker({List listDwinfo}) async { g_listBMFMarker.add(marker); g_listBMFText.add(BMFText( - text: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + // text: '${listDwinfo[i]["id"].toString()}、${listDwinfo[i]["dwmc"]}', + text: '${(i + 1).toString()}、${listDwinfo[i]["dwmc"]}', //纬度偏移-上下 off_latitude, 经度偏移-左右 off_longitude //已经在zoomLevel = 15时调整好定位标记与文本标记的相对位置 // ,当地图缩放时,会发生位置变化,必须使用 Provider 或者 EventBus 进行跟踪更新 diff --git a/lib/pages/Works/DWSP/dwsp_getList.dart b/lib/pages/Works/DWSP/dwsp_getList.dart index 9b54ba4..7fbd21b 100644 --- a/lib/pages/Works/DWSP/dwsp_getList.dart +++ b/lib/pages/Works/DWSP/dwsp_getList.dart @@ -160,9 +160,12 @@ class _DwspPageState extends State { child: ListTile( //leading: new Icon(Icons.phone), contentPadding: EdgeInsets.symmetric(horizontal: 15.0, vertical: 0), - title: Text( - "${listDwspGetList2[indexRecord]['id'].toString()}. ${listDwspGetList2[indexRecord]['dwmc']}", + title: Text("${(indexRecord + 1).toString()}. ${listDwspGetList2[indexRecord]['dwmc']}", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), + + // title: Text( + // "${listDwspGetList2[indexRecord]['id'].toString()}. ${listDwspGetList2[indexRecord]['dwmc']}", + // style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), // title: Text( // "${listDwspGetList2[indexRecord]['dwbh'].toString()}. ${listDwspGetList2[indexRecord]['dwmc']}", // style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), diff --git a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart index 604fd5c..cc3c3a1 100644 --- a/lib/pages/Works/LED_XSXX/led_xsxx_content.dart +++ b/lib/pages/Works/LED_XSXX/led_xsxx_content.dart @@ -209,8 +209,8 @@ class _LedXsxxPageState extends State { _listItems = ['全部']; //LED点位名称List,除第一项外,后面都按ID号排列 int len = listDwinfoGetList2.length; for (int i = 0; i < len; i++) { - // _listItems.add('${i + 1}、${listDwinfoGetList2[i]['dwmc']}'); - _listItems.add('${listDwinfoGetList2[i]['id']}、${listDwinfoGetList2[i]['dwmc']}'); + _listItems.add('${i + 1}、${listDwinfoGetList2[i]['dwmc']}'); + // _listItems.add('${listDwinfoGetList2[i]['id']}、${listDwinfoGetList2[i]['dwmc']}'); } print('_listItems = $_listItems'); //兴文: I/flutter ( 7562): _listItems = [全部, 21、大礼村, 22、石海收费站, 23、高铁站, 24、温水溪, 25、古高路] diff --git a/lib/pages/Works/SBGL/dwxx_getList.dart b/lib/pages/Works/SBGL/dwxx_getList.dart index f470493..e9f83de 100644 --- a/lib/pages/Works/SBGL/dwxx_getList.dart +++ b/lib/pages/Works/SBGL/dwxx_getList.dart @@ -131,8 +131,10 @@ class _SbglPageState extends State { // title: Text( // "${listSbglGetList2[indexRecord]['dwbh'].toString()}. ${listSbglGetList2[indexRecord]['dwmc']}", // style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), - title: Text( - "${listSbglGetList2[indexRecord]['id'].toString()}. ${listSbglGetList2[indexRecord]['dwmc']}", + // title: Text( + // "${listSbglGetList2[indexRecord]['id'].toString()}. ${listSbglGetList2[indexRecord]['dwmc']}", + // style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), + title: Text("${(indexRecord + 1).toString()}. ${listSbglGetList2[indexRecord]['dwmc']}", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)), subtitle: Text( 'dwIP:${listSbglGetList2[indexRecord]['dwip']},${listSbglGetList2[indexRecord]['dwzt']}', diff --git a/pubspec.yaml b/pubspec.yaml index 305268a..275642c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,7 +45,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # version: 1.4.4+20211230 # version: 1.4.6+20211231 # version: 1.4.7+20220101 -version: 1.4.9+20220103 +# version: 1.4.9+20220103 +version: 1.4.10+20220104 environment: sdk: ">=2.7.0 <3.0.0"