From e352a34ef9551633026421e08a5c7324194f04a9 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Wed, 14 Jun 2023 13:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E6=8E=A7=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  11 -
 .../omqs/ui/activity/login/LoginActivity.kt   |   4 +-
 .../omqs/ui/activity/map/MainActivity.kt      | 155 ++++-
 .../console/ConsoleFragment.kt}               | 126 ++--
 .../EvaluationResultFragment.kt               |  48 +-
 ...gerFragment.kt => LayerManagerFragment.kt} |  12 +-
 .../fragment/offlinemap/OfflineMapFragment.kt |   5 +-
 .../personalcenter/PersonalCenterFragment.kt  |   5 +-
 .../qsrecordlist/QsRecordListFragment.kt      |  12 +-
 .../fragment/tasklist/TaskManagerFragment.kt  |   4 +-
 .../res/drawable-v24/baseline_minimize_24.xml |  10 +
 .../drawable-xxhdpi/icon_main_bottom_home.png | Bin 0 -> 8002 bytes
 .../icon_main_bottom_offline_map.png          | Bin 0 -> 5513 bytes
 .../drawable-xxhdpi/icon_main_bottom_res.png  | Bin 0 -> 4378 bytes
 .../icon_main_bottom_route.png                | Bin 0 -> 3909 bytes
 .../drawable-xxhdpi/icon_main_bottom_task.png | Bin 0 -> 4256 bytes
 .../main/res/drawable/shape_bottom_sheet.xml  |  15 +
 app/src/main/res/layout/activity_main.xml     | 614 +++++++++++-------
 app/src/main/res/layout/adapter_sign.xml      |   2 +-
 app/src/main/res/layout/console_off.xml       |   2 +-
 app/src/main/res/layout/console_on.xml        |   2 +-
 ...ivity_console.xml => fragment_console.xml} |   3 +-
 .../res/navigation/left_drawer_nav_graph.xml  |   2 +-
 app/src/main/res/values/styles.xml            |   5 +
 .../src/main/assets/editormarker.xml          |  28 +-
 .../src/main/assets/omdb/icon_4002_0.png      | Bin 7441 -> 0 bytes
 .../src/main/assets/omdb/icon_4002_0.svg      |   1 +
 .../src/main/assets/omdb/icon_4002_1.png      | Bin 9099 -> 0 bytes
 .../src/main/assets/omdb/icon_4002_1.svg      |   1 +
 .../src/main/assets/omdb/icon_4003_0.png      | Bin 9181 -> 0 bytes
 .../src/main/assets/omdb/icon_4003_0.svg      |   1 +
 .../src/main/assets/omdb/icon_4003_1.png      | Bin 10639 -> 0 bytes
 .../src/main/assets/omdb/icon_4003_1.svg      |   1 +
 .../src/main/assets/omdb/icon_4004_0.png      | Bin 8316 -> 0 bytes
 .../src/main/assets/omdb/icon_4004_0.svg      |   1 +
 .../src/main/assets/omdb/icon_4004_1.png      | Bin 9309 -> 0 bytes
 .../src/main/assets/omdb/icon_4006_0.png      | Bin 9738 -> 0 bytes
 .../src/main/assets/omdb/icon_4006_0.svg      |   1 +
 .../src/main/assets/omdb/icon_4022_0.png      | Bin 26723 -> 0 bytes
 .../src/main/assets/omdb/icon_4022_0.svg      | 162 +++++
 .../src/main/assets/omdb/icon_arrow_right.png | Bin 1032 -> 0 bytes
 .../src/main/assets/omdb/icon_arrow_right.svg |  40 ++
 .../collect/library/map/NIMapView.java        |   3 +-
 .../map/handler/LayerManagerHandler.kt        |  55 +-
 vtm                                           |   2 +-
 45 files changed, 900 insertions(+), 433 deletions(-)
 rename app/src/main/java/com/navinfo/omqs/ui/{activity/console/ConsoleActivity.kt => fragment/console/ConsoleFragment.kt} (63%)
 rename app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/{LayermanagerFragment.kt => LayerManagerFragment.kt} (82%)
 create mode 100644 app/src/main/res/drawable-v24/baseline_minimize_24.xml
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png
 create mode 100644 app/src/main/res/drawable/shape_bottom_sheet.xml
 rename app/src/main/res/layout/{activity_console.xml => fragment_console.xml} (81%)
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4002_0.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4002_0.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4002_1.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4002_1.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4003_0.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4003_0.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4003_1.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4003_1.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4004_0.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4004_0.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4004_1.png
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4006_0.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4006_0.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_4022_0.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_4022_0.svg
 delete mode 100644 collect-library/src/main/assets/omdb/icon_arrow_right.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_arrow_right.svg

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 184ccfd4..449d6cf9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,17 +63,6 @@
             android:launchMode="singleTask"
             android:screenOrientation="landscape"
             android:theme="@style/Theme.OMQualityInspection" />
-
-        <activity
-            android:name=".ui.activity.console.ConsoleActivity"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:screenOrientation="landscape"
-            android:theme="@style/Theme.OMQualityInspection">
-
-        </activity>
-
         <meta-data
             android:name="ScopedStorage"
             android:value="true" />
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
index d7ed2643..5def15d7 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
@@ -13,8 +13,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityLoginBinding
 import com.navinfo.omqs.ui.activity.CheckPermissionsActivity
