修改已知问题2.调整渲染图层策略及样式

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

@@ -465,7 +465,7 @@ class MainActivity : BaseActivity() {
         if (leftFragment != null) {
             supportFragmentManager.beginTransaction().remove(leftFragment!!).commit()
             leftFragment = null
-            binding.mainActivityBottomSheetGroup.visibility = View.GONE
+            hideMainActivityBottomSheetGroup()
             binding.mainActivityLeftFragment.visibility = View.GONE
         }
 //        binding.mainActivityDrawer.open()
@@ -767,19 +767,10 @@ class MainActivity : BaseActivity() {
                 binding.mainActivityLeftFragment.visibility = View.GONE
             }
 
-            binding.mainActivityBottomSheetGroup.visibility = View.GONE
-
-            mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5)
+            hideMainActivityBottomSheetGroup()
         } else {
-            binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
-            mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
+            showMainActivityBottomSheetGroup()
         }
-        mapController.mMapView.vtmMap.animator().animateTo(
-            GeoPoint(
-                mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
-                mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
-            )
-        )
     }
 
     private fun voiceOnTouchStart() {
@@ -800,7 +791,7 @@ class MainActivity : BaseActivity() {
     fun onClickTaskFragment() {
         if (leftFragment !is TaskManagerFragment) {
             if (leftFragment == null) {
-                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                showMainActivityBottomSheetGroup()
                 binding.mainActivityLeftFragment.visibility = View.VISIBLE
             }
             leftFragment = TaskManagerFragment {
@@ -820,7 +811,7 @@ class MainActivity : BaseActivity() {
     fun onClickResFragment() {
         if (leftFragment !is QsRecordListFragment) {
             if (leftFragment == null) {
-                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                showMainActivityBottomSheetGroup()
                 binding.mainActivityLeftFragment.visibility = View.VISIBLE
             }
             leftFragment = QsRecordListFragment {
@@ -834,6 +825,28 @@ class MainActivity : BaseActivity() {
         }
     }
 
+    private fun showMainActivityBottomSheetGroup(){
+        binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 65)
+        mapController.mMapView.vtmMap.animator().animateTo(
+            GeoPoint(
+                mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
+                mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
+            )
+        )
+    }
+
+    private fun hideMainActivityBottomSheetGroup(){
+        binding.mainActivityBottomSheetGroup.visibility = View.GONE
+        mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5)
+        mapController.mMapView.vtmMap.animator().animateTo(
+            GeoPoint(
+                mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
+                mapController.mMapView.vtmMap.mapPosition.geoPoint.longitude
+            )
+        )
+    }
+
     /**
      * 显示轨迹回放布局
      */
@@ -868,7 +881,7 @@ class MainActivity : BaseActivity() {
     fun onClickOfflineMapFragment() {
         if (leftFragment !is OfflineMapFragment) {
             if (leftFragment == null) {
-                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                showMainActivityBottomSheetGroup()
                 binding.mainActivityLeftFragment.visibility = View.VISIBLE
             }
             leftFragment = OfflineMapFragment {

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt

@@ -1,5 +1,6 @@
 package com.navinfo.omqs.ui.fragment.tasklist
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.navinfo.collect.library.data.entity.HadLinkDvoBean
@@ -37,6 +38,11 @@ class TaskAdapter(
         val binding: AdapterTaskBinding =
             holder.viewBinding as AdapterTaskBinding
         val bean = data[position]
+        if(bean.linkStatus==1){
+            binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head)
+        }else{
+            binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head_add_link)
+        }
         binding.taskLinkPid.text = "PID:${bean.linkPid}"
         binding.taskMesh.text = "mesh:${bean.mesh}"
         binding.root.isSelected = selectPosition == position

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

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

app/src/main/res/drawable/selector_task_head_add_link.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_add_task_p" android:state_selected="true"></item>
+    <item android:drawable="@drawable/icon_add_task_n" />
+</selector>

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

@@ -154,7 +154,7 @@
             android:id="@+id/main_activity_task_line"
             style="@style/top_right_drawer_btns_style"
             android:onClick="@{()->mainActivity.onClickTaskLink()}"
-            android:src="@drawable/icon_calc_disance" />
+            android:src="@drawable/icon_add_road" />
 
         <ImageButton
             android:id="@+id/main_activity_menu"

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

@@ -58,6 +58,7 @@
         android:layout_height="0dp"
         android:layout_marginTop="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/task_search" />
+        app:layout_constraintTop_toBottomOf="@id/task_search"
+        tools:ignore="MissingClass" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>