Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt

@@ -416,6 +416,9 @@ class MainActivity : BaseActivity() {
             supportFragmentManager.beginTransaction()
                 .add(R.id.console_fragment_layout, ConsoleFragment()).commit()
         }
+
+        binding.mainActivityCloseLine.isSelected = viewModel.isHighRoad()
+
         initMeasuringTool()
     }
 
@@ -675,6 +678,13 @@ class MainActivity : BaseActivity() {
         viewModel.click2Dor3D()
     }
 
+    /**
+     * 刷新地图
+     */
+    fun refrushOnclick(view: View) {
+        mapController.layerManagerHandler.updateOMDBVectorTileLayer()
+    }
+
     /**
      * zoomin
      */
@@ -754,6 +764,16 @@ class MainActivity : BaseActivity() {
         binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad()
     }
 
+    /**
+     * 点击线高亮
+     */
+    fun openOrCloseLineOnclick() {
+        viewModel.setHighRoad(!viewModel.isHighRoad())
+        binding.mainActivityCloseLine.isSelected = viewModel.isHighRoad()
+        mapController.lineHandler.taskMarkerLayerEnable(viewModel.isHighRoad())
+    }
+
+
     /**
      * 点击线选择
      */
@@ -990,7 +1010,7 @@ class MainActivity : BaseActivity() {
      */
     private fun showMainActivityBottomSheetGroup() {
         binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
-        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 10, 60)
+        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 60)
         mapController.mMapView.vtmMap.animator().animateTo(
             GeoPoint(
                 mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
@@ -1004,7 +1024,7 @@ class MainActivity : BaseActivity() {
      */
     private fun hideMainActivityBottomSheetGroup() {
         binding.mainActivityBottomSheetGroup.visibility = View.GONE
-        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 10, 0)
+        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 0)
         mapController.mMapView.vtmMap.animator().animateTo(
             GeoPoint(
                 mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -156,6 +156,11 @@ class MainViewModel @Inject constructor(
      */
     private var bSelectRoad = false
 
+    /**
+     * 是不是高亮任务线
+     */
+    private var bHighRoad = true
+
     /**
      * 是不是选择轨迹点
      */
@@ -489,7 +494,7 @@ class MainViewModel @Inject constructor(
 
                 val linkList = realmOperateHelper.queryLink(point = point)
 
-/*                val linkList = realmOperateHelper.queryLine(
+                /*val linkList = realmOperateHelper.queryLine(
                     point = point,
                 )
 
@@ -832,6 +837,21 @@ class MainViewModel @Inject constructor(
         return bSelectRoad
     }
 
+    /**
+     * 开启线高亮
+     */
+    fun setHighRoad(select: Boolean) {
+        bHighRoad = select
+
+    }
+
+    /**
+     * 是否开启线高亮
+     */
+    fun isHighRoad(): Boolean {
+        return bHighRoad
+    }
+
     /**
      * 开启轨迹选择
      */

app/src/main/res/drawable/selector_high_road_line_src.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_hide_line" android:state_selected="true"></item>
+    <item android:drawable="@drawable/icon_high_line" />
+</selector>

app/src/main/res/layout/activity_main.xml

@@ -245,6 +245,15 @@
             app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet"
             app:layout_constraintLeft_toLeftOf="@id/main_activity_top_sign_recyclerview" />
 
+        <ImageButton
+            android:id="@+id/main_activity_map_update"
+            style="@style/zoom_btns_style"
+            android:layout_marginBottom="12dp"
+            android:onClick="@{(view)->mainActivity.refrushOnclick(view)}"
+            android:src="@drawable/icon_map_refrush"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
+            app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
+
 
         <ImageButton
             android:id="@+id/main_activity_zoom_out"
@@ -276,8 +285,8 @@
             android:layout_marginBottom="12dp"
             android:onClick="@{()->viewModel.onClickLocationButton()}"
             android:src="@drawable/icon_location"
-            app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
-            app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
+            app:layout_constraintBottom_toTopOf="@id/main_activity_map_update"
+            app:layout_constraintRight_toRightOf="@id/main_activity_map_update" />
 
         <ImageButton
             android:id="@+id/main_activity_add_new"
@@ -307,17 +316,27 @@
             app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
             app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
 
+        <ImageButton
+            android:id="@+id/main_activity_close_line"
+            style="@style/zoom_btns_style"
+            android:layout_marginBottom="12dp"
+            android:background="@drawable/selector_road_line_bg"
+            android:onClick="@{()->mainActivity.openOrCloseLineOnclick()}"
+            android:src="@drawable/selector_high_road_line_src"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_select_line"
+            app:layout_constraintRight_toRightOf="@id/main_activity_select_line" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/main_activity_right_visibility_buttons_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="main_activity_select_line,main_activity_voice,main_activity_add_new" />
+            app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_add_new" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/main_activity_right_visibility_buttons_group2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="main_activity_select_line,main_activity_voice,main_activity_add_new,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
+            app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_add_new,main_activity_map_update,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
 
         <fragment
             android:id="@+id/main_activity_middle_fragment"