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

---
 app/src/main/res/layout/console_on.xml | 38 +++++++++++++++++++++-----
 app/src/main/res/values/styles.xml     |  2 +-
 vtm                                    |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/console_on.xml b/app/src/main/res/layout/console_on.xml
index 86beb031..74e210d1 100644
--- a/app/src/main/res/layout/console_on.xml
+++ b/app/src/main/res/layout/console_on.xml
@@ -128,12 +128,16 @@
         android:src="@drawable/icon_console_task"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_task_bg"
-        app:layout_constraintTop_toTopOf="@id/console_task_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_task_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_task_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_task_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评任务"
         app:layout_constraintBottom_toBottomOf="@id/console_task_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_task_icon"
         app:layout_constraintRight_toRightOf="@id/console_task_bg"
         app:layout_constraintTop_toTopOf="@id/console_task_bg" />
 
@@ -154,12 +158,16 @@
         android:src="@drawable/icon_console_evaluation"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_evaluation_bg"
-        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_evaluation_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_evaluation_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_evaluation_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="测评结果"
         app:layout_constraintBottom_toBottomOf="@id/console_evaluation_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_evaluation_icon"
         app:layout_constraintRight_toRightOf="@id/console_evaluation_bg"
         app:layout_constraintTop_toTopOf="@id/console_evaluation_bg" />
 
@@ -180,12 +188,16 @@
         android:src="@drawable/icon_console_offline_map"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_offline_map_bg"
-        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_offline_map_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_offline_map_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_offline_map_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="离线地图"
         app:layout_constraintBottom_toBottomOf="@id/console_offline_map_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_offline_map_icon"
         app:layout_constraintRight_toRightOf="@id/console_offline_map_bg"
         app:layout_constraintTop_toTopOf="@id/console_offline_map_bg" />
 
@@ -205,12 +217,16 @@
         android:src="@drawable/icon_console_route"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_route_bg"
-        app:layout_constraintTop_toTopOf="@id/console_route_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_route_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_route_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_route_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="路径规划"
         app:layout_constraintBottom_toBottomOf="@id/console_route_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_route_icon"
         app:layout_constraintRight_toRightOf="@id/console_route_bg"
         app:layout_constraintTop_toTopOf="@id/console_route_bg" />
 
@@ -232,12 +248,16 @@
         android:src="@drawable/icon_console_layer_setting"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_layer_setting_bg"
-        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_layer_setting_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_layer_setting_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="图层设置"
         app:layout_constraintBottom_toBottomOf="@id/console_layer_setting_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_layer_setting_icon"
         app:layout_constraintRight_toRightOf="@id/console_layer_setting_bg"
         app:layout_constraintTop_toTopOf="@id/console_layer_setting_bg" />
 
@@ -257,12 +277,16 @@
         android:src="@drawable/icon_console_personal_center"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
         app:layout_constraintLeft_toLeftOf="@id/console_personal_center_bg"
-        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
+        app:layout_constraintRight_toLeftOf="@id/console_personal_center_icon_text"
+        app:layout_constraintTop_toTopOf="@id/console_personal_center_bg"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
+        android:id="@+id/console_personal_center_icon_text"
         style="@style/console_on_left_bottom_text"
         android:text="个人中心"
         app:layout_constraintBottom_toBottomOf="@id/console_personal_center_bg"
+        app:layout_constraintLeft_toRightOf="@id/console_personal_center_icon"
         app:layout_constraintRight_toRightOf="@id/console_personal_center_bg"
         app:layout_constraintTop_toTopOf="@id/console_personal_center_bg" />
 
@@ -469,7 +493,7 @@
         app:layout_constraintLeft_toLeftOf="@id/console_track_bg"
         app:layout_constraintRight_toLeftOf="@id/console_track_text"
         app:layout_constraintTop_toTopOf="@id/console_track_bg"
-        app:layout_constraintVertical_chainStyle="spread" />
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <ImageView
         android:id="@+id/console_track_icon"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d0a4d202..5193314e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,7 +24,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">18sp</item>
-        <item name="android:layout_margin">5dp</item>
+
     </style>
 
     <style name="title_default_style" comment="默认顶标题样式">
diff --git a/vtm b/vtm
index dd13e533..1ee201a4 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit dd13e533c38b5738ab404c2737d7ccadeff01323
+Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a

From 083a6fd57a6593b7c6068754afe691adfecf1217 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Fri, 16 Jun 2023 15:16:10 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A6=BB=E7=BA=BF?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BEUI=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8UI=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OfflineMapDownloadScope.kt                |   2 -
 .../http/taskdownload/TaskDownloadScope.kt    |   1 -
 .../omqs/ui/activity/map/MainActivity.kt      |  66 ++++--
 .../omqs/ui/activity/map/MainViewModel.kt     |   9 +-
 .../omqs/ui/activity/map/SignAdapter.kt       |  47 +++-
 .../ui/fragment/console/ConsoleFragment.kt    |   3 -
 .../EvaluationResultFragment.kt               |   3 -
 .../EvaluationResultViewModel.kt              |  11 -
 .../evaluationresult/PhenomenonFragment.kt    |   1 -
 .../offlinemap/OfflineMapCityListAdapter.kt   |   5 -
 .../personalcenter/PersonalCenterFragment.kt  |  18 +-
 .../qsrecordlist/QsRecordListViewModel.kt     |   1 -
 .../ui/fragment/tasklist/TaskListAdapter.kt   |   4 -
 .../com/navinfo/omqs/ui/widget/SignUtil.kt    |  24 +-
 .../icon_main_moreinfo_text_left.png          | Bin 0 -> 498 bytes
 .../main_sign_moreinfo_bg.9.png               | Bin 0 -> 5240 bytes
 .../res/drawable/shape_rect_black_8dp_bg.xml  |   8 +-
 app/src/main/res/layout/activity_main.xml     |  62 +++++-
 app/src/main/res/layout/adapter_sign.xml      |   2 +-
 app/src/main/res/layout/adapter_task_list.xml |   1 -
 app/src/main/res/layout/console_off.xml       |   1 -
 .../main/res/layout/fragment_offline_map.xml  |   4 +-
 .../main/res/layout/fragment_task_manager.xml |   4 +-
 .../main/res/menu/personal_center_menu.xml    |  24 +-
 app/src/main/res/values/colors.xml            |   2 +-
 .../src/main/assets/editormarker.xml          | 206 +++++++++---------
 .../src/main/assets/omdb/icon_4006_0.svg      |   2 +-
 .../src/main/assets/omdb/icon_4022_0.svg      | 163 +-------------
 .../src/main/assets/omdb/icon_arrow_right.svg |  41 +---
 .../library/map/handler/MarkHandler.kt        |   1 -
 .../library/map/layers/MyItemizedLayer.java   |   1 -
 31 files changed, 312 insertions(+), 405 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_moreinfo_text_left.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png

diff --git a/app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadScope.kt
index 03e5ed74..5a251f8c 100644
--- a/app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/offlinemapdownload/OfflineMapDownloadScope.kt
@@ -149,11 +149,9 @@ class OfflineMapDownloadScope(
                 }
             }
 
