From 1897e2e0fd2162a71d0cd5c0258708fff28425a6 Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Fri, 8 Apr 2022 20:47:40 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit116=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.23+20220408?= =?UTF-8?q?=E3=80=82=E8=AF=A5=E7=89=88=E6=9C=AC=E5=B7=B2=E7=BB=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=89=E6=B1=9F=E6=96=B0=E5=8C=BA=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E5=9D=90=E6=A0=87=E3=80=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=82=B9=E4=BD=8D=E5=9C=B0=E5=9B=BE=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E8=8C=83=E5=9B=B4=E4=B8=BA=EF=BC=9A10-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/release/output.json | 2 +- lib/components/UserInfo.dart | 9 +++++++-- lib/pages/Works/DWDT/basic_map.dart | 18 +++++++++--------- lib/pages/Works/DWDT/dwInfo_data.dart | 2 ++ pubspec.yaml | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/android/app/release/output.json b/android/app/release/output.json index 9d7ae34..72fe9e2 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220405,"versionName":"1.4.23","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":20220408,"versionName":"1.4.23","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/components/UserInfo.dart b/lib/components/UserInfo.dart index e277ef4..4432527 100644 --- a/lib/components/UserInfo.dart +++ b/lib/components/UserInfo.dart @@ -55,10 +55,10 @@ class UserInfo { // 511501、宜宾市生态环境局、四川省踏石科技，保留客服电话 // 511502、宜宾市翠屏生态环境局，去掉客服电话 - // 511505、宜宾三江新区城乡融合发展局、四川省踏石科技，保留客服电话 // 511524、宜宾市长宁生态环境局，去掉客服电话 // 511528、宜宾市兴文生态环境局、四川省踏石科技，保留客服电话 // 511527、宜宾市筠连生态环境局、四川省踏石科技，保留客服电话 + // 511530、宜宾三江新区城乡融合发展局、四川省踏石科技，保留客服电话 qx_name_long = '宜宾市' + trim_county(qx_name); service_tel = '\n服务热线：187-8467-8300'; @@ -94,10 +94,15 @@ class UserInfo { center_latitude = 28.829484824941034; // 区县中心纬度 center_longitude = 104.9676905045844; // 区县中心经度 break; - case 511505: // 三江新区 + case 511530: // 三江新区 qx_name_long = '宜宾' + qx_name; copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有， ' + service_tel; 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; //地图默认缩放倍数 break; case 511523: // 江安县 service_tel = ''; diff --git a/lib/pages/Works/DWDT/basic_map.dart b/lib/pages/Works/DWDT/basic_map.dart index d8be684..dbb82d2 100644 --- a/lib/pages/Works/DWDT/basic_map.dart +++ b/lib/pages/Works/DWDT/basic_map.dart @@ -63,8 +63,8 @@ class _BasicMapState extends State { showMapPoi: _showMapPoi, //设定地图是否显示底图poi标注(不包含室内图标注)，默认true zoomLevel: g_zoomLevel, - maxZoomLevel: 16, - minZoomLevel: 12, + maxZoomLevel: g_zoomMax, + minZoomLevel: g_zoomMin, mapPadding: BMFEdgeInsets(left: 30, top: 0, right: 30, bottom: 0), //showMapScaleBar: true, ); @@ -446,11 +446,11 @@ class _BasicMapState extends State { //color: Colors.white, child: InkWell( // child: Icon(Icons.my_location_outlined, color: Colors.black45), - child: Icon(Icons.add, color: g_zoomLevel < 16 ? Colors.blue : Colors.grey), - onTap: g_zoomLevel < 16 + child: Icon(Icons.add, color: g_zoomLevel < g_zoomMax ? Colors.blue : Colors.grey), + onTap: g_zoomLevel < g_zoomMax ? () { - //放大按钮，缩放限制12-16 - if (g_zoomLevel < 16) { + //放大按钮，缩放限制g_zoomMin-g_zoomMax + if (g_zoomLevel < g_zoomMax) { g_zoomLevel++; myMapController ?.updateMapOptions(BMFMapOptions(zoomLevel: g_zoomLevel)); @@ -467,10 +467,10 @@ class _BasicMapState extends State { child: InkWell( // child: Icon(Icons.my_location_outlined, color: Colors.black45), child: Icon(Icons.horizontal_rule, - color: g_zoomLevel > 12 ? Colors.blue : Colors.grey), - onTap: g_zoomLevel > 12 + color: g_zoomLevel > g_zoomMin ? Colors.blue : Colors.grey), + onTap: g_zoomLevel > g_zoomMin ? () { - //缩小按钮，缩放限制12-16 + //缩小按钮，缩放限制10-18 g_zoomLevel--; myMapController ?.updateMapOptions(BMFMapOptions(zoomLevel: g_zoomLevel)); diff --git a/lib/pages/Works/DWDT/dwInfo_data.dart b/lib/pages/Works/DWDT/dwInfo_data.dart index 9f65ddb..70f32a4 100644 --- a/lib/pages/Works/DWDT/dwInfo_data.dart +++ b/lib/pages/Works/DWDT/dwInfo_data.dart @@ -8,6 +8,8 @@ bool enable = true; bool dragable = true; int g_zoomLevel_default = 14; //地图默认缩放倍数 int g_zoomLevel = 14; //地图缩放倍数 +int g_zoomMin = 10; +int g_zoomMax = 18; ///批量添加定位标记 List g_listBMFMarker = []; Map g_map_BMFMarkerID_dwIndex = {}; diff --git a/pubspec.yaml b/pubspec.yaml index 456c1a9..124eda4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -63,7 +63,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev #version: 1.4.20+20220306 #version: 1.4.21+20220319 #version: 1.4.22+20220320 -version: 1.4.23+20220405 +version: 1.4.23+20220408 environment: sdk: ">=2.7.0 <3.0.0"