From 575540a03b98785cdfb4a92d91413ae6adef2a3c Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 21 Sep 2023 16:14:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E8=A6=81=E7=B4=A0?=
=?UTF-8?q?=E7=BA=BF=E6=8D=95=E6=8D=89=E5=BC=80=E5=85=B32=E3=80=81?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=B1=82=E5=BC=80=E5=85=B3=E4=B8=8E?=
=?UTF-8?q?=E8=A6=81=E7=B4=A0=E6=8D=95=E6=8D=89=E8=81=94=E5=8A=A83?=
=?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?Marker=E6=98=BE=E9=9A=90=E5=BC=80=E5=85=B34=E3=80=81=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E9=81=93=E8=B7=AF=E5=B1=9E=E6=80=A7=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=81=93=E8=B7=AF=E7=A7=8D=E5=88=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fragment/personalcenter/PersonalCenterFragment.kt | 2 +-
app/src/main/res/menu/personal_center_menu.xml | 2 +-
.../collect/library/map/handler/MarkHandler.kt | 11 ++++++++++-
3 files changed, 12 insertions(+), 3 deletions(-)
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 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
- android:title="版本：23QE4_V1.5.2_20230919_A" />
+ android:title="版本：23QE4_V1.5.3_20230920_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">
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)
}