diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
index 657ee327..04fb39ee 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -156,7 +156,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
niMapController.mMapView.vtmMap.eventLayer.enableTilt(Constant.MapRotateEnable)
Constant.MapMarkerCloseEnable = !Constant.MapMarkerCloseEnable
//增加开关控制
- niMapController.markerHandle.setQsRecordMarkEnable(Constant.MapMarkerCloseEnable)
+ niMapController.markerHandle.setQsRecordMarkEnable(!Constant.MapMarkerCloseEnable)
if (Constant.MapMarkerCloseEnable) {
it.title = "显示Marker"
} else {
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index 67528904..9e53afd3 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -59,7 +59,7 @@
+ android:title="版本:23QE4_V1.5.3_20230920_A" />
-
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
index db7e5d91..b7e38784 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
@@ -43,6 +43,8 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) :
*/
private val mDefaultTextColor = "#4E55AF"
+ private var markerEnable = true
+
/**
* 文字画笔
*/
@@ -275,7 +277,12 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) :
// 设置矢量图层均在12级以上才显示
mMapView.vtmMap.events.bind(Map.UpdateListener { e, mapPosition ->
if (e == Map.SCALE_EVENT) {
- qsRecordItemizedLayer.isEnabled = mapPosition.getZoomLevel() >= 12
+ if(markerEnable){
+ qsRecordItemizedLayer.isEnabled = mapPosition.getZoomLevel() >= 12
+ }else{
+ qsRecordItemizedLayer.isEnabled = false
+ }
+
niLocationItemizedLayer.isEnabled = mapPosition.getZoomLevel() >= 12
}
})
@@ -374,6 +381,8 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) :
fun setQsRecordMarkEnable(enable:Boolean){
qsRecordItemizedLayer.isEnabled = enable
+ markerEnable = enable
+ qsRecordItemizedLayer.populate()
mMapView.updateMap(true)
}