From 777cc6b84c4bb161b72206a24839a9e3abcb7214 Mon Sep 17 00:00:00 2001 From: WinUser01 Date: Thu, 3 Mar 2022 23:38:14 +0800 Subject: [PATCH] =?UTF-8?q?hyzp=5Fybqx-Commit108=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.19+20220303?= =?UTF-8?q?=E3=80=82=E5=B7=B2=E7=BB=8F=E6=9B=B4=E6=96=B0=E5=8D=97=E6=BA=AA?= =?UTF-8?q?=E5=8C=BA=E3=80=81=E6=B1=9F=E5=AE=89=E5=8E=BF=E7=9A=84=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C=E5=8C=BA=E5=8E=BF?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E4=BA=A4=E5=8F=89=E6=B7=B7=E4=B9=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 完全重启App、或热加载后，用任何一个区县用户登录，点位地图点位都正常。 但是，不完全重启App、或热加载，只是注销当前用户，再以其他不同区县的用户登录，就会出现点位叠加混乱的问题 --- android/app/release/output.json | 2 +- lib/components/UserInfo.dart | 18 ++++++++++++++++++ lib/pages/Works/DWDT/basic_map.dart | 4 ++-- lib/pages/Works/DWDT/dwInfo_data.dart | 3 ++- lib/pages/tabs/page4_myMsics_new.dart | 8 ++++++++ pubspec.yaml | 3 ++- 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/android/app/release/output.json b/android/app/release/output.json index 31197d4..3af1c29 100644 --- a/android/app/release/output.json +++ b/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":20220126,"versionName":"1.4.16","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":20220303,"versionName":"1.4.19","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 70cb54c..e277ef4 100644 --- a/lib/components/UserInfo.dart +++ b/lib/components/UserInfo.dart @@ -1,4 +1,5 @@ import 'package:hyzp_ybqx/components/commonFun.dart'; +import 'package:hyzp_ybqx/pages/Works/DWDT/dwInfo_data.dart'; import 'EncryptUtil.dart'; import 'commonFun.dart'; @@ -85,11 +86,28 @@ class UserInfo { center_latitude = 28.768529585269228; // 区县中心纬度 center_longitude = 104.5675762475173; // 区县中心经度 break; + case 511503: // 南溪区 + service_tel = ''; + copyright_info = '© ' + qx_name_long + '生态环境局 版权所有' + service_tel; + copyright_info_PinYin = 'YIBIN NANXI BLACK SMOKE CAR CAPTURE SYSTEM'; + // 中心位置：南溪豆腐干博览馆, pt: {latitude: 28.829484824941034, longitude: 104.9676905045844} + center_latitude = 28.829484824941034; // 区县中心纬度 + center_longitude = 104.9676905045844; // 区县中心经度 + break; case 511505: // 三江新区 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'; break; + case 511523: // 江安县 + service_tel = ''; + copyright_info = '© ' + qx_name_long + '生态环境局 版权所有' + service_tel; + copyright_info_PinYin = 'YIBIN JIANGAN BLACK SMOKE CAR CAPTURE SYSTEM'; + // 中心地址： + center_latitude = 28.733302227916264; // 区县中心纬度 + center_longitude = 105.08602682985662; // 区县中心经度 + g_zoomLevel = g_zoomLevel_default = 13; //地图默认缩放倍数 + break; case 511524: // 长宁县 service_tel = ''; copyright_info = '© ' + qx_name_long + '生态环境局 版权所有' + service_tel; diff --git a/lib/pages/Works/DWDT/basic_map.dart b/lib/pages/Works/DWDT/basic_map.dart index 74371fb..d8be684 100644 --- a/lib/pages/Works/DWDT/basic_map.dart +++ b/lib/pages/Works/DWDT/basic_map.dart @@ -500,9 +500,9 @@ class _BasicMapState extends State { // child: Icon(Icons.my_location_outlined, color: Colors.black45), // 没有 child: Icon(Icons.radio_button_checked_rounded, - color: g_zoomLevel == 14 ? Colors.grey : Colors.blue), + color: g_zoomLevel == g_zoomLevel_default ? Colors.grey : Colors.blue), onTap: () { - g_zoomLevel = 14; + g_zoomLevel = g_zoomLevel_default; //还原按钮，重新设置中心位置、缩放级别 //myMapController.setCenterCoordinate(coordinate, animated); //没有myMapController.getCenterCoordinate，无法简单地获取当前中心坐标; diff --git a/lib/pages/Works/DWDT/dwInfo_data.dart b/lib/pages/Works/DWDT/dwInfo_data.dart index 461824f..9f65ddb 100644 --- a/lib/pages/Works/DWDT/dwInfo_data.dart +++ b/lib/pages/Works/DWDT/dwInfo_data.dart @@ -6,7 +6,8 @@ import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; ///批量添加定位标记 bool enable = true; bool dragable = true; -int g_zoomLevel = 14; //缩放倍数 +int g_zoomLevel_default = 14; //地图默认缩放倍数 +int g_zoomLevel = 14; //地图缩放倍数 ///批量添加定位标记 List g_listBMFMarker = []; Map g_map_BMFMarkerID_dwIndex = {}; diff --git a/lib/pages/tabs/page4_myMsics_new.dart b/lib/pages/tabs/page4_myMsics_new.dart index 95b2414..0b5585b 100644 --- a/lib/pages/tabs/page4_myMsics_new.dart +++ b/lib/pages/tabs/page4_myMsics_new.dart @@ -10,6 +10,7 @@ import 'package:hyzp_ybqx/components/hyxx_data_handle.dart'; import 'package:hyzp_ybqx/pages/Login/FaceLogin.dart'; import 'package:hyzp_ybqx/pages/Login/FaceReg.dart'; import 'package:hyzp_ybqx/pages/MyMsics/05_updated/MyUpdatedNew.dart'; +import 'package:hyzp_ybqx/pages/Works/DWDT/dwInfo_data.dart'; import 'package:hyzp_ybqx/pages/Works/TJXX/tj_data.dart'; import 'package:hyzp_ybqx/pages/tabs/page5_userManager.dart'; import 'package:hyzp_ybqx/pages/tabs/page6_download.dart'; @@ -384,6 +385,13 @@ class _Page4_MyMsicsNewState extends State color: Color.fromRGBO(80, 159, 245, 1), onTop: () { clear_user_info(); // 清空用户信息 + + //清空点位地图定位标记 + g_listBMFMarker = []; + g_map_BMFMarkerID_dwIndex = {}; + g_listBMFText = []; + g_zoomLevel = g_zoomLevel_default = 14; //地图默认缩放倍数 + //刷新统计数据 // listAllStatisData.clear(); // 没有什么作用 listDwinfoGetList2.clear(); diff --git a/pubspec.yaml b/pubspec.yaml index e659e66..f6fb24e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -58,7 +58,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev #version: 1.4.15+20220124 #version: 1.4.16+20220126 #version: 1.4.17+20220227 -version: 1.4.18+20220302 +#version: 1.4.18+20220302 +version: 1.4.19+20220303 environment: sdk: ">=2.7.0 <3.0.0"