-import com.navinfo.omqs.ui.activity.PermissionsActivity
-import com.navinfo.omqs.ui.activity.console.ConsoleActivity
 import com.navinfo.omqs.ui.activity.map.MainActivity
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -90,7 +88,7 @@ class LoginActivity : CheckPermissionsActivity() {
             LoginStatus.LOGIN_STATUS_SUCCESS -> {
                 loginDialog?.dismiss()
                 loginDialog = null
-                val intent = Intent(this@LoginActivity, ConsoleActivity::class.java)
+                val intent = Intent(this@LoginActivity, MainActivity::class.java)
                 startActivity(intent)
                 finish()
             }
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 5a130f78..d5574fb1 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
@@ -12,12 +12,9 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
-import androidx.annotation.RequiresApi
-import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -30,6 +27,10 @@ import com.navinfo.omqs.databinding.ActivityMainBinding
 import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.tools.LayerConfigUtils
 import com.navinfo.omqs.ui.activity.BaseActivity
+import com.navinfo.omqs.ui.fragment.console.ConsoleFragment
+import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment
+import com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListFragment
+import com.navinfo.omqs.ui.fragment.tasklist.TaskManagerFragment
 import com.navinfo.omqs.ui.widget.RecyclerViewSpacesItemDecoration
 import com.navinfo.omqs.util.FlowEventBus
 import com.navinfo.omqs.util.SpeakMode
@@ -49,6 +50,14 @@ class MainActivity : BaseActivity() {
     private lateinit var binding: ActivityMainBinding
     private val viewModel by viewModels<MainViewModel>()
 
+    /**
+     * 左侧fragment
+     */
+    private var leftFragment: Fragment? = null
+
+    /**
+     * 是否开启右侧面板
+     */
     var switchFragment = false
 
     /**
@@ -79,7 +88,7 @@ class MainActivity : BaseActivity() {
      * 提前显示要素看板
      */
     private val signAdapter by lazy {
-        SignAdapter { position, autoSave,signBean ->
+        SignAdapter { _, autoSave, signBean ->
             rightController.currentDestination?.let {
                 if (it.id == R.id.RightEmptyFragment) {
                     val bundle = Bundle()
@@ -95,7 +104,7 @@ class MainActivity : BaseActivity() {
      * 道路信息看板
      */
     private val topSignAdapter by lazy {
-        TopSignAdapter { position, signBean ->
+        TopSignAdapter { _, signBean ->
             rightController.currentDestination?.let {
                 if (it.id == R.id.RightEmptyFragment) {
                     val bundle = Bundle()
@@ -108,7 +117,6 @@ class MainActivity : BaseActivity() {
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         super.onCreate(savedInstanceState)
 
         val checkIntent = Intent()
@@ -138,22 +146,19 @@ class MainActivity : BaseActivity() {
         //给xml传递viewModel对象
         binding.viewModel = viewModel
 
-        binding.mainActivityVoice.setOnTouchListener(object : View.OnTouchListener {
-            @RequiresApi(Build.VERSION_CODES.Q)
-            override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-                when (event?.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        voiceOnTouchStart()//Do Something
-                        Log.e("qj", "voiceOnTouchStart")
-                    }
-                    MotionEvent.ACTION_UP -> {
-                        voiceOnTouchStop()//Do Something
-                        Log.e("qj", "voiceOnTouchStop")
-                    }
+        binding.mainActivityVoice.setOnTouchListener { v, event ->
+            when (event?.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    voiceOnTouchStart()//Do Something
+                    Log.e("qj", "voiceOnTouchStart")
+                }
+                MotionEvent.ACTION_UP -> {
+                    voiceOnTouchStop()//Do Something
+                    Log.e("qj", "voiceOnTouchStop")
                 }
-                return v?.onTouchEvent(event) ?: true
             }
-        })
+            v?.onTouchEvent(event) ?: true
+        }
 
         viewModel.liveDataQsRecordIdList.observe(this) {
             //处理页面跳转
@@ -217,7 +222,7 @@ class MainActivity : BaseActivity() {
             }
         }
 
-        findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { controller, destination, arguments ->
+        findNavController(R.id.main_activity_right_fragment).addOnDestinationChangedListener { _, destination, arguments ->
             if (destination.id == R.id.RightEmptyFragment) {
                 binding.mainActivityRightVisibilityButtonsGroup.visibility = View.VISIBLE
             } else {
@@ -226,6 +231,9 @@ class MainActivity : BaseActivity() {
                 binding.mainActivitySelectLine.isSelected = false
             }
         }
+
+        supportFragmentManager.beginTransaction()
+            .add(R.id.console_fragment_layout, ConsoleFragment()).commit()
     }
 
     //根据输入的经纬度跳转坐标
@@ -292,7 +300,15 @@ class MainActivity : BaseActivity() {
      * 打开个人中菜单
      */
     fun openMenu() {
-        binding.mainActivityDrawer.open()
+        supportFragmentManager.beginTransaction()
+            .replace(R.id.console_fragment_layout, ConsoleFragment()).commit()
+        if (leftFragment != null) {
+            supportFragmentManager.beginTransaction().remove(leftFragment!!).commit()
+            leftFragment = null
+            binding.mainActivityBottomSheetGroup.visibility = View.GONE
+            binding.mainActivityLeftFragment.visibility = View.GONE
+        }
+//        binding.mainActivityDrawer.open()
     }
 
     /**
@@ -328,7 +344,7 @@ class MainActivity : BaseActivity() {
     /**
      * 点击搜索
      */
-    fun onClickSerach() {
+    fun onClickSearch() {
 
     }
 
@@ -389,18 +405,89 @@ class MainActivity : BaseActivity() {
         binding.mainActivitySelectLine.isSelected = viewModel.isSelectRoad()
     }
 
-    fun voiceOnTouchStart() {
-        viewModel.startSoundMetter(this, binding.mainActivityVoice)
-    }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun voiceOnTouchStop() {
-        if (Constant.IS_VIDEO_SPEED) {
-            viewModel.stopSoundMeter()
+    /**
+     * 打开或关闭底部导航栏
+     */
+    fun onSwitchSheet() {
+        if (binding.mainActivityBottomSheetGroup.visibility == View.VISIBLE) {
+            binding.mainActivityBottomSheetGroup.visibility = View.GONE
+        } else {
+            binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
         }
     }
 
-//    override fun onBackPressed() {
-//        super.onBackPressed()
-//    }
+    private fun voiceOnTouchStart() {
+        viewModel.startSoundMetter(this, binding.mainActivityVoice)
+    }
+
+    private fun voiceOnTouchStop() {
+        if (Constant.IS_VIDEO_SPEED) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                viewModel.stopSoundMeter()
+            }
+        }
+    }
+
+    /**
+     * 打开测评任务面板
+     */
+    fun onClickTaskFragment() {
+        if (leftFragment !is TaskManagerFragment) {
+            if (leftFragment == null) {
+                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                binding.mainActivityLeftFragment.visibility = View.VISIBLE
+            }
+            leftFragment = TaskManagerFragment {
+                binding.mainActivityLeftFragment.visibility = View.GONE
+                supportFragmentManager.beginTransaction()
+                    .remove(leftFragment!!).commit()
+                leftFragment = null
+                null
+            }
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.main_activity_left_fragment, leftFragment!!).commit()
+        }
+    }
+
+    /**
+     * 打开测评结果面板
+     */
+    fun onClickResFragment() {
+        if (leftFragment !is QsRecordListFragment) {
+            if (leftFragment == null) {
+                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                binding.mainActivityLeftFragment.visibility = View.VISIBLE
+            }
+            leftFragment = QsRecordListFragment {
+                binding.mainActivityLeftFragment.visibility = View.GONE
+                supportFragmentManager.beginTransaction()
+                    .remove(leftFragment!!).commit()
+                leftFragment = null
+                null
+            }
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.main_activity_left_fragment, leftFragment!!).commit()
+        }
+    }
+    /**
+     * 打开离线地图
+     */
+    fun onClickOfflineMapFragment(){
+        if (leftFragment !is OfflineMapFragment) {
+            if (leftFragment == null) {
+                binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
+                binding.mainActivityLeftFragment.visibility = View.VISIBLE
+            }
+            leftFragment = OfflineMapFragment {
+                binding.mainActivityLeftFragment.visibility = View.GONE
+                supportFragmentManager.beginTransaction()
+                    .remove(leftFragment!!).commit()
+                leftFragment = null
+                null
+            }
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.main_activity_left_fragment, leftFragment!!).commit()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
similarity index 63%
rename from app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt
rename to app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
index 589d33f2..c882bb55 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/console/ConsoleActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
@@ -1,27 +1,30 @@
-package com.navinfo.omqs.ui.activity.console
+package com.navinfo.omqs.ui.fragment.console
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.transition.AutoTransition
 import androidx.transition.Scene
 import androidx.transition.TransitionManager
 import com.navinfo.omqs.R
-import com.navinfo.omqs.databinding.ActivityConsoleBinding
-import com.navinfo.omqs.ui.activity.BaseActivity
+import com.navinfo.omqs.databinding.FragmentConsoleBinding
 import com.navinfo.omqs.ui.activity.map.MainActivity
-import com.navinfo.omqs.ui.fragment.layermanager.LayermanagerFragment
+import com.navinfo.omqs.ui.fragment.BaseFragment
+import com.navinfo.omqs.ui.fragment.evaluationresult.EvaluationResultFragment
+import com.navinfo.omqs.ui.fragment.layermanager.LayerManagerFragment
 import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment
 import com.navinfo.omqs.ui.fragment.personalcenter.PersonalCenterFragment
+import com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class ConsoleActivity : BaseActivity(), OnClickListener {
+class ConsoleFragment : BaseFragment(), OnClickListener {
 
-    private var _binding: ActivityConsoleBinding? = null
+    private var _binding: FragmentConsoleBinding? = null
     private val binding get() = _binding!!
     private var sceneFlag = true
     private val aTransition = AutoTransition()
@@ -32,14 +35,14 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
     // 创建a场景
     private val aScene by lazy {
         Scene.getSceneForLayout(
-            binding.consoleRoot, R.layout.console_on, this
+            binding.consoleRoot, R.layout.console_on, requireContext()
         )
     }
 
     // 创建b场景
     private val bScene by lazy {
         Scene.getSceneForLayout(
-            binding.consoleRoot, R.layout.console_off, this
+            binding.consoleRoot, R.layout.console_off, requireContext()
         )
     }
 
@@ -48,18 +51,21 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
 //            .inflateTransitionManager(R.transition.transitionmanager_console, binding.consoleRoot)
 //    }
 
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentConsoleBinding.inflate(inflater, container, false)
+        return binding.root
+    }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        _binding = ActivityConsoleBinding.inflate(layoutInflater)
-        setContentView(_binding!!.root)
-//        mTransitionAManager.setTransition(bScene, transition)
-
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         aTransition.addListener(object : androidx.transition.Transition.TransitionListener {
             override fun onTransitionStart(transition: androidx.transition.Transition) {
+                sceneFlag = true
                 if (mFragment != null) {
                     Log.e("jingo", "动画开始B mFragment 不为null")
-                    supportFragmentManager.beginTransaction().remove(mFragment!!).commit()
+                    childFragmentManager.beginTransaction().remove(mFragment!!).commit()
                     mFragment = null
                 }
             }
@@ -81,9 +87,10 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
         })
         bTransition.addListener(object : androidx.transition.Transition.TransitionListener {
             override fun onTransitionStart(transition: androidx.transition.Transition) {
+                sceneFlag = false
                 if (mFragment != null) {
                     Log.e("jingo", "动画开始A mFragment 不为null")
-                    supportFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
+                    childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
                         .commit()
                 }
             }
@@ -105,6 +112,7 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
         initOnClickListener()
     }
 
+
     /**
      * 设置点击事件
      */
@@ -142,8 +150,12 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
          */
         binding.consoleRoot.findViewById<View>(R.id.console_evaluation_icon_bg)
             ?.setOnClickListener(this)
-        binding.consoleRoot.findViewById<View>(R.id.console_evaluation_bg)
-            ?.setOnClickListener(this)
+        binding.consoleRoot.findViewById<View>(R.id.console_evaluation_bg)?.setOnClickListener(this)
+        /**
+         * 评测任务
+         */
+        binding.consoleRoot.findViewById<View>(R.id.console_task_bg)?.setOnClickListener(this)
+        binding.consoleRoot.findViewById<View>(R.id.console_task_icon_bg)?.setOnClickListener(this)
     }
 
     override fun onDestroy() {
@@ -158,39 +170,37 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
                  *   地图点击事件
                  */
                 R.id.console_map_bg, R.id.console_map_icon_bg -> {
-                    val intent = Intent(this, MainActivity::class.java)
-                    startActivity(intent)
+                    activity?.let { a ->
+                        a.supportFragmentManager.beginTransaction().remove(this).commit()
+                    }
                 }
                 /**
                  * 离线地图点击
                  */
                 R.id.console_offline_map_icon_bg, R.id.console_offline_map_bg -> {
-                    if (sceneFlag) {
-                        mFragment = OfflineMapFragment()
-                        sceneFlag = false
-                        TransitionManager.go(bScene, bTransition)
-                    } else {
-                        if (mFragment !is OfflineMapFragment) {
-                            mFragment = OfflineMapFragment()
-                            supportFragmentManager.beginTransaction()
-                                .replace(fragmentId, mFragment!!).commit()
-                        }
-                        return
+                    activity?.let { a ->
+                        a.supportFragmentManager.beginTransaction().remove(this).commit()
+                        (a as MainActivity).onClickOfflineMapFragment()
                     }
+
                 }
                 /**
                  * 个人中心点击
                  */
                 R.id.console_personal_center_bg, R.id.console_personal_center_icon_bg -> {
                     if (sceneFlag) {
-                        mFragment = PersonalCenterFragment()
+                        mFragment = PersonalCenterFragment {
+                            TransitionManager.go(aScene, aTransition)
+                        }
                         sceneFlag = false
                         TransitionManager.go(bScene, bTransition)
                     } else {
                         if (mFragment !is PersonalCenterFragment) {
-                            mFragment = PersonalCenterFragment()
-                            supportFragmentManager.beginTransaction()
-                                .replace(fragmentId, mFragment!!).commit()
+                            mFragment = PersonalCenterFragment {
+                                TransitionManager.go(aScene, aTransition)
+                            }
+                            childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
+                                .commit()
                         }
                         return
                     }
@@ -199,36 +209,38 @@ class ConsoleActivity : BaseActivity(), OnClickListener {
                  * 图层设置
                  */
                 R.id.console_layer_setting_bg, R.id.console_layer_setting_icon_bg -> {
-/*                    if (sceneFlag) {
-                        mFragment = LayermanagerFragment()
+                    if (sceneFlag) {
+                        mFragment = LayerManagerFragment {
+                            TransitionManager.go(aScene, aTransition)
+                        }
                         sceneFlag = false
                         TransitionManager.go(bScene, bTransition)
                     } else {
-                        if (mFragment !is LayermanagerFragment) {
-                            mFragment = LayermanagerFragment()
-                            supportFragmentManager.beginTransaction()
-                                .replace(fragmentId, mFragment!!).commit()
+                        if (mFragment !is LayerManagerFragment) {
+                            mFragment = LayerManagerFragment {
+                                TransitionManager.go(aScene, aTransition)
+                            }
+                            childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
+                                .commit()
                         }
                         return
-                    }*/
+                    }
                 }
                 /**
                  * 测评结果列表
                  */
-                R.id.console_evaluation_icon_bg,
-                R.id.console_evaluation_bg -> {
-//                    if (sceneFlag) {
-//                        mFragment = LayermanagerFragment()
-//                        sceneFlag = false
-//                        TransitionManager.go(bScene, bTransition)
-//                    } else {
-//                        if (mFragment !is LayermanagerFragment) {
-//                            mFragment = LayermanagerFragment()
-//                            supportFragmentManager.beginTransaction()
-//                                .replace(fragmentId, mFragment!!).commit()
-//                        }
-//                        return
-//                    }
+                R.id.console_evaluation_icon_bg, R.id.console_evaluation_bg -> {
+                    activity?.let { a ->
+                        a.supportFragmentManager.beginTransaction().remove(this).commit()
+                        (a as MainActivity).onClickResFragment()
+                    }
+                }
+                R.id.console_task_icon_bg, R.id.console_task_bg -> {
+                    activity?.let { a ->
+                        a.supportFragmentManager.beginTransaction().remove(this).commit()
+                        (a as MainActivity).onClickTaskFragment()
+                    }
+
                 }
                 else -> {}
             }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
index f44a8f3c..d2f0ccae 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
@@ -93,29 +93,26 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         }
 
 
-        binding.evaluationVoice.setOnTouchListener(object : View.OnTouchListener {
-            @RequiresApi(Build.VERSION_CODES.Q)
-            override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-                Log.e("qj", event?.action.toString())
-                when (event?.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        voiceOnTouchStart()//Do Something
-                        Log.e("qj", "voiceOnTouchStart")
-                    }
-
-                    MotionEvent.ACTION_UP -> {
-                        voiceOnTouchStop()//Do Something
-                        Log.e("qj", "ACTION_UP")
-                    }
-
-                    MotionEvent.ACTION_CANCEL -> {
-                        voiceOnTouchStop()//Do Something
-                        Log.e("qj", "ACTION_CANCEL")
-                    }
+        binding.evaluationVoice.setOnTouchListener { _, event ->
+            Log.e("qj", event?.action.toString())
+            when (event?.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    voiceOnTouchStart()//Do Something
+                    Log.e("qj", "voiceOnTouchStart")
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    voiceOnTouchStop()//Do Something
+                    Log.e("qj", "ACTION_UP")
+                }
+
+                MotionEvent.ACTION_CANCEL -> {
+                    voiceOnTouchStop()//Do Something
+                    Log.e("qj", "ACTION_CANCEL")
                 }
-                return true
             }
-        })
+            true
+        }
 
         /**
          * 读取元数据
@@ -308,15 +305,16 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         }
     }
 
-    fun voiceOnTouchStart() {
+    private fun voiceOnTouchStart() {
         viewModel.startSoundMetter(requireActivity(), binding.evaluationVoice)
     }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun voiceOnTouchStop() {
+    private fun voiceOnTouchStop() {
         Log.e("qj", "voiceOnTouchStop====${Constant.IS_VIDEO_SPEED}")
         if (Constant.IS_VIDEO_SPEED) {
-            viewModel.stopSoundMeter()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                viewModel.stopSoundMeter()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
similarity index 82%
rename from app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt
rename to app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
index ba11a236..69230988 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayermanagerFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
@@ -4,17 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.blankj.utilcode.util.SPStaticUtils
-import com.navinfo.omqs.Constant
-import com.navinfo.omqs.databinding.FragmentEmptyBinding
 import com.navinfo.omqs.databinding.FragmentLayerManagerBinding
 import com.navinfo.omqs.ui.fragment.BaseFragment
-import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapCityListViewModel
 
-class LayermanagerFragment : BaseFragment(){
+class LayerManagerFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(){
     private var _binding: FragmentLayerManagerBinding? = null
 
     private val binding get() = _binding!!
@@ -44,13 +39,14 @@ class LayermanagerFragment : BaseFragment(){
         }
 
         binding.imgBack.setOnClickListener {
-            findNavController().navigateUp()
+           backListener?.invoke()
         }
 
-        binding.tvTitle.text = findNavController().currentDestination?.label
+        binding.tvTitle.text = "图层设置"//findNavController().currentDestination?.label
 
         binding.imgConfirm.setOnClickListener {  // 用户点击确认，重新设置当前的图层显隐控制
             viewModel.saveLayerConfigList(adapter.parentItems)
+            backListener?.invoke()
         }
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt
index c04ceb9d..2e8d7ac3 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapFragment.kt
@@ -13,7 +13,8 @@ import com.navinfo.omqs.ui.fragment.BaseFragment
 /**
  * 离线地图总页面
  */
-class OfflineMapFragment : BaseFragment() {
+class OfflineMapFragment(private var backListener: (() -> Unit?)? = null) :
+    BaseFragment() {
 
     private var _binding: FragmentOfflineMapBinding? = null
 
@@ -48,7 +49,7 @@ class OfflineMapFragment : BaseFragment() {
 
         //处理返回按钮
         binding.offlineMapBack.setOnClickListener {
-            findNavController().popBackStack()
+            backListener?.invoke()
         }
     }
 
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 5d53c83a..82b04705 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
@@ -29,7 +29,8 @@ import javax.inject.Inject
  * 个人中心
  */
 @AndroidEntryPoint
-class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
+class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment(),
+    FSAFActivityCallbacks {
 
     private var _binding: FragmentPersonalCenterBinding? = null
     private val binding get() = _binding!!
@@ -111,7 +112,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                     viewModel.readRealmData()
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint(40.031657799200346, 116.32207834810715  ))
+                        .animateTo(GeoPoint(40.031657799200346, 116.32207834810715))
                 }
                 R.id.personal_center_menu_task_list -> {
                     findNavController().navigate(R.id.TaskManagerFragment)
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
index e4fb1819..30d52e77 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
@@ -16,7 +16,7 @@ import com.navinfo.omqs.ui.fragment.tasklist.QsRecordListAdapter
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class QsRecordListFragment : BaseFragment(){
+class QsRecordListFragment(private var backListener: (() -> Unit?)? = null) : BaseFragment() {
     private var _binding: FragmentQsRecordListBinding? = null
     private val viewModel by viewModels<QsRecordListViewModel>()
     private val binding get() = _binding!!
@@ -44,7 +44,7 @@ class QsRecordListFragment : BaseFragment(){
         binding.qsRecyclerview.adapter = adapter
         viewModel.liveDataQSList.observe(viewLifecycleOwner) {
             adapter.refreshData(it)
-            binding.tvTitleCount.text = "共"+adapter.data.size+"条"
+            binding.tvTitleCount.text = "共" + adapter.data.size + "条"
         }
         val itemDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
         itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator))
@@ -53,13 +53,13 @@ class QsRecordListFragment : BaseFragment(){
         // itemClick
         adapter.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
             override fun onItemClickListener(position: Int) {
-                viewModel.onItemClickListener(activity as MainActivity,position)
-                findNavController().popBackStack()
+                viewModel.onItemClickListener(activity as MainActivity, position)
+                backListener?.invoke()
             }
         })
 
-        binding.imgBack.setOnClickListener{
-            findNavController().navigateUp()
+        binding.imgBack.setOnClickListener {
+            backListener?.invoke()
         }
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt
index 8c74cdfc..ec11bd80 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt
@@ -15,7 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint
  * 评测任务viewpager管理页面
  */
 @AndroidEntryPoint
-class TaskManagerFragment : BaseFragment() {
+class TaskManagerFragment(private var backListener: ((TaskManagerFragment) -> Unit?)? = null) : BaseFragment() {
     private var _binding: FragmentTaskManagerBinding? = null
 
     private val binding get() = _binding!!
@@ -53,7 +53,7 @@ class TaskManagerFragment : BaseFragment() {
         }.attach()
         viewModel.getTaskList(requireContext())
         binding.taskBack.setOnClickListener {
-            findNavController().navigateUp()
+            backListener?.invoke(this)
         }
     }
 
diff --git a/app/src/main/res/drawable-v24/baseline_minimize_24.xml b/app/src/main/res/drawable-v24/baseline_minimize_24.xml
new file mode 100644
index 00000000..73c835c2
--- /dev/null
+++ b/app/src/main/res/drawable-v24/baseline_minimize_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="24dp"
+    android:tint="@color/blue"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/blue"
+        android:pathData="M6,19h12v2H6z" />
+</vector>
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b5ad319c5b16435785592866ac2c37de1b672c6
GIT binary patch
literal 8002
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_offline_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ca4ce2bb77bd3a1ab5214251b995478b7fdec13
GIT binary patch
literal 5513
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
LNkvXXu0mjfjca2d

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_res.png
new file mode 100644
index 0000000000000000000000000000000000000000..e14eff80f17fb5fa9a678b087cab028da550313a
GIT binary patch
literal 4378
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
U9+)pE{{R3007*qoM6N<$f>auV^#A|>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_route.png
new file mode 100644
index 0000000000000000000000000000000000000000..38b06d45738a0a9e675f0378ecb904274fee9377
GIT binary patch
literal 3909
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
Tyo8FA00000NkvXXu0mjfIT(a)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png b/app/src/main/res/drawable-xxhdpi/icon_main_bottom_task.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9942030c4edda090800eb5e8fbefeed185f0ac8
GIT binary patch
literal 4256
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
C**mlV

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/shape_bottom_sheet.xml b/app/src/main/res/drawable/shape_bottom_sheet.xml
new file mode 100644
index 00000000..3fa8cf1c
--- /dev/null
+++ b/app/src/main/res/drawable/shape_bottom_sheet.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 完整的矩形 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/blue" />
+        </shape>
+    </item>
+    <!-- 部分矩形，只有一侧有颜色 -->
+    <item android:top="2dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb17c8e4..690d0642 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,265 +17,397 @@
             type="com.navinfo.omqs.ui.activity.map.MainViewModel" />
     </data>
 
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/main_activity_drawer"
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context=".ui.activity.map.MainActivity">
+        <com.navinfo.collect.library.map.NIMapView
+            android:id="@+id/main_activity_map"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.navinfo.collect.library.map.NIMapView
-                android:id="@+id/main_activity_map"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <ImageButton
+            android:id="@+id/main_activity_camera2"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:background="@null"
+            android:onClick="@{()->mainActivity.openCamera()}"
+            android:src="@drawable/baseline_person_24"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/main_activity_top_sign_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageButton
-                android:id="@+id/main_activity_camera2"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="20dp"
-                android:background="@null"
-                android:onClick="@{()->mainActivity.openCamera()}"
-                android:src="@drawable/baseline_person_24"
-                android:visibility="gone"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/main_activity_sign_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:maxHeight="350dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/main_activity_top_sign_recyclerview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/main_activity_flow"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/top_right_drawer_btns_mr"
+            app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance,main_activity_menu"
+            app:flow_horizontalGap="6dp"
+            app:flow_wrapMode="aligned"
+            app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageButton
-                android:id="@+id/main_activity_person_center"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="20dp"
-                android:background="@null"
-                android:onClick="@{()->mainActivity.openMenu()}"
-                android:src="@drawable/baseline_person_24"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_menu_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/main_activity_sign_recyclerview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:maxHeight="350dp"
-                app:layout_constraintLeft_toLeftOf="@id/main_activity_person_center"
-                app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
+        <ImageButton
+            android:id="@+id/main_activity_serach"
+            style="@style/top_right_drawer_btns_style"
+            android:onClick="@{()->mainActivity.onClickSearch()}"
+            android:src="@drawable/icon_serach" />
 
-            <androidx.constraintlayout.helper.widget.Flow
-                android:id="@+id/main_activity_flow"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/top_right_drawer_btns_mr"
-                app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance,main_activity_menu"
-                app:flow_horizontalGap="6dp"
-                app:flow_wrapMode="aligned"
-                app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
-                app:layout_constraintTop_toTopOf="parent" />
+        <ImageButton
+            android:id="@+id/main_activity_2d_3d"
+            style="@style/top_right_drawer_btns_style"
+            android:onClick="@{()->mainActivity.onClick2DOr3D()}"
+            android:src="@drawable/icon_2d_3d" />
 
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/main_activity_menu_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="invisible"
-                app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance" />
+        <ImageButton
+            android:id="@+id/main_activity_camera"
+            style="@style/top_right_drawer_btns_style"
+            android:onClick="@{()->mainActivity.openCamera()}"
+            android:src="@drawable/icon_page_video_a1" />
 
-            <ImageButton
-                android:id="@+id/main_activity_serach"
-                style="@style/top_right_drawer_btns_style"
-                android:onClick="@{()->mainActivity.onClickSerach()}"
-                android:src="@drawable/icon_serach" />
+        <ImageButton
+            android:id="@+id/main_activity_trace"
+            style="@style/top_right_drawer_btns_style"
+            android:onClick="@{()->mainActivity.onClickTrace()}"
+            android:src="@drawable/icon_trace" />
 
-            <ImageButton
-                android:id="@+id/main_activity_2d_3d"
-                style="@style/top_right_drawer_btns_style"
-                android:onClick="@{()->mainActivity.onClick2DOr3D()}"
-                android:src="@drawable/icon_2d_3d" />
+        <ImageButton
+            android:id="@+id/main_activity_calc_disance"
+            style="@style/top_right_drawer_btns_style"
+            android:onClick="@{()->mainActivity.onClickCalcDisance()}"
+            android:src="@drawable/icon_calc_disance" />
 
-            <ImageButton
-                android:id="@+id/main_activity_camera"
-                style="@style/top_right_drawer_btns_style"
-                android:onClick="@{()->mainActivity.openCamera()}"
-                android:src="@drawable/icon_page_video_a1" />
+        <ImageButton
+            android:id="@+id/main_activity_menu"
+            android:layout_width="@dimen/top_right_drawer_wh"
+            android:layout_height="@dimen/top_right_drawer_wh"
+            android:background="@drawable/chk_icon_menu_open_close_xml"
+            android:elevation="2dp"
+            android:onClick="@{()->mainActivity.onClickMenu()}" />
 
-            <ImageButton
-                android:id="@+id/main_activity_trace"
-                style="@style/top_right_drawer_btns_style"
-                android:onClick="@{()->mainActivity.onClickTrace()}"
-                android:src="@drawable/icon_trace" />
+        <androidx.constraintlayout.widget.Barrier
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="end"
+            app:constraint_referenced_ids="main_activity_fragment_switch" />
 
-            <ImageButton
-                android:id="@+id/main_activity_calc_disance"
-                style="@style/top_right_drawer_btns_style"
-                android:onClick="@{()->mainActivity.onClickCalcDisance()}"
-                android:src="@drawable/icon_calc_disance" />
+        <ImageButton
+            android:id="@+id/main_activity_fragment_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_fragment_switch"
+            android:elevation="2dp"
+            android:onClick="@{()->mainActivity.onSwitchFragment()}"
+            app:layout_constraintBottom_toBottomOf="@id/main_activity_flow"
+            app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
+            app:layout_constraintTop_toTopOf="@id/main_activity_flow" />
 
-            <ImageButton
-                android:id="@+id/main_activity_menu"
-                android:layout_width="@dimen/top_right_drawer_wh"
-                android:layout_height="@dimen/top_right_drawer_wh"
-                android:background="@drawable/chk_icon_menu_open_close_xml"
-                android:elevation="2dp"
-                android:onClick="@{()->mainActivity.onClickMenu()}" />
-
-            <androidx.constraintlayout.widget.Barrier
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="end"
-                app:constraint_referenced_ids="main_activity_fragment_switch" />
-
-            <ImageButton
-                android:id="@+id/main_activity_fragment_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/selector_fragment_switch"
-                android:elevation="2dp"
-                android:onClick="@{()->mainActivity.onSwitchFragment()}"
-                app:layout_constraintBottom_toBottomOf="@id/main_activity_flow"
-                app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
-                app:layout_constraintTop_toTopOf="@id/main_activity_flow" />
-
-            <fragment
-                android:id="@+id/main_activity_right_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:elevation="3dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:navGraph="@navigation/right_fragment_nav_graph" />
-
-            <TextView
-                android:id="@+id/main_activity_geometry"
-                android:layout_width="@dimen/main_activity_geometry_w"
-                android:layout_height="@dimen/main_activity_geometry_h"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/shape_rect_white_8dp_bg"
-                android:drawableLeft="@drawable/icon_main_geometry"
-                android:elevation="2dp"
-                android:gravity="center"
-                android:onClick="@{()->mainActivity.jumpPosition()}"
-                android:paddingLeft="9dp"
-                android:text="经纬度:116.99388424,38.8403844"
-                android:textSize="10sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/main_activity_middle_fragment" />
-
-            <ImageButton
-                android:id="@+id/main_activity_zoom_out"
-                android:layout_width="@dimen/zoom_btns_w"
-                android:layout_height="@dimen/zoom_btns_h"
-                android:layout_marginBottom="12dp"
-                android:background="@drawable/selector_zoom_out_bg"
-                android:elevation="2dp"
-                android:onClick="@{(view)->mainActivity.zoomOutOnclick(view)}"
-                android:padding="8dp"
-                android:src="@drawable/icon_zoom_out"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_geometry"
-                app:layout_constraintRight_toRightOf="@id/main_activity_geometry" />
-
-            <ImageButton
-                android:id="@+id/main_activity_zoom_in"
-                android:layout_width="@dimen/zoom_btns_w"
-                android:layout_height="@dimen/zoom_btns_h"
-                android:background="@drawable/selector_zoom_in_bg"
-                android:elevation="2dp"
-                android:onClick="@{(view)->mainActivity.zoomInOnclick(view)}"
-                android:src="@drawable/icon_zoom_in"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_out"
-                app:layout_constraintRight_toRightOf="@id/main_activity_zoom_out" />
-
-            <ImageButton
-                android:id="@+id/main_activity_location"
-                style="@style/zoom_btns_style"
-                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" />
-
-            <ImageButton
-                android:id="@+id/main_activity_add_new"
-                style="@style/zoom_btns_style"
-                android:layout_marginBottom="12dp"
-                android:onClick="@{()->mainActivity.voiceOnclick()}"
-                android:src="@drawable/icon_add_data"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_location"
-                app:layout_constraintRight_toRightOf="@id/main_activity_location" />
-
-            <ImageButton
-                android:id="@+id/main_activity_voice"
-                style="@style/zoom_btns_style"
-                android:layout_marginBottom="12dp"
-                android:onClick="@{()->mainActivity.voiceOnclick()}"
-                android:src="@drawable/icon_add_voice"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_add_new"
-                app:layout_constraintRight_toRightOf="@id/main_activity_add_new" />
-
-            <ImageButton
-                android:id="@+id/main_activity_select_line"
-                style="@style/zoom_btns_style"
-                android:layout_marginBottom="12dp"
-                android:background="@drawable/selector_road_line_bg"
-                android:onClick="@{()->mainActivity.selectLineOnclick()}"
-                android:src="@drawable/selector_road_line_src"
-                app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
-                app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
-
-            <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" />
-
-            <fragment
-                android:id="@+id/main_activity_middle_fragment"
-                android:name="androidx.navigation.fragment.NavHostFragment"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginTop="6dp"
-                android:layout_marginRight="-1dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
-                app:layout_constraintTop_toBottomOf="@id/main_activity_flow"
-                app:navGraph="@navigation/middle_fragment_nav_graph" />
-
-            <androidx.constraintlayout.widget.Group
-                android:id="@+id/main_activity_fragment_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:constraint_referenced_ids="main_activity_right_fragment,main_activity_middle_fragment" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <FrameLayout
+            android:id="@+id/main_activity_left_fragment"
+            android:layout_width="@dimen/right_fragment_w"
+            android:layout_height="0dp"
+            android:background="@drawable/shape_left_fragment_bg"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="@id/main_activity_sign_recyclerview" />
 
         <fragment
-            android:id="@+id/main_activity_drawer_fragment"
+            android:id="@+id/main_activity_right_fragment"
             android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="323dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="left"
-            android:layout_marginTop="30dp"
-            app:navGraph="@navigation/left_drawer_nav_graph" />
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:elevation="3dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/right_fragment_nav_graph" />
+
+        <TextView
+            android:id="@+id/main_activity_geometry"
+            android:layout_width="@dimen/main_activity_geometry_w"
+            android:layout_height="@dimen/main_activity_geometry_h"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/shape_rect_white_8dp_bg"
+            android:drawableLeft="@drawable/icon_main_geometry"
+            android:elevation="2dp"
+            android:gravity="center"
+            android:onClick="@{()->mainActivity.jumpPosition()}"
+            android:paddingLeft="9dp"
+            android:text="经纬度:116.99388424,38.8403844"
+            android:textSize="10sp"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintRight_toLeftOf="@id/main_activity_middle_fragment" />
+
+        <ImageButton
+            android:id="@+id/main_activity_zoom_out"
+            android:layout_width="@dimen/zoom_btns_w"
+            android:layout_height="@dimen/zoom_btns_h"
+            android:layout_marginBottom="12dp"
+            android:background="@drawable/selector_zoom_out_bg"
+            android:elevation="2dp"
+            android:onClick="@{(view)->mainActivity.zoomOutOnclick(view)}"
+            android:padding="8dp"
+            android:src="@drawable/icon_zoom_out"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_geometry"
+            app:layout_constraintRight_toRightOf="@id/main_activity_geometry" />
+
+        <ImageButton
+            android:id="@+id/main_activity_zoom_in"
+            android:layout_width="@dimen/zoom_btns_w"
+            android:layout_height="@dimen/zoom_btns_h"
+            android:background="@drawable/selector_zoom_in_bg"
+            android:elevation="2dp"
+            android:onClick="@{(view)->mainActivity.zoomInOnclick(view)}"
+            android:src="@drawable/icon_zoom_in"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_out"
+            app:layout_constraintRight_toRightOf="@id/main_activity_zoom_out" />
+
+        <ImageButton
+            android:id="@+id/main_activity_location"
+            style="@style/zoom_btns_style"
+            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" />
+
+        <ImageButton
+            android:id="@+id/main_activity_add_new"
+            style="@style/zoom_btns_style"
+            android:layout_marginBottom="12dp"
+            android:onClick="@{()->mainActivity.voiceOnclick()}"
+            android:src="@drawable/icon_add_data"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_location"
+            app:layout_constraintRight_toRightOf="@id/main_activity_location" />
+
+        <ImageButton
+            android:id="@+id/main_activity_voice"
+            style="@style/zoom_btns_style"
+            android:layout_marginBottom="12dp"
+            android:onClick="@{()->mainActivity.voiceOnclick()}"
+            android:src="@drawable/icon_add_voice"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_add_new"
+            app:layout_constraintRight_toRightOf="@id/main_activity_add_new" />
+
+        <ImageButton
+            android:id="@+id/main_activity_select_line"
+            style="@style/zoom_btns_style"
+            android:layout_marginBottom="12dp"
+            android:background="@drawable/selector_road_line_bg"
+            android:onClick="@{()->mainActivity.selectLineOnclick()}"
+            android:src="@drawable/selector_road_line_src"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_voice"
+            app:layout_constraintRight_toRightOf="@id/main_activity_voice" />
+
+        <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" />
+
+        <fragment
+            android:id="@+id/main_activity_middle_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginRight="-1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_flow"
+            app:navGraph="@navigation/middle_fragment_nav_graph" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_fragment_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="main_activity_right_fragment,main_activity_middle_fragment" />
+
+        <View
+            android:id="@+id/main_activity_bottom_sheet"
+            android:layout_width="60dp"
+            android:layout_height="48dp"
+            android:background="@drawable/baseline_minimize_24"
+            android:onClick="@{()->mainActivity.onSwitchSheet()}"
+            android:paddingBottom="10dp"
+            app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+        <View
+            android:id="@+id/main_activity_bottom_sheet_bg"
+            android:layout_width="0dp"
+            android:layout_height="56dp"
+            android:background="@drawable/shape_bottom_sheet"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+        <ImageView
+            android:id="@+id/main_bottom_task"
+            style="@style/main_activity_bottom_sheet_icon"
+            android:background="@drawable/icon_main_bottom_task"
+            android:onClick="@{()->mainActivity.onClickTaskFragment()}"
+            app:layout_constraintBottom_toTopOf="@id/main_bottom_task_text"
+            app:layout_constraintLeft_toLeftOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintRight_toLeftOf="@id/main_bottom_res"
+            app:layout_constraintTop_toTopOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/main_bottom_task_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="@{()->mainActivity.onClickTaskFragment()}"
+            android:text="测评任务"
+            android:textColor="@color/blue"
+            android:textSize="10sp"
+            app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="@id/main_bottom_task"
+            app:layout_constraintRight_toRightOf="@id/main_bottom_task"
+            app:layout_constraintTop_toBottomOf="@id/main_bottom_task" />
+
+        <ImageView
+            android:id="@+id/main_bottom_res"
+            style="@style/main_activity_bottom_sheet_icon"
+            android:background="@drawable/icon_main_bottom_res"
+            android:onClick="@{()->mainActivity.onClickResFragment()}"
+            app:layout_constraintBottom_toTopOf="@id/main_bottom_res_text"
+            app:layout_constraintLeft_toRightOf="@id/main_bottom_task"
+            app:layout_constraintRight_toLeftOf="@id/main_bottom_home"
+            app:layout_constraintTop_toTopOf="@id/main_bottom_task"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/main_bottom_res_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="@{()->mainActivity.onClickResFragment()}"
+            android:text="测评结果"
+            android:textColor="@color/blue"
+            android:textSize="10sp"
+            app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="@id/main_bottom_res"
+            app:layout_constraintRight_toRightOf="@id/main_bottom_res"
+            app:layout_constraintTop_toBottomOf="@id/main_bottom_res" />
+
+        <ImageView
+            android:id="@+id/main_bottom_home"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:background="@drawable/icon_main_bottom_home"
+            android:onClick="@{()->mainActivity.openMenu()}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toRightOf="@id/main_bottom_res"
+            app:layout_constraintRight_toLeftOf="@id/main_bottom_offline_map"
+            app:layout_constraintTop_toTopOf="@id/main_activity_bottom_sheet_bg" />
+
+        <ImageView
+            android:id="@+id/main_bottom_offline_map"
+            style="@style/main_activity_bottom_sheet_icon"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
+            android:background="@drawable/icon_main_bottom_offline_map"
+            app:layout_constraintBottom_toTopOf="@id/main_bottom_offline_map_text"
+            app:layout_constraintLeft_toRightOf="@id/main_bottom_home"
+            app:layout_constraintRight_toLeftOf="@id/main_bottom_route"
+            app:layout_constraintTop_toTopOf="@id/main_bottom_task"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/main_bottom_offline_map_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="离线地图"
+            android:textColor="@color/blue"
+            android:textSize="10sp"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
+            app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="@id/main_bottom_offline_map"
+            app:layout_constraintRight_toRightOf="@id/main_bottom_offline_map"
+            app:layout_constraintTop_toBottomOf="@id/main_bottom_offline_map" />
+
+        <ImageView
+            android:id="@+id/main_bottom_route"
+            style="@style/main_activity_bottom_sheet_icon"
+            android:background="@drawable/icon_main_bottom_route"
+            app:layout_constraintBottom_toTopOf="@id/main_bottom_route_text"
+            app:layout_constraintLeft_toRightOf="@id/main_bottom_offline_map"
+            app:layout_constraintRight_toRightOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintTop_toTopOf="@id/main_bottom_task"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <TextView
+            android:id="@+id/main_bottom_route_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="路径规划"
+            android:textColor="@color/blue"
+            android:textSize="10sp"
+            app:layout_constraintBottom_toBottomOf="@id/main_activity_bottom_sheet_bg"
+            app:layout_constraintLeft_toLeftOf="@id/main_bottom_route"
+            app:layout_constraintRight_toRightOf="@id/main_bottom_route"
+            app:layout_constraintTop_toBottomOf="@id/main_bottom_route" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_bottom_sheet_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:constraint_referenced_ids="
+            main_bottom_route_text,
+            main_bottom_offline_map_text,
+            main_bottom_res_text,
+            main_bottom_task_text,main_bottom_route,
+            main_bottom_offline_map,
+            main_bottom_res,
+             main_activity_bottom_sheet_bg,
+            main_bottom_task,main_bottom_home" />
+
+        <FrameLayout
+            android:id="@+id/console_fragment_layout"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:elevation="4dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.drawerlayout.widget.DrawerLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_sign.xml b/app/src/main/res/layout/adapter_sign.xml
index 382b591b..98d10cb5 100644
--- a/app/src/main/res/layout/adapter_sign.xml
+++ b/app/src/main/res/layout/adapter_sign.xml
@@ -27,7 +27,7 @@
         android:gravity="center"
         android:text="80"
         android:textColor="#2F2F2F"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:id="@+id/sign_bottom_text"
diff --git a/app/src/main/res/layout/console_off.xml b/app/src/main/res/layout/console_off.xml
index df7ca452..7133021a 100644
--- a/app/src/main/res/layout/console_off.xml
+++ b/app/src/main/res/layout/console_off.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/console_bg"
-    tools:context=".ui.activity.console.ConsoleActivity">
+    tools:context=".ui.fragment.console.ConsoleFragment">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/console_left_guideline"
diff --git a/app/src/main/res/layout/console_on.xml b/app/src/main/res/layout/console_on.xml
index 0d71356e..86beb031 100644
--- a/app/src/main/res/layout/console_on.xml
+++ b/app/src/main/res/layout/console_on.xml
@@ -5,7 +5,7 @@
     android:id="@+id/console_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activity.console.ConsoleActivity">
+    tools:context=".ui.fragment.console.ConsoleFragment">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/console_left_guideline"
diff --git a/app/src/main/res/layout/activity_console.xml b/app/src/main/res/layout/fragment_console.xml
similarity index 81%
rename from app/src/main/res/layout/activity_console.xml
rename to app/src/main/res/layout/fragment_console.xml
index 0befc3e1..c6f55518 100644
--- a/app/src/main/res/layout/activity_console.xml
+++ b/app/src/main/res/layout/fragment_console.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:clickable="true"
     android:id="@+id/console_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/console_bg"
-    tools:context=".ui.activity.console.ConsoleActivity">
+    tools:context=".ui.fragment.console.ConsoleFragment">
 
     <include layout="@layout/console_on" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/left_drawer_nav_graph.xml b/app/src/main/res/navigation/left_drawer_nav_graph.xml
index 2e2c94b3..81d0f6be 100644
--- a/app/src/main/res/navigation/left_drawer_nav_graph.xml
+++ b/app/src/main/res/navigation/left_drawer_nav_graph.xml
@@ -39,7 +39,7 @@
 
     <fragment
         android:id="@+id/QsLayerManagerFragment"
-        android:name="com.navinfo.omqs.ui.fragment.layermanager.LayermanagerFragment"
+        android:name="com.navinfo.omqs.ui.fragment.layermanager.LayerManagerFragment"
         android:label="图层管理"
         tools:layout="@layout/fragment_qs_record_list">
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d8672f37..d0a4d202 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,10 @@
 <resources>
 
+    <style name="main_activity_bottom_sheet_icon" comment="主控页面下方按钮样式">
+        <item name="android:layout_width">36dp</item>
+        <item name="android:layout_height">36dp</item>
+    </style>
+
     <style name="console_on_left_bottom_icon" comment="主控页面左侧右下角按钮样式">
         <item name="android:layout_width">24dp</item>
         <item name="android:layout_height">24dp</item>
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 3c3395da..b413db0d 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1651,16 +1651,16 @@
             <m k="speedFlag">
                 <m v="0">
 <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="16" stroke="#ffffff"
+                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
-                    <symbol src="assets:omdb/icon_4002_0.png" symbol-width="46" symbol-height="46"></symbol>
+                    <symbol src="assets:omdb/icon_4002_0.svg" symbol-width="46" symbol-height="46"></symbol>
                     <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
                         stroke-width="1.0"></caption>
                 </m>
                 <m v="1">
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
-                    <symbol src="assets:omdb/icon_4002_1.png" symbol-width="46" symbol-height="46"></symbol>
+                    <symbol src="assets:omdb/icon_4002_1.svg" symbol-width="46" symbol-height="46"></symbol>
                     <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
                         stroke-width="1.0"></caption>
                 </m>
@@ -1671,16 +1671,16 @@
             <m k="speedFlag">
                 <m v="0">
                     <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
-                    <symbol src="assets:omdb/icon_4003_0.png" symbol-width="46" symbol-height="46"></symbol>
+                    <symbol src="assets:omdb/icon_4003_0.svg" symbol-width="46" symbol-height="46"></symbol>
                     <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
                         stroke-width="1.0"></caption>
                 </m>
                 <m v="1">
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
-                    <symbol src="assets:omdb/icon_4003_1.png" symbol-width="46" symbol-height="46"></symbol>
+                    <symbol src="assets:omdb/icon_4003_1.svg" symbol-width="46" symbol-height="46"></symbol>
                     <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
                         stroke-width="1.0"></caption>
                 </m>
@@ -1690,14 +1690,14 @@
         <m v="OMDB_SPEEDLIMIT_VAR">
             <m v="0">
                 <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                <caption k="maxSpeed" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <symbol src="assets:omdb/icon_4004_0.png" symbol-width="46" symbol-height="46"></symbol>
+                <symbol src="assets:omdb/icon_4004_0.svg" symbol-width="46" symbol-height="46"></symbol>
                 <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
                     stroke-width="1.0"></caption>
             </m>
             <m v="1">
-                <caption k="maxSpeed" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
                 <symbol src="assets:omdb/icon_4004_1.png" symbol-width="46" symbol-height="46"></symbol>
                 <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
@@ -1787,15 +1787,15 @@
         </m>
         <!--交通灯-->
         <m v="OMDB_TRAFFICLIGHT">
-            <symbol src="assets:omdb/icon_4022_0.png" repeat="false" symbol-width="14" symbol-height="40" rotate="false"></symbol>
+            <symbol src="assets:omdb/icon_4022_0.svg" repeat="false" symbol-width="46" symbol-height="46" rotate="false"></symbol>
         </m>
         <!--普通交限-->
         <m v="OMDB_RESTRICTION">
             <m k="angle">
-                <symbol src="assets:omdb/icon_4006_0.png" repeat="false" symbol-width="35" symbol-height="35" rotate="false" repeat-start="0" ></symbol>
+                <symbol src="assets:omdb/icon_4006_0.svg" repeat="false" symbol-width="46" symbol-height="46" rotate="false" repeat-start="0" ></symbol>
             </m>
             <m k="type" v="angle">
-                <symbol src="assets:omdb/icon_arrow_right.png" repeat-start="0" repeat-gap="2000" symbol-percent="45" repeat="false" rotate="true"></symbol>
+                <symbol src="assets:omdb/icon_arrow_right.svg" repeat-start="0" repeat-gap="2000" symbol-percent="45" repeat="false" rotate="true"></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line stroke="#14582c" width="0.1" dasharray="1,1" repeat-gap="3" repeat-start="0"/>
diff --git a/collect-library/src/main/assets/omdb/icon_4002_0.png b/collect-library/src/main/assets/omdb/icon_4002_0.png
deleted file mode 100644
index 2158547ca7deca1378e6c27d76f8824644efd7e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7441
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
QA16RnNmH>(-YWEe01Ermi~s-t

diff --git a/collect-library/src/main/assets/omdb/icon_4002_0.svg b/collect-library/src/main/assets/omdb/icon_4002_0.svg
new file mode 100644
index 00000000..a9418b73
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4002_0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{stroke:#db4646;stroke-width:3px;}.g{stroke:none;}.h{fill:none;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ff9287"/><stop offset="0.786" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-956 -396)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10174 7640)"><g class="f" transform="translate(-9178 -7204)"><circle class="g" cx="28" cy="28" r="28"/><circle class="h" cx="28" cy="28" r="26.5"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4002_1.png b/collect-library/src/main/assets/omdb/icon_4002_1.png
deleted file mode 100644
index db1014dad788839cb14d712bb2b946a598dcf61a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9099
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

diff --git a/collect-library/src/main/assets/omdb/icon_4002_1.svg b/collect-library/src/main/assets/omdb/icon_4002_1.svg
new file mode 100644
index 00000000..158b4f48
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4002_1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.h,.j{fill:none;}.a{opacity:0;}.b{fill:#4d4d4d;opacity:0.304;}.c{fill:#363333;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f,.g{fill:#fff;stroke-width:3px;}.f{stroke:#db4646;}.g,.h{stroke:#2f2f2f;}.h{stroke-linecap:round;stroke-width:2px;}.i{stroke:none;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#b5b4b4"/><stop offset="0.697" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-832 -256)"><g transform="translate(-124 -140)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10174 7640)"><g class="f" transform="translate(-9178 -7204)"><circle class="i" cx="28" cy="28" r="28"/><circle class="j" cx="28" cy="28" r="26.5"/></g></g><g transform="translate(573 -37)"><g transform="translate(423 473)"><g class="g"><circle class="i" cx="28" cy="28" r="28"/><circle class="j" cx="28" cy="28" r="26.5"/></g></g><g transform="translate(427.138 478.332)"><line class="h" y1="34.047" x2="33.845" transform="translate(0 0)"/><line class="h" y1="36.376" x2="36.552" transform="translate(4.81 4.168)"/><path class="h" d="M0,35.11,18.688,16.458,35.178,0" transform="translate(11.84 11.226)"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4003_0.png b/collect-library/src/main/assets/omdb/icon_4003_0.png
deleted file mode 100644
index 747e7357768e958dc47ae204e5a563b65525e0f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9181
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

diff --git a/collect-library/src/main/assets/omdb/icon_4003_0.svg b/collect-library/src/main/assets/omdb/icon_4003_0.svg
new file mode 100644
index 00000000..50a7b3b7
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4003_0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.f,.g{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{stroke:#db4646;stroke-width:3px;}.h,.j{stroke:none;}.i{fill:none;}.j{fill:#2a23f5;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ff9287"/><stop offset="0.786" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-956 -396)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(323 -181)"><g transform="translate(9849 7819)"><g class="f" transform="translate(-9178 -7204)"><circle class="h" cx="30" cy="30" r="30"/><circle class="i" cx="30" cy="30" r="28.5"/></g><g class="g" transform="translate(-9174 -7200)"><path class="h" d="M 26 50 C 22.75914001464844 50 19.61627960205078 49.36571884155273 16.65872955322266 48.11478042602539 C 13.80107021331787 46.90608978271484 11.23419952392578 45.17533111572266 9.029439926147461 42.97055816650391 C 6.82466983795166 40.76580047607422 5.093910217285156 38.19892883300781 3.885220050811768 35.34127044677734 C 2.63427996635437 32.38372039794922 2 29.24085998535156 2 26 C 2 22.75914001464844 2.63427996635437 19.61627960205078 3.885220050811768 16.65872955322266 C 5.093910217285156 13.80107021331787 6.82466983795166 11.23419952392578 9.029439926147461 9.029439926147461 C 11.23419952392578 6.82466983795166 13.80107021331787 5.093910217285156 16.65872955322266 3.885220050811768 C 19.61627960205078 2.63427996635437 22.75914001464844 2 26 2 C 29.24085998535156 2 32.38372039794922 2.63427996635437 35.34127044677734 3.885220050811768 C 38.19892883300781 5.093910217285156 40.76580047607422 6.82466983795166 42.97055816650391 9.029439926147461 C 45.17533111572266 11.23419952392578 46.90608978271484 13.80107021331787 48.11478042602539 16.65872955322266 C 49.36571884155273 19.61627960205078 50 22.75914001464844 50 26 C 50 29.24085998535156 49.36571884155273 32.38372039794922 48.11478042602539 35.34127044677734 C 46.90608978271484 38.19892883300781 45.17533111572266 40.76580047607422 42.97055816650391 42.97055816650391 C 40.76580047607422 45.17533111572266 38.19892883300781 46.90608978271484 35.34127044677734 48.11478042602539 C 32.38372039794922 49.36571884155273 29.24085998535156 50 26 50 Z"/><path class="j" d="M 26 4 C 23.02825546264648 4 20.14753341674805 4.581123352050781 17.43783187866211 5.727222442626953 C 14.81856536865234 6.835090637207031 12.46538925170898 8.421920776367188 10.44365692138672 10.44365692138672 C 8.421920776367188 12.46538925170898 6.835090637207031 14.81856536865234 5.727222442626953 17.43783187866211 C 4.581123352050781 20.14753341674805 4 23.02825546264648 4 26 C 4 28.97174453735352 4.581123352050781 31.85246658325195 5.727222442626953 34.56216430664062 C 6.835090637207031 37.18143463134766 8.421920776367188 39.53461074829102 10.44365692138672 41.55634307861328 C 12.46538925170898 43.57807922363281 14.81856536865234 45.16490936279297 17.43783187866211 46.27277755737305 C 20.14753341674805 47.41887664794922 23.02825546264648 48 26 48 C 28.97174453735352 48 31.85246658325195 47.41887664794922 34.56216430664062 46.27277755737305 C 37.18143463134766 45.16490936279297 39.53461074829102 43.57807922363281 41.55634307861328 41.55634307861328 C 43.57807922363281 39.53461074829102 45.16490936279297 37.18143463134766 46.27277755737305 34.56216430664062 C 47.41887664794922 31.85246658325195 48 28.97174453735352 48 26 C 48 23.02825546264648 47.41887664794922 20.14753341674805 46.27277755737305 17.43783187866211 C 45.16490936279297 14.81856536865234 43.57807922363281 12.46538925170898 41.55634307861328 10.44365692138672 C 39.53461074829102 8.421920776367188 37.18143463134766 6.835090637207031 34.56216430664062 5.727222442626953 C 31.85246658325195 4.581123352050781 28.97174453735352 4 26 4 M 26 0 C 40.35939788818359 0 52 11.64059829711914 52 26 C 52 40.35939788818359 40.35939788818359 52 26 52 C 11.64059829711914 52 0 40.35939788818359 0 26 C 0 11.64059829711914 11.64059829711914 0 26 0 Z"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4003_1.png b/collect-library/src/main/assets/omdb/icon_4003_1.png
deleted file mode 100644
index 4b798ec4c452f91fd093e8876d75754e0bab9f5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10639
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

diff --git a/collect-library/src/main/assets/omdb/icon_4003_1.svg b/collect-library/src/main/assets/omdb/icon_4003_1.svg
new file mode 100644
index 00000000..9254e9c0
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4003_1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.h,.j{fill:none;}.a{opacity:0;}.b{fill:#4d4d4d;opacity:0.304;}.c{fill:#363333;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f,.g{fill:#fff;}.f{stroke:#db4646;stroke-width:3px;}.h{stroke:#2f2f2f;stroke-linecap:round;stroke-width:2px;}.i,.k{stroke:none;}.k{fill:#2f2f2f;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#b5b4b4"/><stop offset="0.697" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-832 -256)"><rect class="a" width="136" height="136" transform="translate(832 256)"/><g transform="translate(865.164 289.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10050 7500)"><g class="f" transform="translate(-9178 -7204)"><circle class="i" cx="28" cy="28" r="28"/><circle class="j" cx="28" cy="28" r="26.5"/></g></g><g transform="translate(199 -504)"><g transform="translate(9849 8002)"><g class="f" transform="translate(-9178 -7204)"><circle class="i" cx="30" cy="30" r="30"/><circle class="j" cx="30" cy="30" r="28.5"/></g><g class="g" transform="translate(-9174 -7200)"><path class="i" d="M 26 50 C 22.75914001464844 50 19.61627960205078 49.36571884155273 16.65872955322266 48.11478042602539 C 13.80107021331787 46.90608978271484 11.23419952392578 45.17533111572266 9.029439926147461 42.97055816650391 C 6.82466983795166 40.76580047607422 5.093910217285156 38.19892883300781 3.885220050811768 35.34127044677734 C 2.63427996635437 32.38372039794922 2 29.24085998535156 2 26 C 2 22.75914001464844 2.63427996635437 19.61627960205078 3.885220050811768 16.65872955322266 C 5.093910217285156 13.80107021331787 6.82466983795166 11.23419952392578 9.029439926147461 9.029439926147461 C 11.23419952392578 6.82466983795166 13.80107021331787 5.093910217285156 16.65872955322266 3.885220050811768 C 19.61627960205078 2.63427996635437 22.75914001464844 2 26 2 C 29.24085998535156 2 32.38372039794922 2.63427996635437 35.34127044677734 3.885220050811768 C 38.19892883300781 5.093910217285156 40.76580047607422 6.82466983795166 42.97055816650391 9.029439926147461 C 45.17533111572266 11.23419952392578 46.90608978271484 13.80107021331787 48.11478042602539 16.65872955322266 C 49.36571884155273 19.61627960205078 50 22.75914001464844 50 26 C 50 29.24085998535156 49.36571884155273 32.38372039794922 48.11478042602539 35.34127044677734 C 46.90608978271484 38.19892883300781 45.17533111572266 40.76580047607422 42.97055816650391 42.97055816650391 C 40.76580047607422 45.17533111572266 38.19892883300781 46.90608978271484 35.34127044677734 48.11478042602539 C 32.38372039794922 49.36571884155273 29.24085998535156 50 26 50 Z"/><path class="k" d="M 26 4 C 23.02825546264648 4 20.14753341674805 4.581123352050781 17.43783187866211 5.727222442626953 C 14.81856536865234 6.835090637207031 12.46538925170898 8.421920776367188 10.44365692138672 10.44365692138672 C 8.421920776367188 12.46538925170898 6.835090637207031 14.81856536865234 5.727222442626953 17.43783187866211 C 4.581123352050781 20.14753341674805 4 23.02825546264648 4 26 C 4 28.97174453735352 4.581123352050781 31.85246658325195 5.727222442626953 34.56216430664062 C 6.835090637207031 37.18143463134766 8.421920776367188 39.53461074829102 10.44365692138672 41.55634307861328 C 12.46538925170898 43.57807922363281 14.81856536865234 45.16490936279297 17.43783187866211 46.27277755737305 C 20.14753341674805 47.41887664794922 23.02825546264648 48 26 48 C 28.97174453735352 48 31.85246658325195 47.41887664794922 34.56216430664062 46.27277755737305 C 37.18143463134766 45.16490936279297 39.53461074829102 43.57807922363281 41.55634307861328 41.55634307861328 C 43.57807922363281 39.53461074829102 45.16490936279297 37.18143463134766 46.27277755737305 34.56216430664062 C 47.41887664794922 31.85246658325195 48 28.97174453735352 48 26 C 48 23.02825546264648 47.41887664794922 20.14753341674805 46.27277755737305 17.43783187866211 C 45.16490936279297 14.81856536865234 43.57807922363281 12.46538925170898 41.55634307861328 10.44365692138672 C 39.53461074829102 8.421920776367188 37.18143463134766 6.835090637207031 34.56216430664062 5.727222442626953 C 31.85246658325195 4.581123352050781 28.97174453735352 4 26 4 M 26 0 C 40.35939788818359 0 52 11.64059829711914 52 26 C 52 40.35939788818359 40.35939788818359 52 26 52 C 11.64059829711914 52 0 40.35939788818359 0 26 C 0 11.64059829711914 11.64059829711914 0 26 0 Z"/></g></g><g transform="translate(677.491 804.832)"><line class="h" y1="32" x2="32" transform="translate(1.009 0.668)"/><line class="h" y1="34" x2="36" transform="translate(5.009 5.668)"/><path class="h" d="M.857,33.306,34.121,1.4" transform="translate(11.84 11.226)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4004_0.png b/collect-library/src/main/assets/omdb/icon_4004_0.png
deleted file mode 100644
index 889aabb6a18a2e6867403772895285b7de2e164d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8316
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
DR4hdX

diff --git a/collect-library/src/main/assets/omdb/icon_4004_0.svg b/collect-library/src/main/assets/omdb/icon_4004_0.svg
new file mode 100644
index 00000000..54de0465
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4004_0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.g{fill:#2a23f5;stroke:#db4646;stroke-linecap:square;stroke-width:3px;stroke-dasharray:9 10;}.h{stroke:none;}.i{fill:none;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ff9287"/><stop offset="0.786" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-956 -396)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10096 7643)"><circle class="f" cx="28" cy="28" r="28" transform="translate(-9100 -7207)"/><g class="g" transform="translate(-9096 -7203)"><circle class="h" cx="24" cy="24" r="24"/><circle class="i" cx="24" cy="24" r="25.5"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4004_1.png b/collect-library/src/main/assets/omdb/icon_4004_1.png
deleted file mode 100644
index f152c1f1e6321332743d988f0c5fa81b1c3630ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9309
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
V)%mvNK=*|J5U`?DwS;l-{{ZI<w-5jT

diff --git a/collect-library/src/main/assets/omdb/icon_4006_0.png b/collect-library/src/main/assets/omdb/icon_4006_0.png
deleted file mode 100644
index 5c912a60f8a2e78db368eae0344c113c40ef6314..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9738
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
S!F(ro!O2P~N>+&*1^pjvyN`PS

diff --git a/collect-library/src/main/assets/omdb/icon_4006_0.svg b/collect-library/src/main/assets/omdb/icon_4006_0.svg
new file mode 100644
index 00000000..f5b3b3c5
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4006_0.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.g{fill:#fff;}.a{opacity:0;}.b{fill:#ff8a4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{fill:#272727;}.g{font-size:28px;font-family:PingFangSC-Regular, PingFang SC;letter-spacing:0.013em;}.h,.i{stroke:none;}.i{fill:#db4646;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ffd587"/><stop offset="0.627" stop-color="#ed7b28"/><stop offset="1" stop-color="#a81705"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-956 -396)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(127 -662)"><g transform="translate(572 700)"><g transform="translate(289.868 391)"><rect class="a" width="100" height="100" transform="translate(-14.868 -1)"/><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g></g><g transform="translate(10046 8302)"><g class="f" transform="translate(-9178 -7204)"><path class="h" d="M 28 54.5 C 24.42185974121094 54.5 20.9515495300293 53.7995491027832 17.68547058105469 52.41810989379883 C 14.53003978729248 51.08348083496094 11.6958703994751 49.17253112792969 9.261670112609863 46.73833084106445 C 6.827469825744629 44.30413055419922 4.916520118713379 41.4699592590332 3.581890106201172 38.31452941894531 C 2.20044994354248 35.0484504699707 1.5 31.57814025878906 1.5 28 C 1.5 24.42185974121094 2.20044994354248 20.9515495300293 3.581890106201172 17.68547058105469 C 4.916520118713379 14.53003978729248 6.827469825744629 11.6958703994751 9.261670112609863 9.261670112609863 C 11.6958703994751 6.827469825744629 14.53003978729248 4.916520118713379 17.68547058105469 3.581890106201172 C 20.9515495300293 2.20044994354248 24.42185974121094 1.5 28 1.5 C 31.57814025878906 1.5 35.0484504699707 2.20044994354248 38.31452941894531 3.581890106201172 C 41.4699592590332 4.916520118713379 44.30413055419922 6.827469825744629 46.73833084106445 9.261670112609863 C 49.17253112792969 11.6958703994751 51.08348083496094 14.53003978729248 52.41810989379883 17.68547058105469 C 53.7995491027832 20.9515495300293 54.5 24.42185974121094 54.5 28 C 54.5 31.57814025878906 53.7995491027832 35.0484504699707 52.41810989379883 38.31452941894531 C 51.08348083496094 41.4699592590332 49.17253112792969 44.30413055419922 46.73833084106445 46.73833084106445 C 44.30413055419922 49.17253112792969 41.4699592590332 51.08348083496094 38.31452941894531 52.41810989379883 C 35.0484504699707 53.7995491027832 31.57814025878906 54.5 28 54.5 Z"/><path class="i" d="M 28 3 C 24.62369918823242 3 21.34999084472656 3.660579681396484 18.26979064941406 4.963390350341797 C 15.29317092895508 6.222400665283203 12.61925888061523 8.025409698486328 10.32233047485352 10.32233047485352 C 8.025409698486328 12.61925888061523 6.222400665283203 15.29317092895508 4.963390350341797 18.26979064941406 C 3.660579681396484 21.34999084472656 3 24.62369918823242 3 28 C 3 31.37630081176758 3.660579681396484 34.65000915527344 4.963390350341797 37.73020935058594 C 6.222400665283203 40.70682907104492 8.025409698486328 43.38074111938477 10.32233047485352 45.67766952514648 C 12.61925888061523 47.97459030151367 15.29317092895508 49.7775993347168 18.26979064941406 51.0366096496582 C 21.34999084472656 52.33942031860352 24.62369918823242 53 28 53 C 31.37630081176758 53 34.65000915527344 52.33942031860352 37.73020935058594 51.0366096496582 C 40.70682907104492 49.7775993347168 43.38074111938477 47.97459030151367 45.67766952514648 45.67766952514648 C 47.97459030151367 43.38074111938477 49.7775993347168 40.70682907104492 51.0366096496582 37.73020935058594 C 52.33942031860352 34.65000915527344 53 31.37630081176758 53 28 C 53 24.62369918823242 52.33942031860352 21.34999084472656 51.0366096496582 18.26979064941406 C 49.7775993347168 15.29317092895508 47.97459030151367 12.61925888061523 45.67766952514648 10.32233047485352 C 43.38074111938477 8.025409698486328 40.70682907104492 6.222400665283203 37.73020935058594 4.963390350341797 C 34.65000915527344 3.660579681396484 31.37630081176758 3 28 3 M 28 0 C 43.46397018432617 0 56 12.53602981567383 56 28 C 56 43.46397018432617 43.46397018432617 56 28 56 C 12.53602981567383 56 0 43.46397018432617 0 28 C 0 12.53602981567383 12.53602981567383 0 28 0 Z"/></g><text class="g" transform="translate(-9164 -7168)"><tspan x="0" y="0">限</tspan></text></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.png b/collect-library/src/main/assets/omdb/icon_4022_0.png
deleted file mode 100644
index a718c8e2cf3ae8ce74361640afb95acf228cb0e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26723
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
A3;+NC

diff --git a/collect-library/src/main/assets/omdb/icon_4022_0.svg b/collect-library/src/main/assets/omdb/icon_4022_0.svg
new file mode 100644
index 00000000..63378323
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_4022_0.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="_图层_2" data-name="图层 2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 29.88 85.54">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: url(#_未命名的渐变_457);
+      }
+
+      .cls-2 {
+        fill: url(#_未命名的渐变_322);
+      }
+
+      .cls-3 {
+        fill: url(#_未命名的渐变_150);
+      }
+
+      .cls-4 {
+        fill: url(#_未命名的渐变_264);
+      }
+
+      .cls-5 {
+        fill: #fff;
+      }
+
+      .cls-6 {
+        fill: #3d444c;
+      }
+
+      .cls-7 {
+        fill: url(#_未命名的渐变_178);
+        stroke: #161b20;
+      }
+
+      .cls-7, .cls-8, .cls-9, .cls-10, .cls-11 {
+        stroke-miterlimit: 10;
+      }
+
+      .cls-8 {
+        fill: url(#_未命名的渐变_507);
+        stroke: #8ba0ae;
+      }
+
+      .cls-12 {
+        fill: #272d35;
+        isolation: isolate;
+        opacity: .2;
+      }
+
+      .cls-9 {
+        fill: url(#_未命名的渐变_4);
+        stroke: #d15f6a;
+      }
+
+      .cls-10 {
+        stroke: #18873b;
+      }
+
+      .cls-10, .cls-11 {
+        fill: none;
+      }
+
+      .cls-11 {
+        stroke: #d5b725;
+      }
+    </style>
+    <linearGradient id="_未命名的渐变_150" data-name="未命名的渐变 150" x1="12.68" y1="70.45" x2="17.45" y2="70.45" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#999899"/>
+      <stop offset=".17" stop-color="#7e7e80"/>
+      <stop offset=".43" stop-color="#5b5d60"/>
+      <stop offset=".64" stop-color="#46494d"/>
+      <stop offset=".78" stop-color="#3f4246"/>
+      <stop offset=".96" stop-color="#404247"/>
+      <stop offset=".99" stop-color="#43434a"/>
+    </linearGradient>
+    <linearGradient id="_未命名的渐变_507" data-name="未命名的渐变 507" x1=".5" y1="34.3" x2="29.38" y2="34.3" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#b1bbcb"/>
+      <stop offset=".15" stop-color="#c2cddb"/>
+      <stop offset=".38" stop-color="#dbe7f0"/>
+      <stop offset=".53" stop-color="#e4f1f9"/>
+      <stop offset=".64" stop-color="#deeaf3"/>
+      <stop offset=".8" stop-color="#cdd9e5"/>
+      <stop offset=".98" stop-color="#b1bccd"/>
+      <stop offset="1" stop-color="#aeb9ca"/>
+    </linearGradient>
+    <linearGradient id="_未命名的渐变_178" data-name="未命名的渐变 178" x1=".81" y1="35.42" x2="29.06" y2="35.42" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#403c42"/>
+      <stop offset=".14" stop-color="#3c4353"/>
+      <stop offset=".27" stop-color="#3a475d"/>
+      <stop offset=".46" stop-color="#344256"/>
+      <stop offset=".73" stop-color="#233445"/>
+      <stop offset="1" stop-color="#0d212d"/>
+    </linearGradient>
+    <radialGradient id="_未命名的渐变_4" data-name="未命名的渐变 4" cx="15.03" cy="21.36" fx="15.03" fy="21.36" r="9.07" gradientTransform="translate(.15 -2.95) scale(.98 .95)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset=".34" stop-color="#ed7474"/>
+      <stop offset=".52" stop-color="#ea5a59"/>
+      <stop offset=".7" stop-color="#ea514f"/>
+      <stop offset=".77" stop-color="#e5312c"/>
+      <stop offset=".78" stop-color="#e12e2a"/>
+      <stop offset="1" stop-color="#ce2320"/>
+    </radialGradient>
+    <radialGradient id="_未命名的渐变_264" data-name="未命名的渐变 264" cx="15.03" cy="21.36" fx="15.03" fy="21.36" r="8.62" gradientTransform="translate(.15 -2.95) scale(.98 .95)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset=".38" stop-color="#ea514f"/>
+      <stop offset=".75" stop-color="#e12e2a"/>
+      <stop offset=".91" stop-color="#c62f2d"/>
+      <stop offset="1" stop-color="#a11715"/>
+    </radialGradient>
+    <radialGradient id="_未命名的渐变_322" data-name="未命名的渐变 322" cx="15.03" cy="41.14" fx="15.03" fy="41.14" r="8.37" gradientTransform="translate(.15 -2.95) scale(.98 .95)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#f5d12a"/>
+      <stop offset="0" stop-color="#f5d430"/>
+      <stop offset=".02" stop-color="#f6de46"/>
+      <stop offset=".04" stop-color="#f7e757"/>
+      <stop offset=".07" stop-color="#f8ec63"/>
+      <stop offset=".11" stop-color="#f8f06a"/>
+      <stop offset=".21" stop-color="#f9f16c"/>
+      <stop offset=".9" stop-color="#f8cf00"/>
+      <stop offset="1" stop-color="#ffe200"/>
+    </radialGradient>
+    <radialGradient id="_未命名的渐变_457" data-name="未命名的渐变 457" cx="14.94" cy="60.92" fx="14.94" fy="60.92" r="8.48" gradientTransform="translate(0 -2.95) scale(1 .95)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#ed7474"/>
+      <stop offset="0" stop-color="#8fc31f"/>
+      <stop offset=".38" stop-color="#8fc31f"/>
+      <stop offset=".7" stop-color="#58b431"/>
+      <stop offset=".83" stop-color="#24a239"/>
+      <stop offset="1" stop-color="#0c6735"/>
+    </radialGradient>
+  </defs>
+  <g id="_图层_1-2" data-name="图层 1">
+    <g>
+      <ellipse id="_椭圆形" data-name="椭圆形" class="cls-12" cx="14.94" cy="81.84" rx="14.37" ry="3.7"/>
+      <ellipse id="_椭圆形-2" data-name="椭圆形" class="cls-6" cx="14.94" cy="81.84" rx="7.55" ry="2.96"/>
+      <path class="cls-3" d="M14.94,58.28h0c1.45,0,2.63,1.18,2.63,2.63v19.21c0,1.38-1.12,2.5-2.5,2.5h-.29c-1.36,0-2.46-1.1-2.46-2.46v-19.25c0-1.45,1.18-2.63,2.63-2.63Z"/>
+      <rect class="cls-8" x=".5" y=".5" width="28.88" height="67.6" rx="14.44" ry="14.44"/>
+      <rect class="cls-7" x=".81" y="3.51" width="28.25" height="63.82" rx="14.13" ry="14.13"/>
+      <g>
+        <path class="cls-9" d="M6.01,17.23c0,4.73,4,8.58,8.93,8.58s8.93-3.84,8.93-8.58-4-8.58-8.93-8.58-8.93,3.84-8.93,8.58Z"/>
+        <path class="cls-4" d="M6.46,17.23c0,4.5,3.8,8.15,8.48,8.15s8.48-3.65,8.48-8.15-3.8-8.15-8.48-8.15-8.48,3.65-8.48,8.15Z"/>
+      </g>
+      <path id="_形状" data-name="形状" class="cls-5" d="M5.94,11.25c-.31,0-.59-.16-.72-.43s-.09-.59,.11-.81c1.31-1.55,2.91-2.85,4.71-3.85,.19-.09,.41-.11,.61-.04,.2,.06,.37,.2,.46,.39,.19,.38,.04,.83-.34,1.04-1.62,.86-3.05,2.02-4.22,3.4-.15,.17-.38,.27-.61,.27v.04Zm-1.74,2.47c-.15,0-.29-.04-.41-.12-.18-.1-.31-.27-.36-.47-.05-.2-.01-.41,.1-.58l.26-.41c.11-.17,.28-.3,.49-.35,.2-.05,.42-.01,.6,.1,.18,.11,.31,.28,.36,.48s.01,.41-.1,.59l-.26,.4c-.14,.23-.4,.37-.67,.37h0Z"/>
+      <g>
+        <path class="cls-11" d="M6.28,35.93c0,4.59,3.88,8.32,8.66,8.32s8.66-3.73,8.66-8.32-3.88-8.32-8.66-8.32-8.66,3.73-8.66,8.32Z"/>
+        <path class="cls-2" d="M6.71,35.93c0,4.36,3.69,7.91,8.23,7.91s8.23-3.54,8.23-7.91-3.69-7.91-8.23-7.91-8.23,3.54-8.23,7.91Z"/>
+      </g>
+      <g>
+        <path class="cls-10" d="M6.01,54.63c0,4.66,4,8.44,8.93,8.44s8.93-3.78,8.93-8.44-4-8.44-8.93-8.44-8.93,3.78-8.93,8.44Z"/>
+        <path class="cls-1" d="M6.46,54.63c0,4.42,3.8,8.01,8.48,8.01s8.48-3.59,8.48-8.01-3.8-8.01-8.48-8.01-8.48,3.59-8.48,8.01Z"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_arrow_right.png b/collect-library/src/main/assets/omdb/icon_arrow_right.png
deleted file mode 100644
index b0246785a209f0298a7435042062a26414f0ca3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq002e+002e^1^@s6aW3M700001b5ch_0Itp)
z=>Px&!bwCyRCr$P*iB3nXB@}z-}CJIu4}p?i`q1Z<;4WFr&3Bx6c4>LCPoiEaA@KI
zjfa8?c+p5qdMMOZ5=}~)G$tB7*d`{v#9pk4FQIBLCeTn;ieOk51Xgg_-PxJvX=Y&s
z4cpAqV4BJP_r&3uVfM4%=RZ5kK(A#57`ZGjKrngAAQ*yC8yZv$6+^|S2~aU=UNmE<
z7%E0hfQnJ`q8UTQP%&x(RE(Mz%@`_%icu4wV${57#!xX-jG6!ylNB&WhqNMBNHb<V
z00#gLU<`o%Z$O0t6WF;L)wMo%*+^PMFUIxg0!|_yPC>vND)DaG9$=B6lQAYG1~qZ&
z>uCC?5e+8L^l~@_0dqd=Zv3de=)!yN`;boP`18&Lk`fP2#*$5a2}}Z6AY&<z-C#B?
z%n2*=Gq)!5OT*fI4RuAwbz^?+3L)_L*BG>vfghgF)nA*<!kBYM%N=AV81LCqZ<~wB
z5CgY--MS%+ty@E%RMxECCJg~sRULRRghcNRJbfI;)bJc4hCJ5%G<6BU6o7c{_NAi#
zzpcGo?my@><QWIc-f}I!qyUP`0;s5610F8Js=e)Cz92FKy?AxK2l25P^xv5f8fW*v
z7)tI2-~td+`X`pJ<{d1&QXcqj%l5U0LhF2x($ZIv*H>XK7ls6Lx)IpZ2ImKxvwx?0
zuONB*0%l(5h&-G`GHJZ(8P9xnb5@Vo2Ig6F`S%_#Z&5UP^CL13W(>X^jqud&Lh85k
zNd0~l+~q)GTEl4HOT<R!riX<5(l#*9TPwObXJ4&Uj67Hbk%*fq&7YD1LYElpe~Hn7
z*?abZIb6}roht{E57_1Ai2N}XwGYe+7n2Xhyx*l$V$41;M=DNp2Wwubt(5OP0XIiN
zGfvwEX5wg7mz1*gUBToYyCv{r*#Fl7+rY%yD^GFYu-c8<8l%g>pcztQQtl6T4W6^r
z7d-P~$J;As{4O4}_I4LnWrRd#;c?*YV;KXa#DJ9I^OCN}6FWW<sCv9!KipJ$WL3!X
ztyq$qxm8RQA#u0ZzoCJ3+<xQt8QW~7|Eyv@9kzVf<ncIqa?vczlQh6iggXbmS?=5g
z0TXSnYVdO0GPl&?R?$B$?i_lQ54<2?vh%5}>Sr)n!ypsm{=rYHI~IRpDA;0hZ~X6$
zjoz}3;gpqaSun*|!C1P6VDg9&48f>vCMt%Cp<>hos2DXbnlV%i6{99V#i)7FjG<zv
z7&QSZM$L<63>8Dgs0mOpYF;#Bs2D0nO@N9~^ZExES0W1-p<h`50000<MNUMnLSTY@
C4cSNl

diff --git a/collect-library/src/main/assets/omdb/icon_arrow_right.svg b/collect-library/src/main/assets/omdb/icon_arrow_right.svg
new file mode 100644
index 00000000..fc0678f3
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_arrow_right.svg
@@ -0,0 +1,40 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="140"
+    height="140" viewBox="0 0 140 140">
+    <defs>
+        <style>
+            .a{fill:none;}.b{fill:#898989;opacity:0;}.c{opacity:0.14;mix-blend-mode:multiply;isolation:isolate;}.d{clip-path:url(#a);}.e{fill:#b2250a;}.f{fill:#ea7626;}.g{fill:#fae8c8;}
+        </style>
+        <clipPath id="a">
+            <rect class="a" width="54.796" height="40.392" />
+        </clipPath>
+    </defs>
+    <g transform="translate(-1333 -1090)">
+        <g transform="translate(251 665)">
+            <rect class="b" width="140" height="140" transform="translate(1082 425)" />
+            <g transform="translate(229.467 -611)">
+                <g transform="translate(937.713 1086)">
+                    <g transform="translate(0 0)">
+                        <g class="c" transform="translate(0)">
+                            <g transform="translate(0)">
+                                <g class="d">
+                                    <path
+                                        d="M38.035,31.807l-16.7-13a3.818,3.818,0,0,0-6.163,3.014v3.908h-26.39A4.066,4.066,0,0,0-15.287,29.8V39.844a4.066,4.066,0,0,0,4.066,4.066h26.39v3.908a3.818,3.818,0,0,0,6.163,3.014l16.7-13a3.819,3.819,0,0,0,0-6.027"
+                                        transform="translate(15.287 -18)" />
+                                </g>
+                            </g>
+                        </g>
+                        <path class="e"
+                            d="M39.533,29.22H37.54L21.332,41.831a3.819,3.819,0,0,1-6.163-3.014V34.909h-26.39a4.066,4.066,0,0,1-4.066-4.066V20.8a4.066,4.066,0,0,1,4.066-4.066h26.39V12.825a3.818,3.818,0,0,1,6.163-3.014l16.7,13a3.791,3.791,0,0,1,1.448,2.581l.049.005Z"
+                            transform="translate(15.287 -5.889)" />
+                        <path class="f"
+                            d="M38.028,13.807l-16.7-13a3.818,3.818,0,0,0-6.163,3.014V7.733H-11.253A4.066,4.066,0,0,0-15.318,11.8V21.844a4.066,4.066,0,0,0,4.066,4.066H15.162v3.908a3.818,3.818,0,0,0,6.163,3.014l16.7-13a3.819,3.819,0,0,0,0-6.027"
+                            transform="translate(15.318 6.457)" />
+                    </g>
+                    <path class="g"
+                        d="M75.8,20.234a2.381,2.381,0,0,1-1.511-.539L71.346,17.29a2.392,2.392,0,1,1,3.025-3.706l2.948,2.406A2.392,2.392,0,0,1,75.8,20.234"
+                        transform="translate(-35.64 -1.875)" />
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ 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 0b459fb7..f599fcb7 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
@@ -596,7 +596,8 @@ public final class NIMapView extends RelativeLayout {
         VECTOR(2)/*高亮组*/,
         OPERATE_LINE(3)/*操作图层组*/,
         OPERATE_MARKER(4)/*操作图层组*/,
-        NAVIGATION(5)/*定位导航组*/;
+        NAVIGATION(5)/*定位导航组*/,
+        LABEL(6)/*图标，文字图层*/;
 
         int groupIndex;
 
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
index 75aafa44..d3348487 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
@@ -22,10 +22,11 @@ import java.io.File
 /**
  * Layer 操作
  */
-class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePath: String) : BaseHandler(context, mapView) {
+class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView, tracePath: String) :
+    BaseHandler(context, mapView) {
     private var baseGroupLayer // 用于盛放所有基础底图的图层组，便于统一管理
             : GroupLayer? = null
-    private val mTracePath:String = tracePath
+    private val mTracePath: String = tracePath
 
     /**
      * 轨迹渲染图层
@@ -70,12 +71,13 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa
 
         vectorNiLocationTileLayer = VectorTileLayer(mMapView.vtmMap, mapLifeNiLocationTileSource)
 
-        labelNiLocationLayer = LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15)
+        labelNiLocationLayer =
+            LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15)
 
-        if(vectorNiLocationTileLayer!=null){
-            addLayer(vectorNiLocationTileLayer,NIMapView.LAYER_GROUPS.BASE)
+        if (vectorNiLocationTileLayer != null) {
+            addLayer(vectorNiLocationTileLayer, NIMapView.LAYER_GROUPS.BASE)
         }
-        if(labelNiLocationLayer!=null){
+        if (labelNiLocationLayer != null) {
             addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.BASE)
         }
 
@@ -92,7 +94,7 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa
         mMapView.vtmMap.events.bind(UpdateListener { e, mapPosition ->
             if (e == org.oscim.map.Map.SCALE_EVENT) {
                 // 测评数据图层在指定Zoom后开始显示
-                val isOmdbZoom = mapPosition.zoomLevel>=Constant.OMDB_MIN_ZOOM
+                val isOmdbZoom = mapPosition.zoomLevel >= Constant.OMDB_MIN_ZOOM
                 baseGroupLayer?.layers?.forEach {
                     it.isEnabled = !isOmdbZoom
                 }
@@ -103,25 +105,36 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa
     }
 
     private fun initOMDBVectorTileLayer() {
-        // 初始化OMDB相关图层
-        omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource)
-        omdbLabelLayer = LabelLayer(mMapView.vtmMap, omdbVectorTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM)
-        if(omdbVectorTileLayer!=null){
-            addLayer(omdbVectorTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE)
-        }
-        if(omdbLabelLayer!=null){
-            addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
-        }
 
         // 初始化OMDB参考相关图层
         omdbReferenceTileLayer = VectorTileLayer(mMapView.vtmMap, omdbReferenceTileSource)
-        omdbReferenceLabelLayer = LabelLayer(mMapView.vtmMap, omdbReferenceTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM)
-        if(omdbReferenceTileLayer!=null){
-            addLayer(omdbReferenceTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE)
+        omdbReferenceLabelLayer = LabelLayer(
+            mMapView.vtmMap,
+            omdbReferenceTileLayer,
+            LabelTileLoaderHook(),
+            Constant.OMDB_MIN_ZOOM
+        )
+        if (omdbReferenceTileLayer != null) {
+            addLayer(omdbReferenceTileLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
         }
-        if(omdbReferenceLabelLayer!=null){
-            addLayer(omdbReferenceLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
+        if (omdbReferenceLabelLayer != null) {
+            addLayer(omdbReferenceLabelLayer, NIMapView.LAYER_GROUPS.LABEL)
         }
+        // 初始化OMDB相关图层
+        omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource)
+        omdbLabelLayer = LabelLayer(
+            mMapView.vtmMap,
+            omdbVectorTileLayer,
+            LabelTileLoaderHook(),
+            Constant.OMDB_MIN_ZOOM
+        )
+        if (omdbVectorTileLayer != null) {
+            addLayer(omdbVectorTileLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
+        }
+        if (omdbLabelLayer != null) {
+            addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.LABEL)
+        }
+
     }
 
     /**
diff --git a/vtm b/vtm
index dd13e533..1ee201a4 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323
+Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a