hyzp_ybqx-Commit108：版本号更新为1.4.19+20220303。已经更新南溪区、江安县的点位地图中心位置，解决不同区县点位交叉混乱的问题

完全重启App、或热加载后，用任何一个区县用户登录，点位地图点位都正常。
但是，不完全重启App、或热加载，只是注销当前用户，再以其他不同区县的用户登录，就会出现点位叠加混乱的问题

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":{}}]
+[{"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":{}}]

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;

lib/pages/Works/DWDT/basic_map.dart

@@ -500,9 +500,9 @@ class _BasicMapState extends State<BasicMap> {
                   // 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，无法简单地获取当前中心坐标;

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<BMFMarker> g_listBMFMarker = [];
 Map g_map_BMFMarkerID_dwIndex = {};

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<Page4_MyMsicsNew>
               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();

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"