-            Log.e("jingo", "文件下载完成 ${cityBean.currentSize} == ${cityBean.fileSize}")
             if (cityBean.currentSize == cityBean.fileSize) {
                 val res =
                     fileTemp.renameTo(File("${Constant.OFFLINE_MAP_PATH}${cityBean.fileName}"))
-                Log.e("jingo", "文件下载完成 修改文件 $res")
                 change(FileDownloadStatus.DONE)
                 withContext(Dispatchers.Main) {
                     downloadManager.mapController.layerManagerHandler.loadBaseMap()
diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
index caa5ecd2..e373cea0 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
@@ -188,7 +188,6 @@ class TaskDownloadScope(
             responseBody ?: throw IOException("jingo ResponseBody is null")
             if (startPosition == 0L) {
                 taskBean.fileSize = responseBody.contentLength()
-                Log.e("jingo", "当前文件大小 ${taskBean.fileSize}")
             }
             change(FileDownloadStatus.LOADING)
             //写入文件
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 286bf347..12464cbf 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
@@ -23,6 +23,7 @@ import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ImportConfig
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.ActivityMainBinding
 import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager
 import com.navinfo.omqs.tools.LayerConfigUtils
@@ -67,9 +68,7 @@ class MainActivity : BaseActivity() {
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
                 val data: Intent? = result.data
-                Log.e("jingo", "MainActivity someActivityResultLauncher RESULT_OK")
             } else {
-                Log.e("jingo", "MainActivity someActivityResultLauncher ${result.resultCode}")
             }
         }
 
@@ -88,16 +87,44 @@ class MainActivity : BaseActivity() {
      * 提前显示要素看板
      */
     private val signAdapter by lazy {
-        SignAdapter { _, autoSave, signBean ->
-            rightController.currentDestination?.let {
-                if (it.id == R.id.RightEmptyFragment) {
-                    val bundle = Bundle()
-                    bundle.putParcelable("SignBean", signBean)
-                    bundle.putBoolean("AutoSave", autoSave)
-                    rightController.navigate(R.id.EvaluationResultFragment, bundle)
+        SignAdapter(object : OnSignAdapterClickListener {
+            override fun onItemClick(signBean: SignBean) {
+                rightController.currentDestination?.let {
+                    if (it.id == R.id.RightEmptyFragment) {
+                        val bundle = Bundle()
+                        bundle.putParcelable("SignBean", signBean)
+                        bundle.putBoolean("AutoSave", false)
+                        rightController.navigate(R.id.EvaluationResultFragment, bundle)
+                    }
                 }
             }
-        }
+
+            override fun onMoreInfoClick(selectTag: String, tag: String, signBean: SignBean) {
+                if (binding.mainActivitySignMoreInfoGroup.visibility != View.VISIBLE || selectTag != tag) {
+                    binding.mainActivitySignMoreInfoGroup.visibility = View.VISIBLE
+                    binding.mainActivitySignMoreInfoTitle.text = signBean.name
+                    binding.mainActivitySignMoreInfoText1.text = signBean.bottomRightText
+                    binding.mainActivitySignMoreInfoText2.text = signBean.moreText
+                } else {
+                    binding.mainActivitySignMoreInfoGroup.visibility = View.GONE
+                }
+            }
+
+            override fun onErrorClick(signBean: SignBean) {
+                rightController.currentDestination?.let {
+                    if (it.id == R.id.RightEmptyFragment) {
+                        val bundle = Bundle()
+                        bundle.putParcelable("SignBean", signBean)
+                        bundle.putBoolean("AutoSave", true)
+                        rightController.navigate(R.id.EvaluationResultFragment, bundle)
+                    }
+                }
+            }
+
+            override fun onHideMoreInfoView() {
+                binding.mainActivitySignMoreInfoGroup.visibility = View.GONE
+            }
+        })
     }
 
     /**
@@ -150,11 +177,9 @@ class MainActivity : BaseActivity() {
             when (event?.action) {
                 MotionEvent.ACTION_DOWN -> {
                     voiceOnTouchStart()//Do Something
-                    Log.e("qj", "voiceOnTouchStart")
                 }
                 MotionEvent.ACTION_UP -> {
                     voiceOnTouchStop()//Do Something
-                    Log.e("qj", "voiceOnTouchStop")
                 }
             }
             v?.onTouchEvent(event) ?: true
@@ -205,9 +230,9 @@ class MainActivity : BaseActivity() {
         }
         //监听地图中点变化
         viewModel.liveDataCenterPoint.observe(this) {
-            Log.e("qj","${it.longitude}")
-            try{
-                if(it!=null&&it.longitude!=null&&it.latitude!=null){
+            Log.e("qj", "${it.longitude}")
+            try {
+                if (it != null && it.longitude != null && it.latitude != null) {
                     binding.mainActivityGeometry.text = "经纬度:${
                         BigDecimal(it.longitude).setScale(
                             7,
@@ -215,8 +240,8 @@ class MainActivity : BaseActivity() {
                         )
                     },${BigDecimal(it.latitude).setScale(7, RoundingMode.HALF_UP)}"
                 }
-            }catch (e:Exception){
-                Log.e("qj","异常")
+            } catch (e: Exception) {
+                Log.e("qj", "异常 $e")
             }
         }
 
@@ -248,7 +273,7 @@ class MainActivity : BaseActivity() {
         val view = this.layoutInflater.inflate(R.layout.dialog_view_edittext, null)
         val inputDialog = MaterialAlertDialogBuilder(
             this
-        ).setTitle("标记原因").setView(view)
+        ).setTitle("坐标定位").setView(view)
         var editText = view.findViewById<EditText>(R.id.dialog_edittext)
         editText.hint = "请输入经纬度例如：\n116.1234567,39.1234567\n116.1234567 39.1234567"
         inputDialog.setNegativeButton("取消") { dialog, _ ->
@@ -260,7 +285,7 @@ class MainActivity : BaseActivity() {
                     val parts = editText.text.toString().split("[,，\\s]".toRegex())
                     if (parts.size == 2) {
                         val x = parts[0].toDouble()
-                        val y = parts[0].toDouble()
+                        val y = parts[1].toDouble()
                         mapController.animationHandler.animationByLatLon(y, x)
                     } else {
                         Toast.makeText(this, "输入格式不正确", Toast.LENGTH_SHORT).show()
@@ -474,10 +499,11 @@ class MainActivity : BaseActivity() {
                 .replace(R.id.main_activity_left_fragment, leftFragment!!).commit()
         }
     }
+
     /**
      * 打开离线地图
      */
-    fun onClickOfflineMapFragment(){
+    fun onClickOfflineMapFragment() {
         if (leftFragment !is OfflineMapFragment) {
             if (leftFragment == null) {
                 binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index c8f575ca..78e29e3f 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -183,11 +183,10 @@ class MainViewModel @Inject constructor(
                         location.tiley = y
                     }
                 }
-                Log.e("jingo", "定位点插入 ${location.longitude}")
                 location.groupId = uuid
                 try {
                     location.timeStamp = DateTimeUtil.getTime(location.time).toString()
-                }catch (e: Exception){
+                } catch (e: Exception) {
 
                 }
                 traceDataBase.niLocationDao.insert(location)
@@ -244,7 +243,8 @@ class MainViewModel @Inject constructor(
                                 geometry = element.geometry,
                                 name = SignUtil.getSignNameText(element),
                                 bottomRightText = SignUtil.getSignBottomRightText(element),
-                                elementCode = element.code
+                                elementCode = element.code,
+                                moreText = SignUtil.getMoreInfoText(element)
                             )
 
                             when (element.code) {
@@ -292,9 +292,8 @@ class MainViewModel @Inject constructor(
                         speakMode?.speakText(speechText)
                     }
                     linkIdCache = linkId ?: ""
-                    Log.e("jingo", "自动捕捉数据 共${signList.size}条")
                 }
-            }else{
+            } else {
                 mapController.lineHandler.removeLine()
                 linkIdCache = ""
             }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
index b5072080..3bb31f38 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
@@ -1,6 +1,7 @@
 package com.navinfo.omqs.ui.activity.map
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.SignBean
@@ -8,8 +9,19 @@ import com.navinfo.omqs.databinding.AdapterSignBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
 
-class SignAdapter(private var itemListener: ((Int, Boolean, SignBean) -> Unit?)? = null) :
+interface OnSignAdapterClickListener {
+    fun onItemClick(signBean: SignBean)
+    fun onMoreInfoClick(selectTag: String, tag: String, signBean: SignBean)
+    fun onErrorClick(signBean: SignBean)
+    fun onHideMoreInfoView()
+}
+
+class SignAdapter(private var listener: OnSignAdapterClickListener?) :
     BaseRecyclerViewAdapter<SignBean>() {
+    /**
+     * 选中的详细信息按钮的tag标签
+     */
+    private var selectMoreInfoTag: String = ""
     override fun getItemViewRes(position: Int): Int {
         return R.layout.adapter_sign
     }
@@ -22,17 +34,40 @@ class SignAdapter(private var itemListener: ((Int, Boolean, SignBean) -> Unit?)?
 
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         val bd = holder.viewBinding as AdapterSignBinding
+
         val item = data[position]
-        if (item.iconId != 0)
-            bd.signMainIconBg.setImageResource(item.iconId)
+        if (item.iconId != 0) bd.signMainIconBg.setImageResource(item.iconId)
         bd.signMainIcon.text = item.iconText
         bd.signBottomText.text = item.name
-        bd.signMainFastError.setOnClickListener{
-            itemListener?.invoke(position, true,item)
+        holder.tag = item.name + position
+        //点击错误按钮
+        bd.signMainFastError.setOnClickListener {
+            listener?.onErrorClick(item)
         }
         bd.signBottomRightText.text = item.bottomRightText
+
         bd.root.setOnClickListener {
-            itemListener?.invoke(position, false,item)
+            listener?.onItemClick(item)
         }
+        if (item.moreText.isNotEmpty()) {
+            bd.signMainInfo.visibility = View.VISIBLE
+            //点击更多信息按钮
+            bd.signMainInfo.setOnClickListener {
+                listener?.onMoreInfoClick(selectMoreInfoTag, holder.tag, item)
+                selectMoreInfoTag = holder.tag
+            }
+        } else bd.signMainInfo.visibility = View.GONE
+
     }
+
+    override fun refreshData(newData: List<SignBean>) {
+        super.refreshData(newData)
+        for (i in newData.indices) {
+            if (selectMoreInfoTag == newData[i].name + i) {
+                return
+            }
+        }
+        listener?.onHideMoreInfoView()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
index c882bb55..966f5666 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
@@ -64,14 +64,12 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
             override fun onTransitionStart(transition: androidx.transition.Transition) {
                 sceneFlag = true
                 if (mFragment != null) {
-                    Log.e("jingo", "动画开始B mFragment 不为null")
                     childFragmentManager.beginTransaction().remove(mFragment!!).commit()
                     mFragment = null
                 }
             }
 
             override fun onTransitionEnd(transition: androidx.transition.Transition) {
-                Log.e("jingo", "动画A结束")
                 initOnClickListener()
             }
 
@@ -89,7 +87,6 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
             override fun onTransitionStart(transition: androidx.transition.Transition) {
                 sceneFlag = false
                 if (mFragment != null) {
-                    Log.e("jingo", "动画开始A mFragment 不为null")
                     childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
                         .commit()
                 }
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 d2f0ccae..87cf037d 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
@@ -98,17 +98,14 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
             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")
                 }
             }
             true
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
index 5684e00d..301254cb 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -97,7 +97,6 @@ class EvaluationResultViewModel @Inject constructor(
 
     init {
         liveDataQsRecordBean.value = QsRecordBean(id = UUID.randomUUID().toString())
-        Log.e("jingo", "EvaluationResultViewModel 创建了 ${hashCode()}")
         viewModelScope.launch {
             mapController.onMapClickFlow.collect {
                 liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
@@ -111,7 +110,6 @@ class EvaluationResultViewModel @Inject constructor(
 
     override fun onCleared() {
         super.onCleared()
-        Log.e("jingo", "EvaluationResultViewModel 销毁了 ${hashCode()}")
         mapController.markerHandle.removeMarker(markerTitle)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             mapController.lineHandler.removeLine()
@@ -223,7 +221,6 @@ class EvaluationResultViewModel @Inject constructor(
      * 获取问题环节列表和初步问题
      */
     fun getProblemLinkList() {
-        Log.e("jingo", "getProblemLinkList S")
         viewModelScope.launch(Dispatchers.IO) {
             val list = roomAppDatabase.getScRootCauseAnalysisDao().findAllData()
             list?.let { tl ->
@@ -242,11 +239,9 @@ class EvaluationResultViewModel @Inject constructor(
                     }
                     if (liveDataQsRecordBean.value!!.problemLink.isEmpty()) {
                         liveDataQsRecordBean.value!!.problemLink = middleList[0]
-                        Log.e("jingo", "getProblemLinkList ${middleList[0]}")
                     }
                     if (liveDataQsRecordBean.value!!.cause.isEmpty()) {
                         liveDataQsRecordBean.value!!.cause = rightList[0].text
-                        Log.e("jingo", "getProblemLinkList ${rightList[0].text}")
                     }
                     liveDataQsRecordBean.postValue(liveDataQsRecordBean.value)
 //                    liveDataMiddleTypeList.postValue(middleList)
@@ -254,14 +249,12 @@ class EvaluationResultViewModel @Inject constructor(
                 }
             }
         }
-        Log.e("jingo", "getProblemLinkList E")
     }
 
     /**
      * 获取问题类型列表和问题现象
      */
     private suspend fun getProblemList(classType: String) {
-        Log.e("jingo", "getProblemList S")
         val typeList = roomAppDatabase.getScProblemTypeDao().findProblemTypeList(classType)
         typeList?.let { tl ->
             if (tl.isNotEmpty()) {
@@ -279,18 +272,15 @@ class EvaluationResultViewModel @Inject constructor(
                 }
                 if (liveDataQsRecordBean.value!!.problemType.isEmpty()) {
                     liveDataQsRecordBean.value!!.problemType = typeTitleList[0]
-                    Log.e("jingo", "getProblemList ${typeTitleList[0]}")
                 }
 //                liveDataMiddleTypeList.postValue(typeTitleList)
                 if (liveDataQsRecordBean.value!!.phenomenon.isEmpty()) {
                     liveDataQsRecordBean.value!!.phenomenon = phenomenonRightList[0].text
-                    Log.e("jingo", "getProblemList ${phenomenonRightList[0].text}")
                 }
                 liveDataQsRecordBean.postValue(liveDataQsRecordBean.value)
                 liveDataRightTypeList.postValue(phenomenonRightList)
             }
         }
-        Log.e("jingo", "getProblemList E")
     }
 
     /**
@@ -341,7 +331,6 @@ class EvaluationResultViewModel @Inject constructor(
                 mDialog.dismiss()
                 viewModelScope.launch(Dispatchers.IO) {
                     val realm = Realm.getDefaultInstance()
-                    Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
                     realm.executeTransaction {
                         val objects = it.where(QsRecordBean::class.java)
                             .equalTo("id", liveDataQsRecordBean.value?.id).findFirst()
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt
index 0fea2c21..0442c928 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt
@@ -34,7 +34,6 @@ class PhenomenonFragment :
         savedInstanceState: Bundle?
     ): View {
         _binding = FragmentPhenomenonBinding.inflate(inflater, container, false)
-        Log.e("jingo", "PhenomenonFragment onCreateView ${hashCode()}")
         return binding.root
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
index fdd31329..dede03ce 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
@@ -34,15 +34,12 @@ class OfflineMapCityListAdapter(
             val cityBean = data[it.tag as Int]
             when (cityBean.status) {
                 FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.ERROR -> {
-                    Log.e("jingo", "开始下载 ${cityBean.status}")
                     downloadManager.start(cityBean.id)
                 }
                 FileDownloadStatus.LOADING, FileDownloadStatus.WAITING -> {
-                    Log.e("jingo", "暂停 ${cityBean.status}")
                     downloadManager.pause(cityBean.id)
                 }
                 else -> {
-                    Log.e("jingo", "暂停 ${cityBean.status}")
                 }
             }
         }
@@ -85,7 +82,6 @@ class OfflineMapCityListAdapter(
                 if (id == holder.tag) {
                     val binding: AdapterOfflineMapCityBinding =
                         holder.viewBinding as AdapterOfflineMapCityBinding
-                    Log.e("jingo", "进度条更新 $id ${bean.id} ${holder.tag} ")
                     changeViews(binding, bean)
                 }
             }
@@ -95,7 +91,6 @@ class OfflineMapCityListAdapter(
 
 
     private fun changeViews(binding: AdapterOfflineMapCityBinding, cityBean: OfflineMapCityBean) {
-        Log.e("jingo", "changeViews ${cityBean.status}")
         binding.offlineMapProgress.progress =
             (cityBean.currentSize * 100 / cityBean.fileSize).toInt()
         when (cityBean.status) {
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 82b04705..28e6f58c 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
@@ -114,15 +114,15 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
                     niMapController.mMapView.vtmMap.animator()
                         .animateTo(GeoPoint(40.031657799200346, 116.32207834810715))
                 }
-                R.id.personal_center_menu_task_list -> {
-                    findNavController().navigate(R.id.TaskManagerFragment)
-                }
-                R.id.personal_center_menu_qs_record_list -> {
-                    findNavController().navigate(R.id.QsRecordListFragment)
-                }
-                R.id.personal_center_menu_layer_manager -> { // 图层管理
-                    findNavController().navigate(R.id.QsLayerManagerFragment)
-                }
+//                R.id.personal_center_menu_task_list -> {
+//                    findNavController().navigate(R.id.TaskManagerFragment)
+//                }
+//                R.id.personal_center_menu_qs_record_list -> {
+//                    findNavController().navigate(R.id.QsRecordListFragment)
+//                }
+//                R.id.personal_center_menu_layer_manager -> { // 图层管理
+//                    findNavController().navigate(R.id.QsLayerManagerFragment)
+//                }
             }
             true
         }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
index 8b0f391f..29b1eb39 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
@@ -26,7 +26,6 @@ class QsRecordListViewModel @Inject constructor(
     fun getList(context: Context) {
         viewModelScope.launch(Dispatchers.IO) {
             val realm = Realm.getDefaultInstance()
-            Log.e("jingo","realm hashCOde ${realm.hashCode()}")
             val objects = realm.where(QsRecordBean::class.java).findAll()
             liveDataQSList.postValue(realm.copyFromRealm(objects))
         }
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
index 9530ea95..0b963619 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
@@ -39,17 +39,14 @@ class TaskListAdapter(
             if (taskBean.hadLinkDvoList.isNotEmpty()) {
                 when (taskBean.status) {
                     FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.IMPORT, FileDownloadStatus.ERROR -> {
-                        Log.e("jingo", "开始下载 ${taskBean.status}")
                         downloadManager.start(taskBean.id)
                     }
 
                     FileDownloadStatus.LOADING, FileDownloadStatus.WAITING -> {
-                        Log.e("jingo", "暂停 ${taskBean.status}")
                         downloadManager.pause(taskBean.id)
                     }
 
                     else -> {
-                        Log.e("jingo", "暂停 ${taskBean.status}")
                     }
                 }
             } else {
@@ -61,7 +58,6 @@ class TaskListAdapter(
     private val uploadBtnClick = View.OnClickListener() {
         if (it.tag != null) {
             val taskBean = data[it.tag as Int]
-            Log.e("jingo", "开始上传 ${taskBean.syncStatus}")
             if (taskBean.hadLinkDvoList.isNotEmpty()) {
                 when (taskBean.syncStatus) {
                     FileUploadStatus.NONE, FileUploadStatus.UPLOADING, FileUploadStatus.ERROR, FileUploadStatus.WAITING -> {
diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
index eff5a96c..773e55e0 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
@@ -87,12 +87,30 @@ class SignUtil {
          */
         fun getSignBottomRightText(data: RenderEntity): String {
             return when (data.code) {
-                //常点限速
+                //条件点限速
                 4003 -> getConditionLimitText(data)
                 else -> ""
             }
         }
 
+        /**
+         * 更多信息展示文字
+         */
+        fun getMoreInfoText(data: RenderEntity): String {
+            return when (data.code) {
+                //条件点限速
+                4003 -> getConditionLimitMoreInfoText(data)
+                else -> ""
+            }
+        }
+
+        /**
+         * 条件点限速更多信息
+         */
+        private fun getConditionLimitMoreInfoText(data: RenderEntity): String {
+            return data.properties["validPeriod"].toString()
+        }
+
         /**
          * 条件点限速文字
          */
@@ -170,7 +188,7 @@ class SignUtil {
         private fun getSpeedLimitIcon(data: RenderEntity): Int {
             try {
                 //限速标志 0 限速开始 1 限速解除
-                return when (data.properties["speed_flag"]) {
+                return when (data.properties["speedFlag"]) {
                     "1" -> return R.drawable.icon_speed_limit_off
                     else -> return R.drawable.icon_speed_limit
                 }
@@ -186,7 +204,7 @@ class SignUtil {
         private fun getConditionalSpeedLimitIcon(data: RenderEntity): Int {
             try {
                 //限速标志 0 限速开始 1 限速解除
-                return when (data.properties["speed_flag"]) {
+                return when (data.properties["speedFlag"]) {
                     "1" -> return R.drawable.icon_conditional_speed_limit_off
                     else -> return R.drawable.icon_conditional_speed_limit
                 }
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_moreinfo_text_left.png b/app/src/main/res/drawable-xxhdpi/icon_main_moreinfo_text_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c12aa6a6d94f5d543ac6ea144c0eae91c6e8675e
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq000sI000*V1^@s61_K}D00001b5ch_0Itp)
z=>Px$tVu*cR5(wi)Xz&)Q5eSY?{jZsr5m+H|46GqVt&XhY%Q&$grEjQ2towi1VSn^
zV}Y*QxzaY35=7fJML!m^5L!e~kQ;TJ@!mJi$jmf3I_FMjd++<<ob$ZrmA$(+!tr3J
z^wKZ>W68D)Ul3Qp7Rdg1Ds4plc(R>>ApvH@yeG7~%9KAO#ZI8+avp*>en_tTM56tz
zhujG@e;yowgW5*|D=1Tb>$AJ=kgE&?k?j+($>s2luCE-P2c8XeR_zh!mNLaxXJLMj
z3u7RJqxu?=Eh@jd`!DDRHLEUOaM*WXQMq#IZ!8(qsx-s+%q2}|tn{ssbw~U@@w8e+
zjZVRsRJOR$KjgrZqn5~CneGpAt&s|$8qG0sxU6gI2Yo>1y1hcGc2hUjDy@@x-%%s}
z=qK=u-=mK;IbTbjn!Af?eT!JL%9lQM%f#nsb<l0)iqDfjkuZQLJ_cS8R;QF+?>Y2N
z@2L6mV;(U+`cj&YecJ2vJThBm_-M{W>I1Y>+b%?i0QgE2-&cP1O%k9Dy?!u*lwv3>
o_L@28U$!+~j2qkDW3?Oj2gc8~m=o2g=l}o!07*qoM6N<$f^_ESg8%>k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png b/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8342f10c3aeebf342ee3c40d24c19d67b86459c
GIT binary patch
literal 5240
zcmeI0=T}o(x5gnvA%Y-9I#Lp(H|aeh0s#$0AR<zuAc6=80xAShK!~(Z0#X%_-lX@?
zkJLbDLZrw+st}~*P~ZKI`!C%4;f`@Wtv$wm_L^(|#+uJsb4HmV4KH8fy+lJpa~WZz
zZvl*JG&HnehKs<{&_{MgV4!_rVW>w_KFkli;kbd&ziAm@|2s3#*K+?yZ}w}~Z_E&o
z0jtq8-^N7?vl7slaYsEU+FCn>v*VKZ6*I4!w?D~pB;A(bxZPtN>tO{SFQn(<OaPl(
zrhsuF;c&RnH(1(!+Y0j-D#*^|Mj`>ft+*0EefxTQ`}j@Pn->2qGUOt%9Pj57)8&@L
zCXf6=9%Vw;Y^X>Ld8wy=L{>-5Z)7gW56Lo<Mh6#tucv?M(n<^S=44YF1&4LOg|0AJ
z+H@=gOFe4cc-fp?1_@|8u>BQUF&S4D<)tHa12H>f{A5-s;4LY0d`iAF3mI8b<fLEc
z{_d@pBAePW<ei?d6!)L)I=z4{+ohm<nC@XKgWh>YUdm|kMyWj_svIGU-vD*V-xE<2
zR~4pZqe4I_7Z@3mk6UWDr^YAA)dh|x!`U+@hNh9~>WSpG-ZfM+JI>xmEd!E=1i`Lg
zK*8-5M3n7|rSiDGU*~^~VyJgM26jM)cts0X{2Mb_QonSuo{t9Tvk8SRflq?xL*YUJ
zt_jBrdM&CF6zv<jLT>oRa^`Pm%@51p(ckI%n<q)v1V*F*>vb$RW!Jxaw0LCBh_N11
z;Tl=Tr^Yu7I%$wE%k$xdfTc!+%x_EWpirkH!zax;=bTB~S%_*4-8pRu8SRlZ-!BRL
zka&0(JLQ%8l;uQ{Lu0+8#lC6@#&)c+JQg4EhwSMe7a<rUg`<H?gQW-btR7FGMfv*3
zyFrK;l^-r=66)%KbxwcKoM#R3gece*rVA#qme;nbRWY3}XJ;vf@-{2FX<5_a-faWR
z*Stg`mu6sa&?3o=$VWkbcS<qsc%69SgqXG8^VO^$sOnhrQ5J>)6xdA(+q-4^M=etv
z&$;h$ri{1crsGmu*!HP~*(9gV<r|A$sa_gPsn-Riw03kaWe8b-I&#9{^5A3BcHQ@m
zg~9ENYz$znPw>itgIZ{vKw{1DhnA$Int6Q<ue{ktJLVdXQHI~uibP>eI#-u3pAbvn
zM|ol*5~CM%&iNz|p8g_`Y117m%OfwU(Pd`AvYxEg<mm^#4B^epxus<Gw(soQ_@Fx#
z1?w}Nm(eNjM4w^4ZT^Ug`X;l~NR-o5?jiCG-)i1u%1Ft2m-Gmw#WI3UAV8p3F4+_o
z{#hh0@_HPVGRaBLv2m)-$(dU9keXHgj%6~L*%@<{{IT_J{61GzMT%|q1b6+9H#$cL
zPZ>4u_{9j)x0iQ(Rjq@bSD!9A8pck3{&H|^s@v0~aVQpg1SN`3#OxVFJ;5cs*U_HM
zF+8-Mf5@s~ZnNBl#nvw@qv}8RFJWh|Tr-_mw-b!n;z?0j`O_#IN#Y@;>)R5uxaxZg
zh3$x6{4@^muPa~u@ccW-EbPSeu;-cAwfA7;MNnNOR~9}hxOHZsb9V&3R0H-Px3G|Y
zz4`D=lSTL%icqVZ^*emSz>f(VIDB=a$JhMXJV(=~b2<6V-d&=&46W4MTokZ5>_FqM
z0(-T1f(zAdonA3A@$L$CR}BtOeN=DUH$2wWfLV{Eex;ZVGEPoTZpu7-eVnFX@^t=W
z4f9y@4)=EfW>R-2s=Zs0QRh>J0;-$NNF+XWfv`vaYVk9pt<VC?A`3JnH{g)<7@O-C
zJP}Yb5Ispw;Hl2D8y@OT+QEzDdW*Q|wnMPi9^vzX#k-E=1aKak(etE`(fWt)&w^$m
zNAlPUf<u1(Fx=o5lf|hF8FgY6kA<rPC9__&(J*pi?6<Q8C)5@EVWAg=h%hJw(_BHX
zk)0TYnx6^n%Q|APcc?^4^+^|<%6E2;axHyq6R6axV2IP%H>V<H9bh?`a335ycIAL2
zyX8#nsc74@cO}xuIb|=*AuG1%a6e?g&6(O7IL#ZW+V5xFnQ62DgL(B-*rNO24VXQA
z1+GU1lpqC%x?x4LkDd33<qd9dW=`pU_!YB;STNW7xghZb1<+ayJ7sDIzc}V8vqMaD
zuiEoFW|SFib;gYczdea73hInIwo{=zw(Q-ZBd<DpxwEMSLdafz%v&wLQR34U5wlyt
zQtRwCcW_yxA{%PNsA2knbGLS&n4Bom03;R<k5suUk2%`*su{y7u(V-2e|DMQWlzjw
zH}LJdOZS38WOuLhoro>u{M8G~2@fH;Id=?}5M`wV5?xEXqU*7rqpv0AnVgLZ+Q^W0
zR;nt{1CxLLM;t}4gElSx3UyuDX4L5*V?1NmajMr5^Y&DF7);G;gQ{9pCVtSDt(4qb
z+Qe}3&(Vu`%~E%2`i<%=Dc}_N=dF$c;^TSm0!7u<U@ko}GvCnH-1Pz5`!Ir4>+H{j
zX1Tu4S7+t-xA_*ZKRY5)VW*p!!s4gv;#&>p0!f=i$7oaYN6TMeLO8-QS8eC!x7I4H
ziYxbA%H!74UK&e&^<kEYp%G1<<X*8d48awbWQ69k=H!j>F14&Pm|6HGD^@Cjk}Myf
zGf)Dw#>M467gG#EaK`Q*c8j5K#Dvu_VGNMD#dzEMfyIlO`g!j2(i%&aDGZmy(ui82
z)agtBS-x^_-~=%1x}>Y48z8IcRjbedX0=;plKwaNzu5oXaQ{oGc10Con{kMe`bcqj
z*2Z<!N~hEw6&-Etpw#SR%Vu_ap;U2<xck$3+U6Blaiy&5YjQetSdc0FQhyzJzNhlg
zXo#09IWM_~WcD%#r1-0}w~g*9t6cwO1e`B)cf>7<+`dQncv*9YuvAjHlQ{OC^?v2t
zUXs>m!7z^VDt@Wy)2?|#iPq2Cjlz&8P)hTh`hBJ63}>~zP#-bbTX)NJoxw>;&X(kO
z@H#RCH<>AL2pl-Va0DM%kxMwViTyo3&-&?PL*bXo=lna`ZkB&FR9OHn;kNTZCK9kH
z(p51l;}D#rOjgzMm7F}Erk{Dn5HpMX9>qF-K!!wRSV{mERTI#gaw`PazZRV+DGEm<
zbB;{=0C?5yye;wp?-~2aW6KO!RDl$-I0>+*2U_R>U=7Q@J&0tsoIGQ!tA{!u%P3bX
z`u`Dp2ggxlvsC)T8O3RO%iLSNoKHhAytzO3d-5zUL=pgF^@B+&0pK^y>uP-)u=wJ1
zCsE)}*=&~vivciJeu|~~fXvxF!{#c$uh=sp*$A+Bj~K-g5jetXVyKc0z#LWP?P3Lh
zDQ@Di76JHGDG!%M1N^L1yNqFQglJuFniY`8#p^EjqX1d=q+0d=QSi{V))$oi7GdfN
zE{6N{`Hk`MBWSEs$1BpkKl*}QbI=(KqYJ9z7UdYkO(_VZ`n<O3#`@f1BN{kT_J2^u
z(QoBf!j&7gN0TZ4fLNjL5o5I#D<aJkZma%F{BOQ4m%Qg%j)3LF5Lz4Cd$e<dv4*a{
z7I(gH3vn~u{vdQ6!KLfZSibok($2G|q{5M;-y*IGqkRU>%6cW>*;XgDmDR#OqIK?M
zxr4?j9m;9%P=1_x%|oT+-RF+YWd>sqaK_MXu-IfdFZNeKz7v&-s=TqiTll#T=7#LM
z^QQ6*lM3ccaIekfr6uDFG#gPb$984%{z0ewrd$QXxoz9+9{Sw>-Zk!yCGM<;*?P}?
zmm$6&NP8T4m|9|i57Z_gsS&itr>mLJa>DUOw7erl>s@K#S(ztrzaqK)EKg`vI6Ii5
zQWM80G!x2g_cAqi6X4z885iXqlaUkF1FMxGD5qnO?Wo=Q3}X+hC@7>_Gcy#w!erpG
zYrw7YQaGi(QS>Jbki|$pP;P`>Y^2y;*Sc~zx00_8DAaL00i80glR2vzXD~lQ=dQBZ
zErYi2o%@<=&eADhv|tJKdf9j9Z<$5`PduIW(MTuP?7@VD^B``fM8(*o8@J-waoeuC
z%FBlK`kmm*k#Uw&ZbDo7pfLz{1Z$gV_3C$FpcweT^8$rl-}GPDHN<en3@mSX=N!}?
zo}{UM+HI7n@?9=S{nMQ;E-8y2PTx(0kAs8#Zn|roEljNXc$&1F9dL0gdP^MOQ3gR7
zOPbxwcb*Ck%7@tFUv_7-+r^R6^FJ++v>P4|wpW(ynPo;U#lnPQ2+7(QRvnxC{OdWs
zBU7u&UMl@8Ry`a`$G9054h?5@=L!dZ!Z`hLZcw_*;^MWegNuLWW}{D+ttvma?DG%s
zlks5Q=#ZeWr}JObBgjO7dgeB;^<SOMf?I^YAXsP4z3Juhs{VU7%C>jtH-G!rrBy|2
zOxLMjzq^XnY4vdwq`uw1O+73&t@7Tz<{>x3f)S_~LT6%+6X9AAm{?=iwzk~X#~61E
zM#o1ZgO;S!X*#dHPd=WmZx@jrupwZxaBFYlOg^&Ym}tdj%&GBA9d3W1@7=%o;HgN9
zj_%W^C)55pB5x!fHtf<|!VY*-u8dUfEDWKQXlT3O)&tj{;D2!Zu1?Q&UzvQ8k@7z2
zk!l8#Ugz|uZYp)vxO7A=Vv6sd`iH@uf8xU>Ch|#Q5u$g8dF#i)7thGZ(UYJh1H@vS
zYx(9VWC);(FfgX3C^^7{GDA)?iEkZHi-ZnI>40Ul^s8s=#aeR>eV1&wt?e{|=BgCk
z4jMEaovd3>RnHNsnle{2XR@!IwG-WVB#e+qpz2_hEr7luMai+n!*l8;SxjSstX6N?
z1YW4SdW|qC@Ob|qFY`ixv{ZnN-`a;TG_H;pPshITJ5FbVJ@u64-I~1Pxf>&Y@DfmC
zFbDyatlF8wEiyx`wA8%b>fuDb;z5Km;#-px3BEc{)5N&Y!-`lK7jv}PEe@M}@@D_h
ze$@+`W=%GWldW$Np;cAE952>MXg#(<R}g2hG>LajBG@_f6fuaAQ%kh{W&cEDaEd0w
zW&}#10Q~~pn}n~Wcdy~w#iCtivzJe@^A2>r*`Tu(oS4LJ{<mA8PtX&3<Y?yiZ4cF+
zw$O~bUfaARtr$=FNL#WC;Y}F8g*by2Z7t*ijSrY;IR!D2=gqi?=OT~ebfy^8Q#$2m
zB);^l!iWn%hvUIxVWpZT-`@K6*@JV@+UzvbXWE`2j~yduYdk23Mj?ne%#oJwLykht
z(~+9(^GlI}NgM<rL*vP`R@#+EbgRYjJkUfq9c$&LgIoKcd>D&0=Lq?X4ttiG*QfG~
zELne-sFVf%P(qV>SxFf$Oe+I!;VexXjz6x-Z5Gr#fqud~7^5K7p%(YFqUw1FUfc$Z
zG>``jH^d<0^t8tby7#AD!u1kM4j<OAHEb0G``rTLf)yV-mylJMySSfl_lk0s4)@Jf
z{8^hl5>M#U5`|D5KM_GHHu7^7Di-+9kH!)ha0aq#Rc|l*<hj-wmDFbNTnA+`bp@7(
zn$=x^GFILYe+K@mG3pZNqGPrI%YC>)h%-t5CSgMyv2P_HA%~fv<4!nZn>#n=U1OG{
iQG`J<^uZs_FI?=Kb-%Ox5(=~uX%M%O`sI3#VgCWP#lxcj

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml b/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml
index 9e391212..91510788 100644
--- a/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml
+++ b/app/src/main/res/drawable/shape_rect_black_8dp_bg.xml
@@ -3,10 +3,10 @@
     android:shape="rectangle">
 
     <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="4dp"
-        android:topLeftRadius="4dp"
-        android:topRightRadius="4dp" />
+        android:bottomLeftRadius="8dp"
+        android:bottomRightRadius="8dp"
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
 
     <solid android:color="#C42E303B" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 690d0642..99828062 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -63,6 +63,61 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageView
+            android:id="@+id/main_activity_sign_more_info_bg"
+            android:layout_width="240dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="260dp"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/main_sign_moreinfo_bg"
+            android:minHeight="140dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_top_sign_recyclerview" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
+            android:drawablePadding="4dp"
+            android:text="条件点限速"
+            android:textColor="@color/orange"
+            app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toTopOf="@id/main_activity_sign_more_info_bg" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:text="条件点限速"
+            android:textColor="@color/white"
+            app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_title" />
+
+        <TextView
+            android:id="@+id/main_activity_sign_more_info_text2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:singleLine="false"
+            android:text="条件点限速"
+            android:textColor="@color/white"
+            app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
+            app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_text1" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/main_activity_sign_more_info_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="main_activity_sign_more_info_bg,main_activity_sign_more_info_text2,main_activity_sign_more_info_text1,main_activity_sign_more_info_title" />
+
         <androidx.constraintlayout.helper.widget.Flow
             android:id="@+id/main_activity_flow"
             android:layout_width="0dp"
@@ -341,8 +396,8 @@
         <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"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             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"
@@ -353,10 +408,10 @@
             android:id="@+id/main_bottom_offline_map_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:onClick="@{()->mainActivity.onClickOfflineMapFragment()}"
             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"
@@ -388,7 +443,7 @@
             android:id="@+id/main_activity_bottom_sheet_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="visible"
+            android:visibility="gone"
             app:constraint_referenced_ids="
             main_bottom_route_text,
             main_bottom_offline_map_text,
@@ -409,5 +464,4 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </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 98d10cb5..3dbdbdb6 100644
--- a/app/src/main/res/layout/adapter_sign.xml
+++ b/app/src/main/res/layout/adapter_sign.xml
@@ -46,10 +46,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/sign_bottom_text"
-        android:layout_alignParentRight="true"
         android:layout_marginRight="15dp"
         android:gravity="center"
         android:text="其他信息"
+        android:layout_alignRight="@id/sign_main_bg"
         android:textColor="@color/white"
         android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml
index 56b85cbc..0f61f0f1 100644
--- a/app/src/main/res/layout/adapter_task_list.xml
+++ b/app/src/main/res/layout/adapter_task_list.xml
@@ -97,7 +97,6 @@
 
     <TextView
         android:id="@+id/task_progress_text"
-        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/task_download_btn"
diff --git a/app/src/main/res/layout/console_off.xml b/app/src/main/res/layout/console_off.xml
index 7133021a..d1167c5a 100644
--- a/app/src/main/res/layout/console_off.xml
+++ b/app/src/main/res/layout/console_off.xml
@@ -5,7 +5,6 @@
     android:id="@+id/console_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/console_bg"
     tools:context=".ui.fragment.console.ConsoleFragment">
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/layout/fragment_offline_map.xml b/app/src/main/res/layout/fragment_offline_map.xml
index 7b0bed8c..3ccd5905 100644
--- a/app/src/main/res/layout/fragment_offline_map.xml
+++ b/app/src/main/res/layout/fragment_offline_map.xml
@@ -46,8 +46,8 @@
         app:tabGravity="center"
         app:tabIndicator="@null"
         app:tabIndicatorHeight="0dp"
-        app:tabMaxWidth="150dp"
-        app:tabMinWidth="150dp"
+        app:tabMaxWidth="110dp"
+        app:tabMinWidth="110dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="6dp"
         app:tabPaddingStart="6dp"
diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml
index c3f59fe1..f533d173 100644
--- a/app/src/main/res/layout/fragment_task_manager.xml
+++ b/app/src/main/res/layout/fragment_task_manager.xml
@@ -45,8 +45,8 @@
         app:tabGravity="center"
         app:tabIndicator="@null"
         app:tabIndicatorHeight="0dp"
-        app:tabMaxWidth="150dp"
-        app:tabMinWidth="150dp"
+        app:tabMaxWidth="110dp"
+        app:tabMinWidth="110dp"
         app:tabMode="scrollable"
         app:tabPaddingEnd="6dp"
         app:tabPaddingStart="6dp"
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index f0aee773..80bbc7d3 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -29,18 +29,18 @@
     <group android:checkableBehavior="single">
         <item android:title="小标题">
             <menu>
-                <item
-                    android:id="@+id/personal_center_menu_task_list"
-                    android:icon="@drawable/ic_baseline_format_list_bulleted_24"
-                    android:title="任务列表" />
-                <item
-                    android:id="@+id/personal_center_menu_qs_record_list"
-                    android:icon="@drawable/ic_baseline_playlist_add_check_24"
-                    android:title="测评结果" />
-                <item
-                    android:id="@+id/personal_center_menu_layer_manager"
-                    android:icon="@drawable/ic_baseline_layers_24"
-                    android:title="图层管理" />
+<!--                <item-->
+<!--                    android:id="@+id/personal_center_menu_task_list"-->
+<!--                    android:icon="@drawable/ic_baseline_format_list_bulleted_24"-->
+<!--                    android:title="任务列表" />-->
+<!--                <item-->
+<!--                    android:id="@+id/personal_center_menu_qs_record_list"-->
+<!--                    android:icon="@drawable/ic_baseline_playlist_add_check_24"-->
+<!--                    android:title="测评结果" />-->
+<!--                <item-->
+<!--                    android:id="@+id/personal_center_menu_layer_manager"-->
+<!--                    android:icon="@drawable/ic_baseline_layers_24"-->
+<!--                    android:title="图层管理" />-->
 
                 <item
                     android:id="@+id/personal_center_menu_test"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f138c0c1..b2ec0c64 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,7 +40,7 @@
     <!--金色 -->
     <!--粉红色 -->
     <!--亮粉红色 -->
-    <color name="orange">#FFA500</color> <!--橙色 -->
+    <color name="orange">#FFBC6E</color> <!--橙色 -->
     <!--亮肉色 -->
     <!--暗桔黄色 -->
     <!--珊瑚色 -->
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index b413db0d..0b0f699b 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" map-background="#f4f4f4"
-    version="1" xmlns="http://opensciencemap.org/rendertheme"
-    xsi:schemaLocation="http://opensciencemap.org/rendertheme
+    version="1" xmlns="http://opensciencemap.org/rendertheme" xsi:schemaLocation="http://opensciencemap.org/rendertheme
     https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
     <!--###### TRANSFORM tags ######-->
@@ -46,8 +45,8 @@
     <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
-    <style-text caption="true" style="bold" fill="#ffffff" id="ref-caption" k="ref" priority="2"
-        size="12" bg-fill="#45a976" />
+    <style-text style="bold" bg-fill="#45a976" caption="true" fill="#ffffff" id="ref-caption" k="ref"
+        priority="2" size="12" />
     <!--ferry-->
     <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
         stroke-width="2.0" />
@@ -174,7 +173,7 @@
     <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
 
     <!-- omdb -->
-    <style-line id="boundaryType" width="0.1" stipple-width="0.1"  />
+    <style-line id="boundaryType" stipple-width="0.1" width="0.1" />
 
     <!--###### ASSIGNMENT ######-->
 
@@ -1480,18 +1479,19 @@
     </m>
 
     <!-- 自定义渲染样式 -->
-    <m k="navi_type" zoom-min="15" zoom-max="22">
+    <m k="navi_type" zoom-max="22" zoom-min="15">
         <!-- 车道中心线 -->
         <m v="had_lane_link">
-            <line stroke="#ff0000" stipple-stroke="#00000000" dasharray="20,20" fix="true" width="0.3"  />
+            <line dasharray="20,20" fix="true" stipple-stroke="#00000000" stroke="#ff0000"
+                width="0.3" />
         </m>
         <!-- 车道边线 -->
         <m v="had_lane_mark_link">
-            <line stroke="#0000ff" width="0.1" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#0000ff" width="0.1" />
         </m>
         <!--道路箭头 objectArrow-->
         <m v="object_arrow">
-            <area fill="#88aaaa00" stroke="#ff0000" stroke-width="0.1" fade="5"></area>
+            <area fade="5" fill="#88aaaa00" stroke="#ff0000" stroke-width="0.1"></area>
         </m>
         <!--人行横道 objectcrosswalk-->
         <m v="object_crosswalk">
@@ -1503,7 +1503,7 @@
         </m>
         <!--杆状物 objectpole-->
         <m v="object_pole">
-            <line stroke="#8800aaaa" width="0.1" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#8800aaaa" width="0.1" />
         </m>
         <!--对象标志 objectsymbol-->
         <m v="object_symbol">
@@ -1514,7 +1514,7 @@
             <area fill="#8800cc00" stroke="#00cc00" stroke-width="0.2"></area>
         </m>
 
-        <m zoom-min="15" zoom-max="19">
+        <m zoom-max="19" zoom-min="15">
             <text use="ferry" />
         </m>
 
@@ -1538,19 +1538,20 @@
 
     <m k="nav_style">
         <m v="symbol_object_line">
-            <m k="rule" zoom-min="15" zoom-max="22">
+            <m k="rule" zoom-max="22" zoom-min="15">
                 <!-- 蓝色黑色间隔线 -->
                 <m v="blue_link">
-                    <line stroke="#00000000" stipple-stroke="#00000000" dasharray="20,20" fix="true" width="0.1"  />
+                    <line dasharray="20,20" fix="true" stipple-stroke="#00000000" stroke="#00000000"
+                        width="0.1" />
                 </m>
                 <!-- 黄色线 -->
                 <m v="yellow_link">
-                    <line stroke="#f4ea2a" width="0.1" stipple-width="0.1"/>
+                    <line stipple-width="0.1" stroke="#f4ea2a" width="0.1" />
                 </m>
             </m>
-            <line stroke="#33aaaa" width="0.3" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#33aaaa" width="0.3" />
         </m>
-        <m v="symbol_track_point" zoom-min="10" zoom-max="25">
+        <m v="symbol_track_point" zoom-max="25" zoom-min="10">
             <symbol src="assets:symbols/dot_blue.svg" />
         </m>
     </m>
@@ -1560,88 +1561,88 @@
         <m v="OMDB_LANE_NUM">
             <m k="laneNum">
                 <m v="1">
-                    <line stroke="#545D6C" width="3"/>
+                    <line stroke="#545D6C" width="3" />
                 </m>
                 <m v="2">
-                    <line stroke="#545D6C" width="6"/>
+                    <line stroke="#545D6C" width="6" />
                 </m>
                 <m v="3">
-                    <line stroke="#545D6C" width="9"/>
+                    <line stroke="#545D6C" width="9" />
                 </m>
                 <m v="4">
-                    <line stroke="#545D6C" width="12"/>
+                    <line stroke="#545D6C" width="12" />
                 </m>
                 <m v="5">
-                    <line stroke="#545D6C" width="15"/>
+                    <line stroke="#545D6C" width="15" />
                 </m>
                 <m v="6">
                     <line stroke="#545D6C" width="18" />
                 </m>
                 <m v="7">
-                    <line stroke="#545D6C" width="21"/>
+                    <line stroke="#545D6C" width="21" />
                 </m>
                 <m v="8">
-                    <line stroke="#545D6C" width="24"/>
+                    <line stroke="#545D6C" width="24" />
                 </m>
                 <m v="9">
-                    <line stroke="#545D6C" width="27"/>
+                    <line stroke="#545D6C" width="27" />
                 </m>
                 <m v="10">
-                    <line stroke="#545D6C" width="30"/>
+                    <line stroke="#545D6C" width="30" />
                 </m>
                 <m v="11">
-                    <line stroke="#545D6C" width="33"/>
+                    <line stroke="#545D6C" width="33" />
                 </m>
                 <m v="12">
-                    <line stroke="#545D6C" width="36"/>
+                    <line stroke="#545D6C" width="36" />
                 </m>
             </m>
         </m>
         <!-- 道路线 -->
         <m v="OMDB_RD_LINK">
-            <line stroke="#9c9c9c" width="1"/>
+            <line stroke="#9c9c9c" width="1" />
         </m>
         <!--道路种别-->
         <m v="OMDB_RD_LINK_KIND">
             <m k="kind">
                 <m v="1">
-                    <line stroke="#fcacd4" width="1"/>
+                    <line stroke="#fcacd4" width="1" />
                 </m>
                 <m v="2">
-                    <line stroke="#dcacfc" width="1"/>
+                    <line stroke="#dcacfc" width="1" />
                 </m>
                 <m v="3">
-                    <line stroke="#fc9c9c" width="1"/>
+                    <line stroke="#fc9c9c" width="1" />
                 </m>
                 <m v="4">
-                    <line stroke="#fcd484" width="1"/>
+                    <line stroke="#fcd484" width="1" />
                 </m>
                 <m v="5">
-                    <line stroke="#ecfccc" width="1"/>
+                    <line stroke="#ecfccc" width="1" />
                 </m>
                 <m v="6">
-                    <line stroke="#acec84" width="1"/>
+                    <line stroke="#acec84" width="1" />
                 </m>
                 <m v="7">
-                    <line stroke="#806048" width="1"/>
+                    <line stroke="#806048" width="1" />
                 </m>
                 <m v="8">
-                    <line stroke="#fcfc7c" width="1"/>
+                    <line stroke="#fcfc7c" width="1" />
                 </m>
                 <m v="9">
-                    <line stroke="#acc4fc" width="1"/>
+                    <line stroke="#acc4fc" width="1" />
                 </m>
                 <m v="10">
-                    <line stroke="#8cc8e0" width="1"/>
+                    <line stroke="#8cc8e0" width="1" />
                 </m>
                 <m v="11">
-                    <line stroke="#64ecdc" width="1"/>
+                    <line stroke="#64ecdc" width="1" />
                 </m>
                 <m v="13">
-                    <line stroke="#585080" width="1"/>
+                    <line stroke="#585080" width="1" />
                 </m>
                 <m v="15">
-                    <line stroke="#647430" width="1"/>
+                    <line stroke="#647430" width="1" />
                 </m>
             </m>
         </m>
@@ -1650,67 +1651,71 @@
         <m v="OMDB_SPEEDLIMIT">
             <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="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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"
+                    <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
+                    <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
+                    <symbol src="assets:omdb/icon_4002_0.svg" symbol-height="46"
+                        symbol-width="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="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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"
+                    <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                         stroke-width="1.0"></caption>
+                    <symbol src="assets:omdb/icon_4002_1.svg" symbol-height="46"
+                        symbol-width="46"></symbol>
+                    <!--                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                    <!--                        stroke-width="1.0"></caption>-->
                 </m>
             </m>
         </m>
         <!--条件点限速-->
         <m v="OMDB_SPEEDLIMIT_COND">
-            <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="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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>
+            <m k="speedFlag" v="0">
+                <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                    stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4003_0.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                        stroke-width="1.0"></caption>-->
+            </m>
+            <m k="speedFlag" v="1">
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                    stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4003_1.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                        stroke-width="1.0"></caption>-->
             </m>
         </m>
         <!--可变点限速-->
         <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="12" stroke="#ffffff"
-                    stroke-width="1.0"></caption>
-                <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"
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4004_0.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <caption dy="-28" fill="#000000" k="minSpeed" priority="0" size="14"
+                    stroke="#ffffff" stroke-width="1.0"></caption>
             </m>
             <m v="1">
-                <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"
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4004_1.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <caption dy="-28" fill="#000000" k="minSpeed" priority="0" size="14"
+                    stroke="#ffffff" stroke-width="1.0"></caption>
             </m>
         </m>
         <!--车道中心线-->
         <m v="OMDB_LANE_LINK_LG">
-            <line stroke="#ecf0f1" width="0.1" dasharray="35,35"/>
+            <line dasharray="35,35" stroke="#ecf0f1" width="0.1" />
         </m>
         <!-- 道路边界类型 -->
         <m v="OMDB_RDBOUND_BOUNDARYTYPE">
-            <line stroke="#ffffff" width="0.1"/>
+            <line stroke="#ffffff" width="0.1" />
         </m>
         <!-- 车道边界类型 -->
         <m v="OMDB_LANE_MARK_BOUNDARYTYPE">
@@ -1723,19 +1728,19 @@
                         <m v="0|1">
                             <m k="markColor">
                                 <m v="0|1">
-                                    <line stroke="#ffffff" use="boundaryType"/>
+                                    <line stroke="#ffffff" use="boundaryType" />
                                 </m>
                                 <m v="2">
-                                    <line stroke="#eccc68" use="boundaryType"/>
+                                    <line stroke="#eccc68" use="boundaryType" />
                                 </m>
                                 <m v="6">
-                                    <line stroke="#0000ff" use="boundaryType"/>
+                                    <line stroke="#0000ff" use="boundaryType" />
                                 </m>
                                 <m v="7">
-                                    <line stroke="#00ff00" use="boundaryType"/>
+                                    <line stroke="#00ff00" use="boundaryType" />
                                 </m>
                                 <m v="9">
-                                    <line stroke="#8e44ad" use="boundaryType"/>
+                                    <line stroke="#8e44ad" use="boundaryType" />
                                 </m>
                             </m>
                         </m>
@@ -1743,31 +1748,32 @@
                         <m v="2">
                             <m k="markColor">
                                 <m v="0|1">
-                                    <line stroke="#ffffff" use="boundaryType" dasharray="3,13"/>
+                                    <line dasharray="3,13" stroke="#ffffff" use="boundaryType" />
                                 </m>
                                 <m v="2">
-                                    <line stroke="#eccc68" use="boundaryType" dasharray="3,3"/>
+                                    <line dasharray="3,3" stroke="#eccc68" use="boundaryType" />
                                 </m>
                                 <m v="6">
-                                    <line stroke="#0000ff" use="boundaryType" dasharray="3,3"/>
+                                    <line dasharray="3,3" stroke="#0000ff" use="boundaryType" />
                                 </m>
                                 <m v="7">
-                                    <line stroke="#00ff00" use="boundaryType" dasharray="3,3"/>
+                                    <line dasharray="3,3" stroke="#00ff00" use="boundaryType" />
                                 </m>
                                 <m v="9">
-                                    <line stroke="#8e44ad" use="boundaryType" dasharray="3,3"/>
+                                    <line dasharray="3,3" stroke="#8e44ad" use="boundaryType" />
                                 </m>
                             </m>
                         </m>
                         <!--导流区边线-->
                         <m v="4">
                             <line outline="boundary" stroke="#545D6C"></line>
-                            <lineSymbol src="assets:omdb/icon_right.png" repeat-start="0" repeat-gap="0.5"/>
+                            <lineSymbol repeat-gap="0.5" repeat-start="0"
+                                src="assets:omdb/icon_right.png" />
                         </m>
-<!--                        &lt;!&ndash;铺设路面边缘&ndash;&gt;-->
-<!--                        <m v="5">-->
-<!--                            <line outline="#ffffff" fix="true" src="assets:omdb/icon_close.png" stroke="#ffffffff" use="boundaryType"/>-->
-<!--                        </m>-->
+                        <!--                        &lt;!&ndash;铺设路面边缘&ndash;&gt;-->
+                        <!--                        <m v="5">-->
+                        <!--                            <line outline="#ffffff" fix="true" src="assets:omdb/icon_close.png" stroke="#ffffffff" use="boundaryType"/>-->
+                        <!--                        </m>-->
                     </m>
                 </m>
             </m>
@@ -1776,29 +1782,33 @@
         <m v="OMDB_LINK_DIRECT">
             <m k="direct">
                 <m v="2">
-<!--                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>-->
-                    <lineSymbol src="assets:omdb/oneway_right.svg" ></lineSymbol>
+                    <!--                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>-->
+                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>
                 </m>
                 <m v="3">
-<!--                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>-->
+                    <!--                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>-->
                     <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>
                 </m>
             </m>
         </m>
         <!--交通灯-->
         <m v="OMDB_TRAFFICLIGHT">
-            <symbol src="assets:omdb/icon_4022_0.svg" repeat="false" symbol-width="46" symbol-height="46" rotate="false"></symbol>
+            <symbol repeat="false" rotate="false" src="assets:omdb/icon_4022_0.svg"
+                symbol-height="69" symbol-width="69"></symbol>
         </m>
         <!--普通交限-->
         <m v="OMDB_RESTRICTION">
             <m k="angle">
-                <symbol src="assets:omdb/icon_4006_0.svg" repeat="false" symbol-width="46" symbol-height="46" rotate="false" repeat-start="0" ></symbol>
+                <symbol repeat="false" repeat-start="0" rotate="false"
+                    src="assets:omdb/icon_4006_0.svg" symbol-height="69" symbol-width="69"></symbol>
             </m>
             <m k="type" v="angle">
-                <symbol src="assets:omdb/icon_arrow_right.svg" repeat-start="0" repeat-gap="2000" symbol-percent="45" repeat="false" rotate="true"></symbol>
+                <symbol repeat="false" repeat-gap="2000" repeat-start="0"
+                    rotate="true" src="assets:omdb/icon_arrow_right.svg" symbol-height="76" symbol-width="76"></symbol>
             </m>
             <m k="type" v="s_2_e">
-                <line stroke="#14582c" width="0.1" dasharray="1,1" repeat-gap="3" repeat-start="0"/>
+                <line dasharray="1,1" repeat-gap="3" repeat-start="0" stroke="#14582c"
+                    width="0.1" />
             </m>
         </m>
     </m>
diff --git a/collect-library/src/main/assets/omdb/icon_4006_0.svg b/collect-library/src/main/assets/omdb/icon_4006_0.svg
index f5b3b3c5..06c69498 100644
--- a/collect-library/src/main/assets/omdb/icon_4006_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4006_0.svg
@@ -1 +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
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" viewBox="0 0 200 200"><defs><style>.a{fill:#4d4d4d;}.a,.b{opacity:0;}.b,.h,.j{fill:#fff;}.c{fill:#ff8a4c;opacity:0.304;}.d{fill:#a74d4b;opacity:0.708;}.e{fill:url(#a);}.f{fill:url(#b);}.g{fill:url(#c);}.i{fill:#272727;}.j{font-size:28px;font-family:PingFangSC-Regular, PingFang SC;letter-spacing:0.013em;}.k,.l{stroke:none;}.l{fill:#db4646;}</style><linearGradient id="a" x1="0.301" y1="-0.037" x2="0.414" y2="0.628" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#5f1508"/><stop offset="1" stop-color="#ef8673"/></linearGradient><radialGradient id="b" 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="c" 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(-1011 -454)"><rect class="a" width="200" height="200" transform="translate(1011 454)"/><g transform="translate(215 -626)"><g transform="translate(572 700)"><g transform="translate(289.868 391)"><rect class="b" width="100" height="100" transform="translate(-14.868 -1)"/><g transform="translate(10.653 81.66)"><ellipse class="c" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="d" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(-1.772 2)"><path class="e" d="M24.238,71.538q-.836-.8-1.629-1.533A36.353,36.353,0,0,1,36.783,0,36.354,36.354,0,0,1,50.691,70.114q-.621.673-1.287,1.424A72.81,72.81,0,0,0,37.311,90.157S32.03,78.981,24.238,71.538Z" transform="translate(0 -5)"/></g><g transform="translate(0 0)"><path class="f" 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="g" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g><path class="h" d="M6.4,12.172a.924.924,0,0,1-.851-.507.867.867,0,0,1,.13-.959A19.843,19.843,0,0,1,11.231,6.17a.977.977,0,0,1,.718-.053.93.93,0,0,1,.545.455.909.909,0,0,1-.4,1.22A16.95,16.95,0,0,0,7.119,11.8a.953.953,0,0,1-.722.315ZM4.341,15.085a.992.992,0,0,1-.487-.139.894.894,0,0,1-.423-.558.866.866,0,0,1,.117-.682l.307-.488a.916.916,0,0,1,.575-.409.945.945,0,0,1,.705.112.908.908,0,0,1,.424.566.883.883,0,0,1-.118.691l-.307.47a.926.926,0,0,1-.794.436" transform="matrix(0.995, 0.105, -0.105, 0.995, 9.089, -1.137)"/></g></g><g transform="translate(10046 8302)"><g class="i" transform="translate(-9178 -7204)"><path class="k" 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="l" 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="j" 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.svg b/collect-library/src/main/assets/omdb/icon_4022_0.svg
index 63378323..dc58b844 100644
--- a/collect-library/src/main/assets/omdb/icon_4022_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4022_0.svg
@@ -1,162 +1 @@
-<?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
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="200mm" height="200mm" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 566.9 566.9"><defs><style>.p{fill:url(#h);}.q{fill:url(#o);}.r{fill:url(#n);}.s{fill:url(#l);}.t{fill:rgba(77,77,77,0);}.u{fill:#fff;}.v{fill:#3d444c;}.w{fill:#272d35;isolation:isolate;opacity:.2;}.x{stroke:#d5b725;}.x,.y{fill:none;}.x,.y,.z,.aa,.ab{stroke-miterlimit:10;stroke-width:3.4px;}.y{stroke:#18873b;}.z{fill:url(#k);stroke:#d15f6a;}.aa{fill:url(#j);stroke:#161b20;}.ab{fill:url(#i);stroke:#8ba0ae;}</style><linearGradient id="h" x1="275.8" y1="248.3" x2="291.9" y2="248.3" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#999899"/><stop offset=".2" stop-color="#7e7e80"/><stop offset=".4" stop-color="#5b5d60"/><stop offset=".6" stop-color="#46494d"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="i" x1="234.6" y1="126" x2="332.3" y2="126" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b1bbcb"/><stop offset=".1" stop-color="#c2cddb"/><stop offset=".4" stop-color="#dbe7f0"/><stop offset=".5" stop-color="#e4f1f9"/><stop offset=".6" stop-color="#deeaf3"/><stop offset=".8" stop-color="#cdd9e5"/><stop offset="1" stop-color="#b1bccd"/><stop offset="1" stop-color="#aeb9ca"/></linearGradient><linearGradient id="j" x1="235.7" y1="129.8" x2="331.2" y2="129.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#403c42"/><stop offset=".1" stop-color="#3c4353"/><stop offset=".3" stop-color="#3a475d"/><stop offset=".5" stop-color="#344256"/><stop offset=".7" stop-color="#233445"/><stop offset="1" stop-color="#0d212d"/></linearGradient><radialGradient id="k" cx="269.6" cy="70.9" fx="269.6" fy="70.9" r="30.7" gradientTransform="translate(18.3 1.3) scale(1 .9)" 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=".3" stop-color="#ed7474"/><stop offset=".5" stop-color="#ea5a59"/><stop offset=".7" stop-color="#ea514f"/><stop offset=".8" stop-color="#e5312c"/><stop offset=".8" stop-color="#e12e2a"/><stop offset="1" stop-color="#ce2320"/></radialGradient><radialGradient id="l" cx="269.6" cy="70.9" fx="252.9" fy="61.2" r="29.1" gradientTransform="translate(18.3 1.3) scale(1 .9)" 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=".4" stop-color="#ea514f"/><stop offset=".8" stop-color="#e12e2a"/><stop offset=".9" stop-color="#c62f2d"/><stop offset="1" stop-color="#a11715"/></radialGradient><radialGradient id="n" cx="269.6" cy="137.8" fx="253.4" fy="128.4" r="28.3" gradientTransform="translate(18.3 1.3) scale(1 .9)" 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="0" stop-color="#f6de46"/><stop offset="0" stop-color="#f7e757"/><stop offset="0" stop-color="#f8ec63"/><stop offset=".1" stop-color="#f8f06a"/><stop offset=".2" stop-color="#f9f16c"/><stop offset=".9" stop-color="#f8cf00"/><stop offset="1" stop-color="#ffe200"/></radialGradient><radialGradient id="o" cx="283.5" cy="204.7" fx="267" fy="195.1" r="28.7" gradientTransform="translate(0 1.3) scale(1 .9)" 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=".4" stop-color="#8fc31f"/><stop offset=".7" stop-color="#58b431"/><stop offset=".8" stop-color="#24a239"/><stop offset="1" stop-color="#0c6735"/></radialGradient></defs><g id="c"><g><g id="d"><rect id="e" class="t" width="566.9" height="566.9"/></g><g><ellipse id="f" class="w" cx="283.5" cy="286.7" rx="48.6" ry="12.5"/><ellipse id="g" class="v" cx="283.5" cy="286.7" rx="25.5" ry="10"/><path class="p" d="M277.2,207.1h12.5c1.4,0,2.6,1.2,2.6,2.6v77.2c0,1.4-1.1,2.5-2.5,2.5h-12.8c-1.4,0-2.5-1.1-2.5-2.5v-77.2c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="ab" x="234.6" y="11.7" width="97.6" height="228.6" rx="48.8" ry="48.8"/><rect class="aa" x="235.7" y="21.9" width="95.5" height="215.8" rx="47.8" ry="47.8"/><g><path class="z" d="M253.3,68.3c0,16,13.5,29,30.2,29s30.2-13,30.2-29-13.5-29-30.2-29-30.2,13-30.2,29Z"/><path class="s" d="M254.8,68.3c0,15.2,12.8,27.5,28.7,27.5s28.7-12.3,28.7-27.5-12.8-27.5-28.7-27.5-28.7,12.3-28.7,27.5Z"/></g><path id="m" class="u" d="M253,48.1c-1,0-2-.5-2.4-1.5s-.3-2,.4-2.7c4.4-5.2,9.8-9.7,15.9-13,.6-.3,1.4-.4,2.1-.2,.7,.2,1.2,.7,1.6,1.3,.7,1.3,.2,2.8-1.1,3.5-5.5,2.9-10.3,6.8-14.3,11.5-.5,.6-1.3,.9-2.1,.9v.2Zm-5.9,8.4c-.5,0-1-.1-1.4-.4-.6-.4-1-.9-1.2-1.6-.2-.7,0-1.4,.3-2l.9-1.4c.4-.6,1-1,1.7-1.2,.7-.2,1.4,0,2,.3,.6,.4,1.1,.9,1.2,1.6s0,1.4-.3,2l-.9,1.4c-.5,.8-1.3,1.3-2.3,1.3h0Z"/><g><path class="x" d="M254.2,131.5c0,15.5,13.1,28.1,29.3,28.1s29.3-12.6,29.3-28.1-13.1-28.1-29.3-28.1-29.3,12.6-29.3,28.1Z"/><path class="r" d="M255.6,131.5c0,14.8,12.5,26.7,27.8,26.7s27.8-12,27.8-26.7-12.5-26.7-27.8-26.7-27.8,12-27.8,26.7Z"/></g><g><path class="y" d="M253.3,194.7c0,15.7,13.5,28.5,30.2,28.5s30.2-12.8,30.2-28.5-13.5-28.5-30.2-28.5-30.2,12.8-30.2,28.5Z"/><path class="q" d="M254.8,194.7c0,15,12.8,27.1,28.7,27.1s28.7-12.1,28.7-27.1-12.8-27.1-28.7-27.1-28.7,12.1-28.7,27.1Z"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_arrow_right.svg b/collect-library/src/main/assets/omdb/icon_arrow_right.svg
index fc0678f3..73b8c5dc 100644
--- a/collect-library/src/main/assets/omdb/icon_arrow_right.svg
+++ b/collect-library/src/main/assets/omdb/icon_arrow_right.svg
@@ -1,40 +1 @@
-<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
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="296" height="296" viewBox="0 0 296 296"><defs><style>.a{opacity:0;isolation:isolate;}.b{fill:#545e6c;opacity:0.999;}.c{fill:rgba(255,255,255,0.12);stroke:#f7ad5d;}.d{fill:rgba(255,255,255,0.11);stroke:rgba(255,255,255,0.67);opacity:0.459;}.e{stroke:rgba(0,0,0,0);stroke-miterlimit:10;fill:url(#a);}.f{stroke:none;}.g{fill:none;}</style><linearGradient id="a" x1="0.5" y1="0.267" x2="0.5" y2="0.712" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ca4916"/><stop offset="1" stop-color="#f7ad5d"/></linearGradient></defs><g transform="translate(-243 -404)"><g transform="translate(1762 -801) rotate(90)"><g class="a" transform="translate(1205 1231)"><rect class="b" width="296" height="296" transform="translate(0 -8)"/></g><g transform="translate(1250 1231)"><g class="c" transform="translate(13 50)"><circle class="f" cx="90" cy="90" r="90"/><circle class="g" cx="90" cy="90" r="89.5"/></g><g class="d" transform="translate(35 72)"><circle class="f" cx="68" cy="68" r="68"/><circle class="g" cx="68" cy="68" r="67.5"/></g><path class="e" d="M18.942,57.189V36.331H6.056A6,6,0,0,1,.535,32.946a5.356,5.356,0,0,1,.753-5.814L21.849,2.2a6.269,6.269,0,0,1,9.537,0L51.947,27.132a5.356,5.356,0,0,1,.753,5.814,6,6,0,0,1-5.521,3.386H34.293V57.1c-2.29-.125-4.628-.189-6.947-.189-2.8,0-5.622.093-8.4.277Z" transform="translate(76.383 -6.188)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
index bc2f46e2..e4e9b588 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
@@ -263,7 +263,6 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) :
         mContext.lifecycleScope.launch(Dispatchers.IO) {
             var list = mutableListOf<QsRecordBean>()
             val realm = Realm.getDefaultInstance()
-            Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
             realm.executeTransaction {
                 val objects = realm.where<QsRecordBean>().findAll()
                 list = realm.copyFromRealm(objects)
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/MyItemizedLayer.java b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/MyItemizedLayer.java
index cae265b8..fb9b4c47 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/MyItemizedLayer.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/MyItemizedLayer.java
@@ -89,7 +89,6 @@ public class MyItemizedLayer extends ItemizedLayer {
     private boolean activateSelectedItems(MotionEvent event, ActiveItem task) {
         int size = this.mItemList.size();
 
-        Log.e("jingo", "地图点击 size =" + size);
         if (size == 0) {
             return false;
         } else {

From 236f422fa157d466907403f58453eb347c715ff6 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Fri, 16 Jun 2023 15:29:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/assets/editormarker.xml          | 187 ++++++++++--------
 1 file changed, 100 insertions(+), 87 deletions(-)

diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 1fe31923..f53a299e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" map-background="#f4f4f4"
-    version="1" xmlns="http://opensciencemap.org/rendertheme"
-    xsi:schemaLocation="http://opensciencemap.org/rendertheme
+    version="1" xmlns="http://opensciencemap.org/rendertheme" xsi:schemaLocation="http://opensciencemap.org/rendertheme
     https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
     <!--###### TRANSFORM tags ######-->
@@ -46,8 +45,8 @@
     <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
-    <style-text caption="true" style="bold" fill="#ffffff" id="ref-caption" k="ref" priority="2"
-        size="12" bg-fill="#45a976" />
+    <style-text style="bold" bg-fill="#45a976" caption="true" fill="#ffffff" id="ref-caption"
+        k="ref" priority="2" size="12" />
     <!--ferry-->
     <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
         stroke-width="2.0" />
@@ -174,7 +173,7 @@
     <style-symbol id="oneway" repeat="true" src="assets:symbols/oneway.svg" />
 
     <!-- omdb -->
-    <style-line id="boundaryType" width="0.1" stipple-width="0.1"  />
+    <style-line id="boundaryType" stipple-width="0.1" width="0.1" />
 
     <!--###### ASSIGNMENT ######-->
 
@@ -1480,18 +1479,19 @@
     </m>
 
     <!-- 自定义渲染样式 -->
-    <m k="navi_type" zoom-min="15" zoom-max="22">
+    <m k="navi_type" zoom-max="22" zoom-min="15">
         <!-- 车道中心线 -->
         <m v="had_lane_link">
-            <line stroke="#ff0000" stipple-stroke="#00000000" dasharray="20,20" fix="true" width="0.3"  />
+            <line dasharray="20,20" fix="true" stipple-stroke="#00000000" stroke="#ff0000"
+                width="0.3" />
         </m>
         <!-- 车道边线 -->
         <m v="had_lane_mark_link">
-            <line stroke="#0000ff" width="0.1" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#0000ff" width="0.1" />
         </m>
         <!--道路箭头 objectArrow-->
         <m v="object_arrow">
-            <area fill="#88aaaa00" stroke="#ff0000" stroke-width="0.1" fade="5"></area>
+            <area fade="5" fill="#88aaaa00" stroke="#ff0000" stroke-width="0.1"></area>
         </m>
         <!--人行横道 objectcrosswalk-->
         <m v="object_crosswalk">
@@ -1503,7 +1503,7 @@
         </m>
         <!--杆状物 objectpole-->
         <m v="object_pole">
-            <line stroke="#8800aaaa" width="0.1" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#8800aaaa" width="0.1" />
         </m>
         <!--对象标志 objectsymbol-->
         <m v="object_symbol">
@@ -1514,7 +1514,7 @@
             <area fill="#8800cc00" stroke="#00cc00" stroke-width="0.2"></area>
         </m>
 
-        <m zoom-min="15" zoom-max="19">
+        <m zoom-max="19" zoom-min="15">
             <text use="ferry" />
         </m>
 
@@ -1538,19 +1538,20 @@
 
     <m k="nav_style">
         <m v="symbol_object_line">
-            <m k="rule" zoom-min="15" zoom-max="22">
+            <m k="rule" zoom-max="22" zoom-min="15">
                 <!-- 蓝色黑色间隔线 -->
                 <m v="blue_link">
-                    <line stroke="#00000000" stipple-stroke="#00000000" dasharray="20,20" fix="true" width="0.1"  />
+                    <line dasharray="20,20" fix="true" stipple-stroke="#00000000" stroke="#00000000"
+                        width="0.1" />
                 </m>
                 <!-- 黄色线 -->
                 <m v="yellow_link">
-                    <line stroke="#f4ea2a" width="0.1" stipple-width="0.1"/>
+                    <line stipple-width="0.1" stroke="#f4ea2a" width="0.1" />
                 </m>
             </m>
-            <line stroke="#33aaaa" width="0.3" stipple-width="0.5"/>
+            <line stipple-width="0.5" stroke="#33aaaa" width="0.3" />
         </m>
-        <m v="symbol_track_point" zoom-min="10" zoom-max="25">
+        <m v="symbol_track_point" zoom-max="25" zoom-min="10">
             <symbol src="assets:symbols/dot_blue.svg" />
         </m>
     </m>
@@ -1560,53 +1561,53 @@
         <m v="OMDB_LANE_NUM">
             <m k="laneNum">
                 <m v="1">
-                    <line stroke="#545D6C" width="3"/>
+                    <line stroke="#545D6C" width="3" />
                 </m>
                 <m v="2">
-                    <line stroke="#545D6C" width="6"/>
+                    <line stroke="#545D6C" width="6" />
                 </m>
                 <m v="3">
-                    <line stroke="#545D6C" width="9"/>
+                    <line stroke="#545D6C" width="9" />
                 </m>
                 <m v="4">
-                    <line stroke="#545D6C" width="12"/>
+                    <line stroke="#545D6C" width="12" />
                 </m>
                 <m v="5">
-                    <line stroke="#545D6C" width="15"/>
+                    <line stroke="#545D6C" width="15" />
                 </m>
                 <m v="6">
                     <line stroke="#545D6C" width="18" />
                 </m>
                 <m v="7">
-                    <line stroke="#545D6C" width="21"/>
+                    <line stroke="#545D6C" width="21" />
                 </m>
                 <m v="8">
-                    <line stroke="#545D6C" width="24"/>
+                    <line stroke="#545D6C" width="24" />
                 </m>
                 <m v="9">
-                    <line stroke="#545D6C" width="27"/>
+                    <line stroke="#545D6C" width="27" />
                 </m>
                 <m v="10">
-                    <line stroke="#545D6C" width="30"/>
+                    <line stroke="#545D6C" width="30" />
                 </m>
                 <m v="11">
-                    <line stroke="#545D6C" width="33"/>
+                    <line stroke="#545D6C" width="33" />
                 </m>
                 <m v="12">
-                    <line stroke="#545D6C" width="36"/>
+                    <line stroke="#545D6C" width="36" />
                 </m>
             </m>
         </m>
         <!-- 道路线 -->
         <m v="OMDB_RD_LINK">
-            <line stroke="#9c9c9c" width="1"/>
+            <line stroke="#9c9c9c" width="1" />
         </m>
         <!--道路种别-->
         <m v="OMDB_RD_LINK_KIND">
             <outline-layer id="kind0" stroke="#44000000" width="0.1" />
             <outline-layer id="kind1" stroke="#aa807040" width="0.1" />
             <m k="kind" v="1">
-                <line outline="kind0" blur="0.3" use="highway:z11" />
+                <line blur="0.3" outline="kind0" use="highway:z11" />
             </m>
             <m k="kind" v="2|3">
                 <line outline="kind0" use="trunk" />
@@ -1636,69 +1637,71 @@
 
         <!--常规点限速-->
         <m v="OMDB_SPEEDLIMIT">
-            <m k="speedFlag">
-                <m v="0">
-                    <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                    <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
             <m k="speedFlag" v="0">
-<!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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>-->
+                <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                    stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4002_0.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                        stroke-width="1.0"></caption>-->
             </m>
             <m k="speedFlag" v="1">
-                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <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>-->
+                <symbol src="assets:omdb/icon_4002_1.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                    stroke-width="1.0"></caption>-->
             </m>
         </m>
         <!--条件点限速-->
         <m v="OMDB_SPEEDLIMIT_COND">
             <m k="speedFlag" v="0">
-                    <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                    <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
-                        stroke-width="1.0"></caption>
-                    <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>-->
+                <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                    stroke-width="1.0"></caption>
+                <symbol src="assets:omdb/icon_4003_0.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                        stroke-width="1.0"></caption>-->
             </m>
             <m k="speedFlag" v="1">
-                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <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>-->
+                <symbol src="assets:omdb/icon_4003_1.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                    stroke-width="1.0"></caption>-->
             </m>
         </m>
         <!--可变点限速-->
         <m v="OMDB_SPEEDLIMIT_VAR">
-            <m k="speedFlag"  v="0">
+            <m k="speedFlag" v="0">
                 <!--                    <symbol src="assets:omdb/round_speedlimit.svg" symbol-width="30" symbol-height="30"></symbol>-->
-                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
+                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <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>-->
+                <symbol src="assets:omdb/icon_4004_0.svg" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                    stroke-width="1.0"></caption>-->
             </m>
             <m k="speedFlag" v="1">
-                <caption k="maxSpeed" fill="#000000" priority="0" size="12" stroke="#ffffff"
+                <caption fill="#000000" k="maxSpeed" 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"-->
-<!--                    stroke-width="1.0"></caption>-->
+                <symbol src="assets:omdb/icon_4004_1.png" symbol-height="46"
+                    symbol-width="46"></symbol>
+                <!--                <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"-->
+                <!--                    stroke-width="1.0"></caption>-->
             </m>
         </m>
         <!--车道中心线-->
         <m v="OMDB_LANE_LINK_LG">
-            <line stroke="#ecf0f1" width="0.1" dasharray="35,35"/>
+            <line dasharray="35,35" stroke="#ecf0f1" width="0.1" />
         </m>
         <!-- 道路边界类型 -->
         <m v="OMDB_RDBOUND_BOUNDARYTYPE">
-            <line stroke="#ffffff" width="0.1"/>
+            <line stroke="#ffffff" width="0.1" />
         </m>
         <!-- 车道边界类型 -->
         <m v="OMDB_LANE_MARK_BOUNDARYTYPE">
@@ -1711,19 +1714,19 @@
                         <m v="0|1">
                             <m k="markColor">
                                 <m v="0|1">
-                                    <line stroke="#ffffff" use="boundaryType"/>
+                                    <line stroke="#ffffff" use="boundaryType" />
                                 </m>
                                 <m v="2">
-                                    <line stroke="#eccc68" use="boundaryType"/>
+                                    <line stroke="#eccc68" use="boundaryType" />
                                 </m>
                                 <m v="6">
-                                    <line stroke="#0000ff" use="boundaryType"/>
+                                    <line stroke="#0000ff" use="boundaryType" />
                                 </m>
                                 <m v="7">
-                                    <line stroke="#00ff00" use="boundaryType"/>
+                                    <line stroke="#00ff00" use="boundaryType" />
                                 </m>
                                 <m v="9">
-                                    <line stroke="#8e44ad" use="boundaryType"/>
+                                    <line stroke="#8e44ad" use="boundaryType" />
                                 </m>
                             </m>
                         </m>
@@ -1731,31 +1734,37 @@
                         <m v="2">
                             <m k="markColor">
                                 <m v="0|1">
-                                    <line stroke="#ffffff" stipple-stroke="#000000" stipple="5" use="boundaryType" dasharray="13,135"/>
+                                    <line dasharray="13,135" stipple="5" stipple-stroke="#000000"
+                                        stroke="#ffffff" use="boundaryType" />
                                 </m>
                                 <m v="2">
-                                    <line stroke="#eccc68" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
+                                    <line dasharray="13,135" stipple="5" stipple-stroke="#ffffff"
+                                        stroke="#eccc68" use="boundaryType" />
                                 </m>
                                 <m v="6">
-                                    <line stroke="#0000ff" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
+                                    <line dasharray="13,135" stipple="5" stipple-stroke="#ffffff"
+                                        stroke="#0000ff" use="boundaryType" />
                                 </m>
                                 <m v="7">
-                                    <line stroke="#00ff00" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
+                                    <line dasharray="13,135" stipple="5" stipple-stroke="#ffffff"
+                                        stroke="#00ff00" use="boundaryType" />
                                 </m>
                                 <m v="9">
-                                    <line stroke="#8e44ad" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
+                                    <line dasharray="13,135" stipple="5" stipple-stroke="#ffffff"
+                                        stroke="#8e44ad" use="boundaryType" />
                                 </m>
                             </m>
                         </m>
                         <!--导流区边线-->
                         <m v="4">
                             <line outline="boundary" stroke="#545D6C"></line>
-                            <lineSymbol src="assets:omdb/icon_right.png" repeat-start="0" repeat-gap="0.5"/>
+                            <lineSymbol repeat-gap="0.5" repeat-start="0"
+                                src="assets:omdb/icon_right.png" />
                         </m>
-<!--                        &lt;!&ndash;铺设路面边缘&ndash;&gt;-->
-<!--                        <m v="5">-->
-<!--                            <line outline="#ffffff" fix="true" src="assets:omdb/icon_close.png" stroke="#ffffffff" use="boundaryType"/>-->
-<!--                        </m>-->
+                        <!--                        &lt;!&ndash;铺设路面边缘&ndash;&gt;-->
+                        <!--                        <m v="5">-->
+                        <!--                            <line outline="#ffffff" fix="true" src="assets:omdb/icon_close.png" stroke="#ffffffff" use="boundaryType"/>-->
+                        <!--                        </m>-->
                     </m>
                 </m>
             </m>
@@ -1764,30 +1773,34 @@
         <m v="OMDB_LINK_DIRECT">
             <m k="direct">
                 <m v="2">
-<!--                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>-->
-                    <lineSymbol src="assets:omdb/oneway_right.svg" ></lineSymbol>
+                    <!--                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>-->
+                    <lineSymbol src="assets:omdb/oneway_right.svg"></lineSymbol>
                 </m>
                 <m v="3">
-<!--                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>-->
+                    <!--                    <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>-->
                     <lineSymbol src="assets:omdb/oneway_left.svg"></lineSymbol>
                 </m>
             </m>
         </m>
         <!--交通灯-->
         <m v="OMDB_TRAFFICLIGHT">
-            <symbol src="assets:omdb/icon_4022_0.svg" repeat="false" symbol-width="69" symbol-height="69" rotate="false"></symbol>
+            <symbol repeat="false" rotate="false" src="assets:omdb/icon_4022_0.svg"
+                symbol-height="69" symbol-width="69"></symbol>
         </m>
         <!--普通交限-->
         <m v="OMDB_RESTRICTION">
             <m k="angle">
-                <symbol src="assets:omdb/icon_4006_0.svg" repeat="false" symbol-width="69" symbol-height="69" rotate="false" repeat-start="0" ></symbol>
+                <symbol repeat="false" repeat-start="0" rotate="false"
+                    src="assets:omdb/icon_4006_0.svg" symbol-height="69" symbol-width="69"></symbol>
             </m>
             <m k="type" v="angle">
-                <symbol repeat="false" repeat-gap="2000" repeat-start="0"
-                    rotate="true" src="assets:omdb/icon_arrow_right.svg" symbol-height="76" symbol-width="76"></symbol>
+                <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
+                    src="assets:omdb/icon_arrow_right.svg" symbol-height="76"
+                    symbol-width="76"></symbol>
             </m>
             <m k="type" v="s_2_e">
-                <line stroke="#14582c" width="0.1" dasharray="1,1" repeat-gap="3" repeat-start="0"/>
+                <line dasharray="1,1" repeat-gap="3" repeat-start="0" stroke="#14582c"
+                    width="0.1" />
             </m>
         </m>
     </m>

From 1fe90ccf26719acf4146a70dc597b55a23fe65be Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Fri, 16 Jun 2023 17:16:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omqs/ui/activity/map/MainActivity.kt      |  13 +++++++++++++
 .../ui/fragment/console/ConsoleFragment.kt    |  15 +++++++++++++++
 .../main_sign_moreinfo_bg.9.png               | Bin 5240 -> 5136 bytes
 app/src/main/res/layout/activity_main.xml     |   2 ++
 4 files changed, 30 insertions(+)

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 12464cbf..c46932f7 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
@@ -440,6 +440,12 @@ class MainActivity : BaseActivity() {
      */
     fun onSwitchSheet() {
         if (binding.mainActivityBottomSheetGroup.visibility == View.VISIBLE) {
+            leftFragment?.let {
+                supportFragmentManager.beginTransaction().remove(it).commit()
+                leftFragment = null
+                binding.mainActivityLeftFragment.visibility = View.GONE
+            }
+
             binding.mainActivityBottomSheetGroup.visibility = View.GONE
         } else {
             binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
@@ -500,6 +506,13 @@ class MainActivity : BaseActivity() {
         }
     }
 
+    /**
+     * 路径规划
+     */
+    fun onClickRouteFragment() {
+        Toast.makeText(this, "功能开发中", Toast.LENGTH_SHORT).show()
+    }
+
     /**
      * 打开离线地图
      */
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
index 966f5666..3318c4c6 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.transition.AutoTransition
 import androidx.transition.Scene
@@ -153,6 +154,11 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
          */
         binding.consoleRoot.findViewById<View>(R.id.console_task_bg)?.setOnClickListener(this)
         binding.consoleRoot.findViewById<View>(R.id.console_task_icon_bg)?.setOnClickListener(this)
+        /**
+         * 路径规划
+         */
+        binding.consoleRoot.findViewById<View>(R.id.console_route_bg)?.setOnClickListener(this)
+        binding.consoleRoot.findViewById<View>(R.id.console_route_icon_bg)?.setOnClickListener(this)
     }
 
     override fun onDestroy() {
@@ -232,6 +238,9 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
                         (a as MainActivity).onClickResFragment()
                     }
                 }
+                /**
+                 * 任务列表
+                 */
                 R.id.console_task_icon_bg, R.id.console_task_bg -> {
                     activity?.let { a ->
                         a.supportFragmentManager.beginTransaction().remove(this).commit()
@@ -239,6 +248,12 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
                     }
 
                 }
+                /**
+                 * 路径规划
+                 */
+                R.id.console_route_bg, R.id.console_route_icon_bg -> {
+                    Toast.makeText(requireContext(), "功能开发中", Toast.LENGTH_SHORT).show()
+                }
                 else -> {}
             }
         }
diff --git a/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png b/app/src/main/res/drawable-xxhdpi/main_sign_moreinfo_bg.9.png
index e8342f10c3aeebf342ee3c40d24c19d67b86459c..c10da04a43a8d5f8dd079bc5500809445f138036 100644
GIT binary patch
literal 5136
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
D(n?T7

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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 99828062..77fc36a0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -423,6 +423,7 @@
             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"
+            android:onClick="@{()->mainActivity.onClickRouteFragment()}"
             app:layout_constraintRight_toRightOf="@id/main_activity_bottom_sheet_bg"
             app:layout_constraintTop_toTopOf="@id/main_bottom_task"
             app:layout_constraintVertical_chainStyle="packed" />
@@ -434,6 +435,7 @@
             android:text="路径规划"
             android:textColor="@color/blue"
             android:textSize="10sp"
+            android:onClick="@{()->mainActivity.onClickRouteFragment()}"
             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"