diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
index 2234802e..d6f34263 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -38,6 +38,8 @@ import com.navinfo.omqs.util.FlowEventBus
import com.navinfo.omqs.util.SpeakMode
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
+import org.oscim.core.GeoPoint
+import org.oscim.renderer.GLViewport
import org.videolan.vlc.Util
import java.math.BigDecimal
import java.math.RoundingMode
@@ -503,9 +505,14 @@ class MainActivity : BaseActivity() {
}
binding.mainActivityBottomSheetGroup.visibility = View.GONE
+
+ mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5)
} else {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+ mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
}
+ mapController.mMapView.vtmMap.animator()
+ .animateTo(GeoPoint( mapController.mMapView.vtmMap.mapPosition.latitude,mapController.mMapView.vtmMap.mapPosition.latitude))
}
private fun voiceOnTouchStart() {
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 c93d949e..8ca20c4a 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
@@ -113,10 +113,10 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
}
R.id.personal_center_menu_test -> {
viewModel.readRealmData()
- //108.92242999223849 34.27711899342322
+ //108.91056000267433 34.29635901721207
// 定位到指定位置
niMapController.mMapView.vtmMap.animator()
- .animateTo(GeoPoint( 34.27711899342322, 108.92242999223849))
+ .animateTo(GeoPoint( 34.29635901721207, 108.91056000267433))
}
// R.id.personal_center_menu_task_list -> {
// findNavController().navigate(R.id.TaskManagerFragment)
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 0ce4e342..00864bf8 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1707,7 +1707,48 @@
0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1775,6 +1816,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1808,20 +1865,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/collect-library/src/main/assets/omdb/icon_2083_0.svg b/collect-library/src/main/assets/omdb/icon_2083_0.svg
new file mode 100644
index 00000000..e9433758
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2083_0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2083_6.svg b/collect-library/src/main/assets/omdb/icon_2083_6.svg
new file mode 100644
index 00000000..d3205549
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2083_6.svg
@@ -0,0 +1,13 @@
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2083_7.svg b/collect-library/src/main/assets/omdb/icon_2083_7.svg
new file mode 100644
index 00000000..934314e6
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2083_7.svg
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2083_9.svg b/collect-library/src/main/assets/omdb/icon_2083_9.svg
new file mode 100644
index 00000000..06325cf4
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2083_9.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2202_0.svg b/collect-library/src/main/assets/omdb/icon_2202_0.svg
index b2479462..51a69b01 100644
--- a/collect-library/src/main/assets/omdb/icon_2202_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_2202_0.svg
@@ -1 +1,13 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
index f599fcb7..e10dd9a2 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
@@ -36,6 +36,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.layers.tile.vector.labeling.LabelTileLoaderHook;
import org.oscim.map.Map;
import org.oscim.renderer.GLViewport;
+import org.oscim.scalebar.MapScaleBarLayer;
import org.oscim.theme.IRenderTheme;
import org.oscim.theme.ThemeLoader;
import org.oscim.theme.VtmThemes;
@@ -198,6 +199,11 @@ public final class NIMapView extends RelativeLayout {
*/
private OnMapTouchListener touchListener;
+ /**
+ * 比例尺控件
+ */
+ private MapScaleBarLayer mapScaleBarLayer;
+
public NIMapView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
@@ -252,7 +258,7 @@ public final class NIMapView extends RelativeLayout {
// 增加比例尺图层
NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
- naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5);
+ mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5);
// if (gridLayer == null) {
// gridLayer = new TileGridLayer(getVtmMap());
@@ -878,6 +884,21 @@ public final class NIMapView extends RelativeLayout {
}
}
+ /**
+ * 设置比例尺位置
+ * @param position
+ * @param xOffset
+ * @param yOffset
+ */
+ public void setScaleBarLayer(GLViewport.Position position, int xOffset, int yOffset){
+ if(mapScaleBarLayer!=null&&mapView.map().layers().contains(mapScaleBarLayer)){
+ mapView.map().layers().remove(mapScaleBarLayer);
+ mapScaleBarLayer = null;
+ }
+ NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
+ mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, xOffset, yOffset);
+ }
+
/**
* 设置是否显示缩放控件
*