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

 Conflicts:

	vtm

app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt

@@ -63,9 +63,12 @@ class RealmOperateHelper() {
         // 查询realm中对应tile号的数据
         val realm = getRealmDefaultInstance()
         val realmList =
-            getRealmTools(RenderEntity::class.java,false).and().equalTo("table", "OMDB_RD_LINK")
+            getRealmTools(RenderEntity::class.java, false)
-                .and()
+                .equalTo("table", "OMDB_RD_LINK")
-                .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
+                .greaterThanOrEqualTo("tileX", xStart)
+                .lessThanOrEqualTo("tileX", xEnd)
+                .greaterThanOrEqualTo("tileY", yStart)
+                .lessThanOrEqualTo("tileY", yEnd)
                 .findAll()
         // 将获取到的数据和查询的polygon做相交，只返回相交的数据
         val dataList = realm.copyFromRealm(realmList)
@@ -125,10 +128,12 @@ class RealmOperateHelper() {
         val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
         // 查询realm中对应tile号的数据
         val realm = getRealmDefaultInstance()
-        val realmList = getRealmTools(RenderEntity::class.java, true).and()
+        val realmList = getRealmTools(RenderEntity::class.java, true)
             .equalTo("table", table)
-            .and()
+            .greaterThanOrEqualTo("tileX", xStart)
-            .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
+            .lessThanOrEqualTo("tileX", xEnd)
+            .greaterThanOrEqualTo("tileY", yStart)
+            .lessThanOrEqualTo("tileY", yEnd)
             .findAll()
         // 将获取到的数据和查询的polygon做相交，只返回相交的数据
         val dataList = realm.copyFromRealm(realmList)
@@ -187,8 +192,8 @@ class RealmOperateHelper() {
         var link: RenderEntity? = null
         val realm = getRealmDefaultInstance()
         val realmR =
-            getRealmTools(RenderEntity::class.java, true).and().equalTo("table", "OMDB_RD_LINK")
+            getRealmTools(RenderEntity::class.java, true).equalTo("table", "OMDB_RD_LINK")
-                .and().equalTo("properties['${LinkTable.linkPid}']", linkPid).findFirst()
+                .equalTo("properties['${LinkTable.linkPid}']", linkPid).findFirst()
         if (realmR != null) {
             link = realm.copyFromRealm(realmR)
         }
@@ -202,8 +207,8 @@ class RealmOperateHelper() {
     suspend fun queryQcRecordBean(markId: String): QsRecordBean? {
         var qsRecordBean: QsRecordBean? = null
         val realm = getRealmDefaultInstance()
-        val realmR = getRealmTools(QsRecordBean::class.java, false).and()
+        val realmR = getRealmTools(QsRecordBean::class.java, false)
-            .equalTo("table", "QsRecordBean").and().equalTo("id", markId).findFirst()
+            .equalTo("table", "QsRecordBean").equalTo("id", markId).findFirst()
         if (realmR != null) {
             qsRecordBean = realm.copyFromRealm(realmR)
         }
@@ -215,7 +220,7 @@ class RealmOperateHelper() {
 
         val realm = getRealmDefaultInstance()
 
-        val realmR = getRealmTools(RenderEntity::class.java, true).and()
+        val realmR = getRealmTools(RenderEntity::class.java, true)
             .equalTo("properties['${LinkTable.linkPid}']", linkPid).findAll()
 
         val dataList = realm.copyFromRealm(realmR)
@@ -257,10 +262,12 @@ class RealmOperateHelper() {
         val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null)
         val realm = getRealmDefaultInstance()
         // 查询realm中对应tile号的数据
-        val realmList = getRealmTools(RenderEntity::class.java, false).and()
+        val realmList = getRealmTools(RenderEntity::class.java, false)
             .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
-            .and()
+            .greaterThanOrEqualTo("tileX", xStart)
-            .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
+            .lessThanOrEqualTo("tileX", xEnd)
+            .greaterThanOrEqualTo("tileY", yStart)
+            .lessThanOrEqualTo("tileY", yEnd)
             .findAll()
         // 将获取到的数据和查询的polygon做相交，只返回相交的数据
         val queryResult = realmList?.stream()?.filter {
@@ -287,10 +294,9 @@ class RealmOperateHelper() {
     suspend fun queryLinkByLinkPid(linkPid: String): MutableList<RenderEntity> {
         val result = mutableListOf<RenderEntity>()
         val realm = getRealmDefaultInstance()
-        val realmList = getRealmTools(RenderEntity::class.java, false).and()
+        val realmList = getRealmTools(RenderEntity::class.java, false)
             .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
-            .and()
+            .equalTo("properties['${LinkTable.linkPid}']", linkPid)
-            .equalTo("properties['${LinkTable.linkPid}']", linkPid).and()
             .findAll()
         result.addAll(realm.copyFromRealm(realmList))
         return result
@@ -383,14 +389,15 @@ class RealmOperateHelper() {
     }
 
     fun getRealmDefaultInstance(): Realm {
-        if(isUpdate){
+        if (isUpdate) {
+            Log.e("jingo", "数据库更新")
             Realm.getDefaultInstance().refresh()
             isUpdate = false;
         }
         return Realm.getDefaultInstance()
     }
 
-    fun updateRealmDefaultInstance(){
+    fun updateRealmDefaultInstance() {
         isUpdate = true
     }
 }

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

@@ -524,7 +524,7 @@ class MainActivity : BaseActivity() {
     /**
      * 开始测量
      */
-    private fun measuringToolOn() {
+    fun measuringToolOn() {
         val root = binding.mainActivityMeasuringTool.root
         val valueView = root.findViewById<TextView>(R.id.measuring_tool_value)
         val unitView = root.findViewById<TextView>(R.id.measuring_tool_value_unit)
@@ -533,6 +533,7 @@ class MainActivity : BaseActivity() {
         mapController.measureLayerHandler.measureValueLiveData.observe(this) {
             valueView.text = it.valueString
             unitView.text = it.unit
+            ClipboardUtils.copyText("${it.valueString}${it.unit}")
         }
         mapController.measureLayerHandler.tempMeasureValueLiveData.observe(this)
         {
@@ -672,12 +673,6 @@ class MainActivity : BaseActivity() {
         viewModel.onClickMenu()
     }
 
-    /**
-     * 点击测速
-     */
-    fun onClickCalcDistance() {
-        measuringToolOn()
-    }
 
     /**
      * 点击轨迹

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

@@ -8,7 +8,6 @@ import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.os.Bundle
-import android.provider.ContactsContract.Data
 import android.text.TextUtils
 import android.util.Log
 import android.view.Gravity
@@ -45,7 +44,7 @@ import com.navinfo.omqs.http.NetworkService
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import com.navinfo.omqs.ui.other.BaseToast
-import com.navinfo.omqs.ui.widget.SignUtil
+import com.navinfo.omqs.util.SignUtil
 import com.navinfo.omqs.util.DateTimeUtil
 import com.navinfo.omqs.util.ShareUtil
 import com.navinfo.omqs.util.SoundMeter
@@ -53,11 +52,11 @@ import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
 import io.realm.RealmSet
-import io.realm.kotlin.where
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.locationtech.jts.geom.Geometry
 import org.oscim.core.GeoPoint
 import org.oscim.core.MapPosition
 import org.oscim.map.Map
@@ -905,6 +904,19 @@ class MainViewModel @Inject constructor(
 
     fun showSignMoreInfo(data: RenderEntity) {
         liveDataSignMoreInfo.value = data
+        if (data.wkt != null) {
+            mapController.markerHandle.removeMarker("moreInfo")
+            mapController.lineHandler.removeLine()
+            when (data.wkt!!.geometryType) {
+                Geometry.TYPENAME_POINT -> {
+                    val geoPoint = GeometryTools.createGeoPoint(data.wkt!!.toText())
+                    mapController.markerHandle.addMarker(geoPoint, "moreInfo")
+                }
+                Geometry.TYPENAME_LINESTRING -> {
+                    mapController.lineHandler.showLine(data.wkt!!.toText())
+                }
+            }
+        }
     }
 
     fun sendServerCommand(

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

@@ -13,7 +13,7 @@ import com.navinfo.omqs.databinding.AdapterSignBinding
 import com.navinfo.omqs.databinding.AdapterSignLaneinfoBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder
-import com.navinfo.omqs.ui.widget.SignUtil
+import com.navinfo.omqs.util.SignUtil
 
 interface OnSignAdapterClickListener {
     fun onItemClick(signBean: SignBean)

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt

@@ -22,6 +22,7 @@ import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.FragmentEvaluationResultBinding
+import com.navinfo.omqs.ui.activity.map.MainActivity
 import com.navinfo.omqs.ui.dialog.FirstDialog
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.other.shareViewModels
@@ -101,6 +102,10 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
             mDialog.show()
         }
 
+        //测距按钮
+        binding.evaluationBarMeasuring.setOnClickListener {
+            (activity as MainActivity).measuringToolOn()
+        }
         //保存事件
         binding.evaluationBarSave.setOnClickListener {
             viewModel.saveData()
@@ -194,12 +199,16 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         viewModel.liveDataToastMessage.observe(viewLifecycleOwner) {
             Toast.makeText(requireContext(), it, Toast.LENGTH_SHORT).show()
         }
+        viewModel.liveDataQsRecordBean.observe(viewLifecycleOwner){
+            binding.evaluationId.text = it.id
+        }
 
     }
 
     override fun onDestroyView() {
         activity?.run {
             findNavController(R.id.main_activity_middle_fragment).navigateUp()
+            (this as MainActivity).measuringToolOff()
         }
         super.onDestroyView()
     }
@@ -304,6 +313,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         return true
     }
 
+
     private fun takePhoto() {
         try {
             val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

@@ -398,6 +398,9 @@ class EvaluationResultViewModel @Inject constructor(
             } else if (taskBean.cause.isEmpty()) {
                 liveDataToastMessage.postValue("请选择初步分析原因！")
                 return@launch
+            } else if (taskBean.linkId.isEmpty()) {
+                liveDataToastMessage.postValue("没有绑定到任何link，请选择")
+                return@launch
             }
 
             val realm = Realm.getDefaultInstance()

app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt

@@ -10,6 +10,9 @@ import com.navinfo.omqs.ui.other.BaseViewHolder
 
 class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = null) :
     BaseRecyclerViewAdapter<RenderEntity>() {
+
+    var selectPosition = -1
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
         val viewBinding =
             AdapterItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -19,9 +22,15 @@ class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = nu
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         val binding = holder.viewBinding as AdapterItemBinding
         var renderEntity = data[position]
-
+        binding.root.isSelected = selectPosition == position
         binding.name.text = DataCodeEnum.findTableNameByCode(renderEntity.code)
         binding.root.setOnClickListener {
+            if (selectPosition != position) {
+                notifyItemChanged(selectPosition)
+                selectPosition = position
+                notifyItemChanged(position)
+            }
+
             if (itemListener != null) {
                 itemListener!!.invoke(position, renderEntity)
             }

app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt

@@ -14,7 +14,7 @@ import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.FragmentSignInfoBinding
 import com.navinfo.omqs.ui.activity.map.MainViewModel
 import com.navinfo.omqs.ui.fragment.BaseFragment
-import com.navinfo.omqs.ui.widget.SignUtil
+import com.navinfo.omqs.util.SignUtil
 
 
 class SignMoreInfoFragment : BaseFragment() {
@@ -38,15 +38,22 @@ class SignMoreInfoFragment : BaseFragment() {
         binding.signInfoRecyclerview.layoutManager = layoutManager
         viewModel.liveDataSignMoreInfo.observe(viewLifecycleOwner) {
             binding.signInfoTitle.text = it.name
-            val drawable = resources.getDrawable(R.drawable.icon_main_moreinfo_text_left, null);
+            val drawableLeft = resources.getDrawable(R.drawable.icon_main_moreinfo_text_left, null);
-            drawable.setBounds(
+            val drawableRight = resources.getDrawable(R.drawable.baseline_edit_note_48, null);
+            drawableLeft.setBounds(
                 0,
                 0,
-                drawable.minimumWidth,
+                drawableLeft.minimumWidth,
-                drawable.minimumHeight
+                drawableLeft.minimumHeight
-            );//必须设置图片大小，否则不显示
+            )//必须设置图片大小，否则不显示
+            drawableRight.setBounds(
+                0,
+                0,
+                drawableRight.minimumWidth,
+                drawableRight.minimumHeight
+            )
             binding.signInfoTitle.setCompoundDrawables(
-                drawable, null, null, null
+                drawableLeft, null, drawableRight, null
             )
 
             when (it.code) {
@@ -62,7 +69,7 @@ class SignMoreInfoFragment : BaseFragment() {
                     binding.signInfoRecyclerview.adapter = adapter
                     adapter.refreshData(SignUtil.getLaneBoundaryTypeInfo(it))
                 }
-                DataCodeEnum.OMDB_INTERSECTION.code->{
+                DataCodeEnum.OMDB_INTERSECTION.code -> {
                     val adapter = LaneBoundaryAdapter()
                     binding.signInfoRecyclerview.adapter = adapter
                     adapter.refreshData(SignUtil.getIntersectionInfo(it))
@@ -77,7 +84,7 @@ class SignMoreInfoFragment : BaseFragment() {
                         drawable.minimumHeight
                     );//必须设置图片大小，否则不显示
                     binding.signInfoTitle.setCompoundDrawables(
-                        drawable, null, null, null
+                        drawable, null, drawableRight, null
                     )
                     val adapter = TwoItemAdapter()
                     binding.signInfoRecyclerview.adapter = adapter

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

@@ -2,6 +2,7 @@ package com.navinfo.omqs.ui.fragment.tasklist
 
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import com.navinfo.collect.library.data.entity.HadLinkDvoBean
 import com.navinfo.omqs.R
@@ -13,6 +14,7 @@ import com.navinfo.omqs.ui.other.BaseViewHolder
 interface TaskAdapterCallback {
     fun itemOnClick(bean: HadLinkDvoBean)
     fun editOnClick(position: Int, bean: HadLinkDvoBean)
+    fun scrollPosition(position: Int)
 }
 
 /**
@@ -38,10 +40,12 @@ class TaskAdapter(
         val binding: AdapterTaskBinding =
             holder.viewBinding as AdapterTaskBinding
         val bean = data[position]
-        if(bean.linkStatus==1){
+        if (bean.linkStatus == 1) {
-            binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head)
+            binding.taskHead.background =
-        }else{
+                binding.root.context.getDrawable(R.drawable.selector_task_head)
-            binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head_add_link)
+        } else {
+            binding.taskHead.background =
+                binding.root.context.getDrawable(R.drawable.selector_task_head_add_link)
         }
         binding.taskLinkPid.text = "PID:${bean.linkPid}"
         binding.taskMesh.text = "mesh:${bean.mesh}"
@@ -58,7 +62,11 @@ class TaskAdapter(
                 callback.itemOnClick(bean)
             }
         }
-        binding.taskEdit.isSelected = bean.reason != ""
+        if (bean.reason == "") {
+            binding.taskBadge.visibility = View.GONE
+        } else {
+            binding.taskBadge.visibility = View.VISIBLE
+        }
         binding.taskEdit.setOnClickListener {
             callback.editOnClick(position, bean)
         }
@@ -68,6 +76,21 @@ class TaskAdapter(
     fun resetSelect() {
         selectPosition = -1
     }
+
+    fun setSelectTag(tag: String) {
+        for (i in data.indices) {
+            if (data[i].linkPid == tag) {
+                if (selectPosition > -1)
+                    notifyItemChanged(selectPosition)
+                selectPosition = i
+                notifyItemChanged(i)
+                if (callback != null) {
+                    callback.scrollPosition(i)
+                }
+                break
+            }
+        }
+    }
 }
 
 

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

@@ -48,6 +48,10 @@ class TaskFragment : BaseFragment() {
             override fun editOnClick(position: Int, bean: HadLinkDvoBean) {
                 showLinkEditDialog(position, bean)
             }
+
+            override fun scrollPosition(position: Int) {
+               binding.taskRecyclerview.scrollToPosition(position)
+            }
         })
     }
 
@@ -120,6 +124,9 @@ class TaskFragment : BaseFragment() {
             }
 
         })
+        viewModel.liveDataSelectLink.observe(viewLifecycleOwner){
+            adapter.setSelectTag(it)
+        }
     }
 
 

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

@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Build
 import android.view.View
+import androidx.annotation.RequiresApi
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -66,6 +67,11 @@ class TaskViewModel @Inject constructor(
      */
     val liveDataToastMessage = MutableLiveData<String>()
 
+    /**
+     * 点击地图选中的link
+     */
+    val liveDataSelectLink = MutableLiveData<String>()
+
     /**
      * 当前选中的任务
      */
@@ -85,6 +91,79 @@ class TaskViewModel @Inject constructor(
 
     init {
         sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+        mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener {
+            @RequiresApi(Build.VERSION_CODES.N)
+            override fun onMapClick(tag: String, point: GeoPoint) {
+                if (tag == TAG) {
+                    if (liveDataSelectNewLink.value == true) {
+                        viewModelScope.launch(Dispatchers.Default) {
+                            if (currentSelectTaskBean == null) {
+                                liveDataToastMessage.postValue("还没有开启任何任务")
+                            } else {
+                                val links = realmOperateHelper.queryLink(
+                                    point = point,
+                                )
+                                if (links.isNotEmpty()) {
+                                    val l = links[0]
+                                    for (link in currentSelectTaskBean!!.hadLinkDvoList) {
+                                        if (link.linkPid == l.properties["linkPid"]) {
+                                            return@launch
+                                        }
+                                    }
+                                    val hadLinkDvoBean = HadLinkDvoBean(
+                                        taskId = currentSelectTaskBean!!.id,
+                                        linkPid = l.properties["linkPid"]!!,
+                                        geometry = l.geometry,
+                                        linkStatus = 2
+                                    )
+                                    currentSelectTaskBean!!.hadLinkDvoList.add(
+                                        hadLinkDvoBean
+                                    )
+                                    val realm = Realm.getDefaultInstance()
+                                    realm.executeTransaction { r ->
+                                        r.copyToRealmOrUpdate(hadLinkDvoBean)
+                                        r.copyToRealmOrUpdate(currentSelectTaskBean!!)
+                                    }
+                                    //根据Link数据查询对应数据上要素，对要素进行显示重置
+                                    l.properties["linkPid"]?.let {
+                                        realmOperateHelper.queryLinkToMutableRenderEntityList(it)
+                                            ?.forEach { renderEntity ->
+                                                if (renderEntity.enable != 1) {
+                                                    renderEntity.enable = 1
+                                                    realm.executeTransaction { r ->
+                                                        r.copyToRealmOrUpdate(renderEntity)
+                                                    }
+                                                }
+                                            }
+                                    }
+                                    liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
+                                    mapController.lineHandler.addTaskLink(hadLinkDvoBean)
+                                    mapController.layerManagerHandler.updateOMDBVectorTileLayer()
+                                    mapController.mMapView.vtmMap.updateMap(true)
+                                }
+                            }
+                        }
+                    }else {
+                        viewModelScope.launch(Dispatchers.IO) {
+                            val links = realmOperateHelper.queryLink(
+                                point = point,
+                            )
+                            if (links.isNotEmpty()) {
+                                val l = links[0]
+                                for (link in currentSelectTaskBean!!.hadLinkDvoList) {
+                                    if (link.linkPid == l.properties["linkPid"]) {
+                                        liveDataSelectLink.postValue(link.linkPid)
+                                        mapController.lineHandler.showLine(link.geometry)
+                                        break
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        })
+
     }
 
     /**
@@ -106,10 +185,9 @@ class TaskViewModel @Inject constructor(
         val nowTime: Long = DateTimeUtil.getNowDate().time
         val beginNowTime: Long = nowTime - 90 * 3600 * 24 * 1000L
         val syncUpload: Int = FileManager.Companion.FileUploadStatus.DONE
-        val objects =
+        val objects = realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or()
-            realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or()
+            .between("operationTime", beginNowTime, nowTime).equalTo("syncStatus", syncUpload)
-                .between("operationTime", beginNowTime, nowTime)
+            .findAll().sort("id")
-                .equalTo("syncStatus", syncUpload).findAll().sort("id")
         val taskList = realm.copyFromRealm(objects)
         for (item in taskList) {
             FileManager.checkOMDBFileInfo(item)
@@ -187,8 +265,7 @@ class TaskViewModel @Inject constructor(
         //重新加载轨迹
         viewModelScope.launch(Dispatchers.IO) {
             val list: List<NiLocation>? = TraceDataBase.getDatabase(
-                mapController.mMapView.context,
+                mapController.mMapView.context, Constant.USER_DATA_PATH
-                Constant.USER_DATA_PATH
             ).niLocationDao.findToTaskIdAll(taskBean.id.toString())
             list!!.forEach {
                 mapController.markerHandle.addNiLocationMarkerItem(it)
@@ -216,6 +293,7 @@ class TaskViewModel @Inject constructor(
     }
 
     override fun onCleared() {
+        mapController.mMapView.removeOnNIMapClickListener(TAG)
         mapController.lineHandler.removeLine()
         sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
         super.onCleared()
@@ -245,18 +323,12 @@ class TaskViewModel @Inject constructor(
      * 筛选任务列表
      */
     fun filterTaskList(key: String) {
-        if (filterTaskListJob != null)
+        if (filterTaskListJob != null) filterTaskListJob!!.cancel()
-            filterTaskListJob!!.cancel()
         filterTaskListJob = viewModelScope.launch(Dispatchers.IO) {
             delay(500)
             val realm = Realm.getDefaultInstance()
-            val list = realm.where(TaskBean::class.java)
+            val list = realm.where(TaskBean::class.java).contains("evaluationTaskName", key).or()
-                .contains("evaluationTaskName", key)
+                .contains("dataVersion", key).or().contains("cityName", key).findAll()
-                .or()
-                .contains("dataVersion", key)
-                .or()
-                .contains("cityName", key)
-                .findAll()
             liveDataTaskList.postValue(realm.copyFromRealm(list))
         }
     }
@@ -265,17 +337,14 @@ class TaskViewModel @Inject constructor(
      * 筛选link
      */
     fun filterTask(pidKey: String) {
-        if (currentSelectTaskBean == null)
+        if (currentSelectTaskBean == null) return
-            return
 
-        if (filterTaskJob != null)
+        if (filterTaskJob != null) filterTaskJob!!.cancel()
-            filterTaskJob!!.cancel()
         filterTaskJob = viewModelScope.launch(Dispatchers.Default) {
             delay(500)
             val list = mutableListOf<HadLinkDvoBean>()
             for (item in currentSelectTaskBean!!.hadLinkDvoList) {
-                if (item.linkPid.contains(pidKey))
+                if (item.linkPid.contains(pidKey)) list.add(item)
-                    list.add(item)
             }
             liveDataTaskLinks.postValue(list)
         }
@@ -295,8 +364,8 @@ class TaskViewModel @Inject constructor(
             viewModelScope.launch(Dispatchers.IO) {
                 val realm = Realm.getDefaultInstance()
                 realm.executeTransaction {
-                    val objects = it.where(TaskBean::class.java)
+                    val objects =
-                        .equalTo("id", taskBean.id).findFirst()
+                        it.where(TaskBean::class.java).equalTo("id", taskBean.id).findFirst()
                     objects?.deleteFromRealm()
                 }
                 //遍历删除对应的数据
@@ -317,10 +386,10 @@ class TaskViewModel @Inject constructor(
                 val nowTime: Long = DateTimeUtil.getNowDate().time
                 val beginNowTime: Long = nowTime - 90 * 3600 * 24 * 1000L
                 val syncUpload: Int = FileManager.Companion.FileUploadStatus.DONE
-                val objects = realm.where(TaskBean::class.java)
+                val objects =
-                    .notEqualTo("syncStatus", syncUpload).or()
+                    realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or()
-                    .between("operationTime", beginNowTime, nowTime)
+                        .between("operationTime", beginNowTime, nowTime)
-                    .equalTo("syncStatus", syncUpload).findAll()
+                        .equalTo("syncStatus", syncUpload).findAll()
                 val taskList = realm.copyFromRealm(objects)
                 for (item in taskList) {
                     FileManager.checkOMDBFileInfo(item)
@@ -342,9 +411,9 @@ class TaskViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val realm = Realm.getDefaultInstance()
             taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
-                val objects = realm.where(QsRecordBean::class.java)
+                val objects =
-                    .equalTo("linkId", hadLinkDvoBean.linkPid).and()
+                    realm.where(QsRecordBean::class.java).equalTo("linkId", hadLinkDvoBean.linkPid)
-                    .equalTo("taskId", hadLinkDvoBean.taskId).findAll()
+                        .and().equalTo("taskId", hadLinkDvoBean.taskId).findAll()
                 val map: MutableMap<TaskBean, Boolean> = HashMap<TaskBean, Boolean>()
                 if (objects.isEmpty() && hadLinkDvoBean.reason.isEmpty()) {
                     withContext(Dispatchers.Main) {
@@ -388,68 +457,67 @@ class TaskViewModel @Inject constructor(
      */
     fun setSelectLink(selected: Boolean) {
         liveDataSelectNewLink.value = selected
-        //开始捕捉
+//        //开始捕捉
-        if (selected) {
+//        if (selected) {
-            mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener {
+//            mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener {
-                override fun onMapClick(tag: String, point: GeoPoint) {
+//                override fun onMapClick(tag: String, point: GeoPoint) {
-                    if (tag == TAG) {
+//                    if (tag == TAG) {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+//                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                            viewModelScope.launch(Dispatchers.Default) {
+//                            viewModelScope.launch(Dispatchers.Default) {
-                                if (currentSelectTaskBean == null) {
+//                                if (currentSelectTaskBean == null) {
-                                    liveDataToastMessage.postValue("还没有开启任何任务")
+//                                    liveDataToastMessage.postValue("还没有开启任何任务")
-                                } else {
+//                                } else {
-                                    val links = realmOperateHelper.queryLink(
+//                                    val links = realmOperateHelper.queryLink(
-                                        point = point,
+//                                        point = point,
-                                    )
+//                                    )
-                                    if (links.isNotEmpty()) {
+//                                    if (links.isNotEmpty()) {
-                                        val l = links[0]
+//                                        val l = links[0]
-                                        for (link in currentSelectTaskBean!!.hadLinkDvoList) {
+//                                        for (link in currentSelectTaskBean!!.hadLinkDvoList) {
-                                            if (link.linkPid == l.properties["linkPid"]) {
+//                                            if (link.linkPid == l.properties["linkPid"]) {
-                                                return@launch
+//                                                return@launch
-                                            }
+//                                            }
-                                        }
+//                                        }
-                                        val hadLinkDvoBean = HadLinkDvoBean(
+//                                        val hadLinkDvoBean = HadLinkDvoBean(
-                                            taskId = currentSelectTaskBean!!.id,
+//                                            taskId = currentSelectTaskBean!!.id,
-                                            linkPid = l.properties["linkPid"]!!,
+//                                            linkPid = l.properties["linkPid"]!!,
-                                            geometry = l.geometry,
+//                                            geometry = l.geometry,
-                                            linkStatus = 2
+//                                            linkStatus = 2
-                                        )
+//                                        )
-                                        currentSelectTaskBean!!.hadLinkDvoList.add(
+//                                        currentSelectTaskBean!!.hadLinkDvoList.add(
-                                            hadLinkDvoBean
+//                                            hadLinkDvoBean
-                                        )
+//                                        )
-                                        val realm = Realm.getDefaultInstance()
+//                                        val realm = Realm.getDefaultInstance()
-                                        realm.executeTransaction { r ->
+//                                        realm.executeTransaction { r ->
-                                            r.copyToRealmOrUpdate(hadLinkDvoBean)
+//                                            r.copyToRealmOrUpdate(hadLinkDvoBean)
-                                            r.copyToRealmOrUpdate(currentSelectTaskBean!!)
+//                                            r.copyToRealmOrUpdate(currentSelectTaskBean!!)
-                                        }
+//                                        }
-                                        //根据Link数据查询对应数据上要素，对要素进行显示重置
+//                                        //根据Link数据查询对应数据上要素，对要素进行显示重置
-                                        l.properties["linkPid"]?.let {
+//                                        l.properties["linkPid"]?.let {
-                                            realmOperateHelper.queryLinkToMutableRenderEntityList(it)
+//                                            realmOperateHelper.queryLinkToMutableRenderEntityList(it)
-                                                ?.forEach { renderEntity ->
+//                                                ?.forEach { renderEntity ->
-                                                    if(renderEntity.enable!=1){
+//                                                    if (renderEntity.enable != 1) {
-                                                        renderEntity.enable = 1
+//                                                        renderEntity.enable = 1
-                                                        realm.executeTransaction { r ->
+//                                                        realm.executeTransaction { r ->
-                                                            r.copyToRealmOrUpdate(renderEntity)
+//                                                            r.copyToRealmOrUpdate(renderEntity)
-                                                        }
+//                                                        }
-                                                    }
+//                                                    }
-                                                }
+//                                                }
-                                        }
+//                                        }
-                                        liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
+//                                        liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
-                                        mapController.lineHandler.addTaskLink(hadLinkDvoBean)
+//                                        mapController.lineHandler.addTaskLink(hadLinkDvoBean)
-                                        mapController.layerManagerHandler.updateOMDBVectorTileLayer()
+//                                        mapController.layerManagerHandler.updateOMDBVectorTileLayer()
-                                        mapController.mMapView.vtmMap.updateMap(true)
+//                                        mapController.mMapView.vtmMap.updateMap(true)
-                                    }
+//                                    }
-                                }
+//                                }
-                            }
+//                            }
-                        }
+//                        }
-                    }
+//                    }
-                }
+//                }
-
+//            })
-            })
+//        } else {
-        } else {
+//            mapController.mMapView.removeOnNIMapClickListener(TAG)
-            mapController.mMapView.removeOnNIMapClickListener(TAG)
+//            mapController.lineHandler.removeLine()
-            mapController.lineHandler.removeLine()
+//        }
-        }
     }
 
     /**
@@ -480,10 +548,10 @@ class TaskViewModel @Inject constructor(
                     val realm = Realm.getDefaultInstance()
 
                     //重置数据为隐藏
-                    if(hadLinkDvoBean.linkStatus==2){
+                    if (hadLinkDvoBean.linkStatus == 2) {
                         realmOperateHelper.queryLinkToMutableRenderEntityList(hadLinkDvoBean.linkPid)
                             ?.forEach { renderEntity ->
-                                if(renderEntity.enable==1){
+                                if (renderEntity.enable == 1) {
                                     renderEntity.enable = 0
                                     realm.executeTransaction { r ->
                                         r.copyToRealmOrUpdate(renderEntity)
@@ -505,9 +573,8 @@ class TaskViewModel @Inject constructor(
                             .equalTo("linkPid", hadLinkDvoBean.linkPid).findFirst()
                             ?.deleteFromRealm()
                         val markers = realm.where(QsRecordBean::class.java)
-                            .equalTo("linkId", hadLinkDvoBean.linkPid)
+                            .equalTo("linkId", hadLinkDvoBean.linkPid).and()
-                            .and().equalTo("taskId", hadLinkDvoBean.taskId)
+                            .equalTo("taskId", hadLinkDvoBean.taskId).findAll()
-                            .findAll()
                         if (markers != null) {
                             for (marker in markers) {
                                 mapController.markerHandle.removeQsRecordMark(marker)

app/src/main/java/com/navinfo/omqs/util/SignUtil.kt

@@ -1,4 +1,4 @@
-package com.navinfo.omqs.ui.widget
+package com.navinfo.omqs.util
 
 import android.util.Log
 import com.navinfo.collect.library.data.entity.RenderEntity
@@ -23,27 +23,65 @@ class SignUtil {
         fun getSignIconText(data: RenderEntity): String {
             return when (data.code) {
                 //道路功能等级
-                DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> getLinkFunctionClassText(data)
+                DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> {
+                    "FC${data.properties["functionClass"]}"
+                }
                 //道路种别
-                DataCodeEnum.OMDB_RD_LINK_KIND.code -> getKindText(data)
+                DataCodeEnum.OMDB_RD_LINK_KIND.code -> {
+                    "${data.properties["kind"]}"
+                }
                 //道路方向
-                DataCodeEnum.OMDB_LINK_DIRECT.code -> getRoadDirectionText(data)
+                DataCodeEnum.OMDB_LINK_DIRECT.code -> {
+                    when (data.properties["direct"]) {
+                        "0" -> return "不应用"
+                        "1" -> return "双"
+                        "2" -> return "顺"
+                        "3" -> return "逆"
+                        else -> ""
+                    }
+                }
                 //常规线限速
-                DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> getLineSpeedLimitText(data)
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> {
+                    "${data.properties["maxSpeed"]}"
+                }
                 //全封闭
-                DataCodeEnum.OMDB_CON_ACCESS.code -> getConAccessText(data)
+                DataCodeEnum.OMDB_CON_ACCESS.code -> {
+                    if (data.properties["conAccess"] === "1") "全封闭" else ""
+                }
                 //匝道
-                DataCodeEnum.OMDB_RAMP.code -> getRampText(data)
+                DataCodeEnum.OMDB_RAMP.code -> {
+                    when (data.properties["formOfWay"]) {
+                        "93" -> "普通匝"
+                        "98" -> "高入匝"
+                        "99" -> "高出匝"
+                        "100" -> "高连匝"
+                        "102" -> "直入匝"
+                        "103" -> "直出匝"
+                        "104" -> "出入匝"
+                        else -> ""
+                    }
+                }
                 //车道数
-                DataCodeEnum.OMDB_LANE_NUM.code -> getLaneNumText(data)
+                DataCodeEnum.OMDB_LANE_NUM.code -> {
+                    "${data.properties["laneNum"]}|${data.properties["laneS2e"]}|${data.properties["laneE2s"]}"
+                }
                 //常规点限速,条件点限速
                 DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText(
                     data
                 )
                 //上下线分离
-                DataCodeEnum.OMDB_MULTI_DIGITIZED.code -> getMultiDigitized(data)
+                DataCodeEnum.OMDB_MULTI_DIGITIZED.code -> {
+                    if (data.properties["multiDigitized"] == "1") "上下线" else " "
+                }
                 //桥
-                DataCodeEnum.OMDB_BRIDGE.code -> getBridgeType(data)
+                DataCodeEnum.OMDB_BRIDGE.code -> {
+                    when (data.properties["bridgeType"]) {
+                        "1" -> return "固定桥"
+                        "2" -> return "可移桥"
+                        "3" -> return "跨线桥"
+                        else -> ""
+                    }
+                }
                 //隧道
                 DataCodeEnum.OMDB_TUNNEL.code -> "隧道"
                 //环岛
@@ -73,101 +111,12 @@ class SignUtil {
                 DataCodeEnum.OMDB_LINK_FORM2_12.code -> "测试路"
                 DataCodeEnum.OMDB_LINK_FORM2_13.code -> "驾考路"
                 DataCodeEnum.OMDB_VIADUCT.code -> "高架"
+                DataCodeEnum.OMDB_LINK_CONSTRUCTION.code -> "道路施工"
+                DataCodeEnum.OMDB_LANE_CONSTRUCTION.code -> "车道施工"
                 else -> ""
             }
         }
 
-        /**
-         * 获取桥的类型值
-         */
-        private fun getBridgeType(data: RenderEntity): String {
-            val bridgeType = data.properties["bridgeType"]
-            try {
-                when (bridgeType?.toInt()) {
-                    1 -> return "固定桥"
-                    2 -> return "可移桥"
-                    3 -> return "跨线桥"
-                }
-            } catch (e: Throwable) {
-
-            }
-            return ""
-        }
-
-        /**
-         * 常规线限速值
-         */
-        private fun getLineSpeedLimitText(data: RenderEntity): String {
-            return "${data.properties["maxSpeed"]}"
-        }
-
-        /**
-         * 获取全封闭值
-         */
-        private fun getConAccessText(data: RenderEntity): String {
-            val conAccess = data.properties["conAccess"]
-            try {
-                if (conAccess?.toInt() == 1)
-                    return "全封闭"
-            } catch (e: Throwable) {
-
-            }
-            return ""
-        }
-
-        /**
-         * 获取匝道值
-         */
-        private fun getRampText(data: RenderEntity): String {
-            try {
-                val ramp = data.properties["formOfWay"]
-                return when (ramp?.toInt()) {
-                    93 -> "普通匝"
-                    98 -> "高入匝"
-                    99 -> "高出匝"
-                    100 -> "高连匝"
-                    102 -> "直入匝"
-                    103 -> "直出匝"
-                    104 -> "出入匝"
-
-                    else -> {
-                        ""
-                    }
-                }
-            } catch (e: Throwable) {
-
-            }
-            return ""
-        }
-
-        /**
-         *获取道路功能等级文字
-         */
-        private fun getLinkFunctionClassText(data: RenderEntity): String {
-            return "FC${data.properties["functionClass"]}"
-        }
-
-        /**
-         * 获取道路方向文字
-         */
-        private fun getRoadDirectionText(data: RenderEntity): String {
-            val direct = data.properties["direct"]
-            when (direct?.toInt()) {
-                0 -> return "不应用"
-                1 -> return "双"
-                2 -> return "顺"
-                3 -> return "逆"
-            }
-            return ""
-        }
-
-        /**
-         * 获取车道数展示文字
-         */
-        private fun getLaneNumText(data: RenderEntity): String {
-            return "${data.properties["laneNum"]}|${data.properties["laneS2e"]}|${data.properties["laneE2s"]}"
-        }
-
         /**
          * 获取要素名称
          */
@@ -235,15 +184,193 @@ class SignUtil {
                 DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态"
 
                 DataCodeEnum.OMDB_VIADUCT.code -> "高架"
+                DataCodeEnum.OMDB_LINK_CONSTRUCTION.code -> "道路施工"
+                DataCodeEnum.OMDB_LANE_CONSTRUCTION.code -> "车道施工"
 
                 else -> ""
             }
         }
 
+
+        /**
+         * 获取更多信息
+         */
+        fun getMoreInfoAdapter(data: RenderEntity): TwoItemAdapter {
+            val adapter = TwoItemAdapter()
+            val list = mutableListOf<TwoItemAdapterItem>()
+            when (data.code) {
+                //可变线限速
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT_VAR.code ->
+                    list.addAll(getChangeLimitSpeedInfo(data))
+                //常规点限速
+                DataCodeEnum.OMDB_SPEEDLIMIT.code ->
+                    list.addAll(getSpeedLimitMoreInfoText(data))
+
+                //条件点限速
+                DataCodeEnum.OMDB_SPEEDLIMIT_COND.code ->
+                    list.addAll(getConditionLimitMoreInfoText(data))
+                //到路线
+                DataCodeEnum.OMDB_RD_LINK.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkPid", text = "${data.properties["linkPid"]}"
+                        )
+                    )
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "起点号码", text = "${data.properties["snodePid"]}"
+                        )
+                    )
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "终点号码", text = "${data.properties["enodePid"]}"
+                        )
+                    )
+                }
+                //种别
+                DataCodeEnum.OMDB_RD_LINK_KIND.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkPid", text = "${data.properties["linkPid"]}"
+                        )
+                    )
+                    try {
+                        list.add(
+                            TwoItemAdapterItem(
+                                title = "种别",
+                                text = "${getKindType(data.properties["kind"]!!.toInt())}"
+                            )
+                        )
+                    } catch (e: Throwable) {
+
+                    }
+
+                }
+                //道路方向
+                DataCodeEnum.OMDB_LINK_DIRECT.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkPid", text = "${data.properties["linkPid"]}"
+                        )
+                    )
+                    try {
+                        list.add(
+                            TwoItemAdapterItem(
+                                title = "通行方向",
+                                text = "${getRoadDirectionType(data.properties["direct"]!!.toInt())}"
+                            )
+                        )
+                    } catch (e: Throwable) {
+
+                    }
+                }
+                //普通交限
+                DataCodeEnum.OMDB_RESTRICTION.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkIn",
+                            text = "${data.properties["linkIn"]}"
+                        )
+                    )
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkOut",
+                            text = "${data.properties["linkOut"]}"
+                        )
+                    )
+                }
+                //道路功能等级
+                DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "功能等级",
+                            text = "等级${data.properties["functionClass"]}"
+                        )
+                    )
+                }
+                //常规线限速
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> {
+                    list.addAll(getLinkSpeedLimitMoreInfo(data))
+                }
+                //车道数
+                DataCodeEnum.OMDB_LANE_NUM.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "车道总数",
+                            text = "${data.properties["laneNum"]}"
+                        )
+                    )
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "顺方向车道数",
+                            text = "${data.properties["laneS2e"]}"
+                        )
+                    )
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "逆方向车道数",
+                            text = "${data.properties["laneE2s"]}"
+                        )
+                    )
+                    var str = when (data.properties["laneClass"]) {
+                        "0" -> "未赋值"
+                        "1" -> "一条车道"
+                        "2" -> "两或三条"
+                        "3" -> "四条及以上"
+                        "-99" -> "参考PA"
+                        else -> ""
+                    }
+
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "车道数等级",
+                            text = str
+                        )
+                    )
+                }
+                //路口
+                DataCodeEnum.OMDB_INTERSECTION.code -> {
+                    val type = when (data.properties["type"]) {
+                        "0" -> "简单路口"
+                        "1" -> "复合路口"
+                        else -> ""
+                    }
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "路口类型",
+                            text = type
+                        )
+                    )
+                }
+                //道路施工
+                DataCodeEnum.OMDB_LINK_CONSTRUCTION.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkPid", text = "${data.properties["linkPid"]}"
+                        )
+                    )
+                    val validPeriod = data.properties["validPeriod"]
+                    if(validPeriod != null){
+
+                    }
+                }
+                //车道施工
+                DataCodeEnum.OMDB_LANE_CONSTRUCTION.code -> {
+                    list.add(
+                        TwoItemAdapterItem(
+                            title = "linkPid", text = "${data.properties["linkPid"]}"
+                        )
+                    )
+                }
+            }
+            adapter.data = list
+            return adapter
+        }
+
+
         /**
          * 获取路口详细信息
          */
-
         fun getIntersectionInfo(renderEntity: RenderEntity): List<LaneBoundaryItem> {
             val list = mutableListOf<LaneBoundaryItem>()
             list.add(
@@ -526,12 +653,6 @@ class SignUtil {
             return "0"
         }
 
-        /**
-         * 获取种别名称
-         */
-        private fun getKindText(data: RenderEntity): String {
-            return data.properties["kind"].toString()
-        }
 
         /**
          * 常规点限速更多信息
@@ -572,37 +693,6 @@ class SignUtil {
             return list
         }
 
-        /**
-         * 限速图标
-         */
-        private fun getSpeedLimitIcon(data: RenderEntity): Int {
-            try {
-                //限速标志 0 限速开始 1 限速解除
-                return when (data.properties["speedFlag"]) {
-                    "1" -> return R.drawable.icon_speed_limit_off
-                    else -> return R.drawable.icon_speed_limit
-                }
-            } catch (e: Exception) {
-                Log.e("jingo", "获取限速面板ICON出错2 $e")
-            }
-            return 0
-        }
-
-        /**
-         * 条件限速图标
-         */
-        private fun getConditionalSpeedLimitIcon(data: RenderEntity): Int {
-            try {
-                //限速标志 0 限速开始 1 限速解除
-                return when (data.properties["speedFlag"]) {
-                    "1" -> return R.drawable.icon_conditional_speed_limit_off
-                    else -> return R.drawable.icon_conditional_speed_limit
-                }
-            } catch (e: Exception) {
-                Log.e("jingo", "获取限速面板ICON出错2 $e")
-            }
-            return 0
-        }
 
         /**
          * 获取看板图标
@@ -617,9 +707,21 @@ class SignUtil {
 //                //车道数
 //                2041 -> getLaneNumIcon(data)
                 //普通点限速
-                DataCodeEnum.OMDB_SPEEDLIMIT.code -> getSpeedLimitIcon(data)
+                DataCodeEnum.OMDB_SPEEDLIMIT.code -> {
+                    //限速标志 0 限速开始 1 限速解除
+                    when (data.properties["speedFlag"]) {
+                        "1" -> return R.drawable.icon_speed_limit_off
+                        else -> return R.drawable.icon_speed_limit
+                    }
+                }
                 //条件点限速
-                DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getConditionalSpeedLimitIcon(data)
+                DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> {
+                    //限速标志 0 限速开始 1 限速解除
+                    when (data.properties["speedFlag"]) {
+                        "1" -> return R.drawable.icon_conditional_speed_limit_off
+                        else -> return R.drawable.icon_conditional_speed_limit
+                    }
+                }
                 //可变点限速
                 DataCodeEnum.OMDB_SPEEDLIMIT_VAR.code -> R.drawable.icon_change_limit
                 //电子眼
@@ -631,7 +733,6 @@ class SignUtil {
 
         }
 
-
         /**
          * 获取种别图标
          */
@@ -832,11 +933,43 @@ class SignUtil {
          */
         fun getElectronicEyeMoreInfo(renderEntity: RenderEntity): List<TwoItemAdapterItem> {
             val list = mutableListOf<TwoItemAdapterItem>()
+
+
+            val dir = when (renderEntity.properties["direct"]) {
+                "2" -> "顺方向"
+                "3" -> "逆方向"
+                else -> ""
+            }
+            if (dir != "") {
+                list.add(
+                    TwoItemAdapterItem(
+                        title = "作用方向",
+                        text = dir
+                    )
+                )
+            }
+
+            val kindUp = when (renderEntity.properties["kindUp"]) {
+                "0" -> "未调查"
+                "1" -> "限速电子眼"
+                "4" -> "区间测速电子眼"
+                "5" -> "交通信号灯电子眼"
+                "6" -> "专用车道电子眼"
+                "7" -> "违章电子眼"
+                "11" -> "路况监控电子眼"
+                "19" -> "交通标线电子眼"
+                "20" -> "专用功能电子眼"
+                else -> ""
+            }
+
+            list.add(TwoItemAdapterItem(title = "电子眼类型大分类", text = kindUp))
+
             val kindCode = renderEntity.properties["kind"]!!.toInt()
-            val kind = TwoItemAdapterItem(
+            list.add(
-                title = "电子眼类型", text = getElectronicEyeKindType(kindCode)
+                TwoItemAdapterItem(
+                    title = "电子眼类型", text = getElectronicEyeKindType(kindCode)
+                )
             )
-            list.add(kind)
             when (kindCode) {
                 1, 2, 3, 4, 5, 6, 20, 21 -> {
                     list.add(
@@ -870,6 +1003,11 @@ class SignUtil {
                     )
                 )
             }
+            list.add(
+                TwoItemAdapterItem(
+                    title = "照射角度", text = "${renderEntity.properties["angle"]}"
+                )
+            )
             return list
         }
 
@@ -1031,237 +1169,95 @@ class SignUtil {
             }
         }
 
-        /**
+        //常规线限速详细信息
-         * 获取更多信息
+        private fun getLinkSpeedLimitMoreInfo(data: RenderEntity): List<TwoItemAdapterItem> {
-         */
-        fun getMoreInfoAdapter(data: RenderEntity): TwoItemAdapter {
-            val adapter = TwoItemAdapter()
             val list = mutableListOf<TwoItemAdapterItem>()
-            when (data.code) {
+            val dir = when (data.properties["direction"]) {
-                DataCodeEnum.OMDB_LINK_SPEEDLIMIT_VAR.code ->
+                "2" -> "顺方向"
-                    list.addAll(getChangeLimitSpeedInfo(data))
+                "3" -> "逆方向"
-                //常规点限速
+                else -> ""
-                DataCodeEnum.OMDB_SPEEDLIMIT.code ->
-                    list.addAll(getSpeedLimitMoreInfoText(data))
-
-                //条件点限速
-                DataCodeEnum.OMDB_SPEEDLIMIT_COND.code ->
-                    list.addAll(getConditionLimitMoreInfoText(data))
-                //到路线
-                DataCodeEnum.OMDB_RD_LINK.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "linkPid", text = "${data.properties["linkPid"]}"
-                        )
-                    )
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "起点号码", text = "${data.properties["snodePid"]}"
-                        )
-                    )
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "终点号码", text = "${data.properties["enodePid"]}"
-                        )
-                    )
-                }
-                //种别
-                DataCodeEnum.OMDB_RD_LINK_KIND.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "linkPid", text = "${data.properties["linkPid"]}"
-                        )
-                    )
-                    try {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "种别",
-                                text = "${getKindType(data.properties["kind"]!!.toInt())}"
-                            )
-                        )
-                    } catch (e: Throwable) {
-
-                    }
-
-                }
-                //道路方向
-                DataCodeEnum.OMDB_LINK_DIRECT.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "linkPid", text = "${data.properties["linkPid"]}"
-                        )
-                    )
-                    try {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "通行方向",
-                                text = "${getRoadDirectionType(data.properties["direct"]!!.toInt())}"
-                            )
-                        )
-                    } catch (e: Throwable) {
-
-                    }
-                }
-                DataCodeEnum.OMDB_RESTRICTION.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "linkIn",
-                            text = "${data.properties["linkIn"]}"
-                        )
-                    )
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "linkOut",
-                            text = "${data.properties["linkOut"]}"
-                        )
-                    )
-                }
-                DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "功能等级",
-                            text = "等级${data.properties["functionClass"]}"
-                        )
-                    )
-                }
-                DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> {
-                    val direction = data.properties["direction"]
-                    var dir = ""
-                    if (direction == "2") {
-                        dir = "顺方向"
-                    } else if (direction == "3") {
-                        dir = "逆方向"
-                    }
-                    if (dir != "") {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "限速方向",
-                                text = dir
-                            )
-                        )
-                    }
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "最高限速值(km/h)",
-                            text = "${data.properties["maxSpeed"]}"
-                        )
-                    )
-                    var maxStr = when (data.properties["maxSpeedSource"]) {
-                        "0" -> {
-                            "不应用"
-                        }
-                        "1" -> {
-                            "现场"
-                        }
-                        "2" -> {
-                            "理论"
-                        }
-                        else -> ""
-                    }
-                    if (maxStr != "") {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "最高限速来源",
-                                text = maxStr
-                            )
-                        )
-                    }
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "最低限速值(km/h)",
-                            text = "${data.properties["minSpeed"]}"
-                        )
-                    )
-                    var minStr = when (data.properties["minSpeedSource"]) {
-                        "0" -> {
-                            "不应用"
-                        }
-                        "1" -> {
-                            "现场"
-                        }
-                        "2" -> {
-                            "理论"
-                        }
-                        else -> ""
-                    }
-                    if (minStr != "") {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "最低限速来源",
-                                text = minStr
-                            )
-                        )
-                    }
-                    var isLaneDependent = when (data.properties["isLaneDependent"]) {
-                        "0" -> {
-                            "否"
-                        }
-                        "1" -> {
-                            "是"
-                        }
-                        else -> ""
-                    }
-                    if (isLaneDependent != "") {
-                        list.add(
-                            TwoItemAdapterItem(
-                                title = "是否车道依赖",
-                                text = isLaneDependent
-                            )
-                        )
-                    }
-                }
-                DataCodeEnum.OMDB_LANE_NUM.code -> {
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "车道总数",
-                            text = "${data.properties["laneNum"]}"
-                        )
-                    )
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "顺方向车道数",
-                            text = "${data.properties["laneS2e"]}"
-                        )
-                    )
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "逆方向车道数",
-                            text = "${data.properties["laneE2s"]}"
-                        )
-                    )
-                    var str = when (data.properties["laneClass"]) {
-                        "0" -> "未赋值"
-                        "1" -> "一条车道"
-                        "2" -> "两或三条"
-                        "3" -> "四条及以上"
-                        "-99" -> "参考PA"
-                        else -> ""
-                    }
-
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "车道数等级",
-                            text = str
-                        )
-                    )
-                }
-                DataCodeEnum.OMDB_INTERSECTION.code -> {
-                    val type = when (data.properties["type"]) {
-                        "0" -> "简单路口"
-                        "1" -> "复合路口"
-                        else -> ""
-                    }
-                    list.add(
-                        TwoItemAdapterItem(
-                            title = "路口类型",
-                            text = type
-                        )
-                    )
-                }
             }
-            adapter.data = list
+            if (dir != "") {
-            return adapter
+                list.add(
+                    TwoItemAdapterItem(
+                        title = "限速方向",
+                        text = dir
+                    )
+                )
+            }
+            list.add(
+                TwoItemAdapterItem(
+                    title = "最高限速值(km/h)",
+                    text = "${data.properties["maxSpeed"]}"
+                )
+            )
+            var maxStr = when (data.properties["maxSpeedSource"]) {
+                "0" -> {
+                    "不应用"
+                }
+                "1" -> {
+                    "现场"
+                }
+                "2" -> {
+                    "理论"
+                }
+                else -> ""
+            }
+            if (maxStr != "") {
+                list.add(
+                    TwoItemAdapterItem(
+                        title = "最高限速来源",
+                        text = maxStr
+                    )
+                )
+            }
+            list.add(
+                TwoItemAdapterItem(
+                    title = "最低限速值(km/h)",
+                    text = "${data.properties["minSpeed"]}"
+                )
+            )
+            var minStr = when (data.properties["minSpeedSource"]) {
+                "0" -> {
+                    "不应用"
+                }
+                "1" -> {
+                    "现场"
+                }
+                "2" -> {
+                    "理论"
+                }
+                else -> ""
+            }
+            if (minStr != "") {
+                list.add(
+                    TwoItemAdapterItem(
+                        title = "最低限速来源",
+                        text = minStr
+                    )
+                )
+            }
+            var isLaneDependent = when (data.properties["isLaneDependent"]) {
+                "0" -> {
+                    "否"
+                }
+                "1" -> {
+                    "是"
+                }
+                else -> ""
+            }
+            if (isLaneDependent != "") {
+                list.add(
+                    TwoItemAdapterItem(
+                        title = "是否车道依赖",
+                        text = isLaneDependent
+                    )
+                )
+            }
+            return list
         }
+
+
     }
 
 }

app/src/main/java/com/navinfo/omqs/util/SpeakMode.kt

@@ -55,20 +55,22 @@ class SpeakMode(private val context: Context) : TextToSpeech.OnInitListener {
     fun setData(json: String?) {}
     override fun onInit(status: Int) {
         this.status = status
-        val result = mTextToSpeech.setLanguage(Locale.CHINESE)
+        if(mTextToSpeech != null) {
-        if (result == TextToSpeech.LANG_MISSING_DATA
+            val result = mTextToSpeech.setLanguage(Locale.CHINESE)
-            || result == TextToSpeech.LANG_NOT_SUPPORTED
+            if (result == TextToSpeech.LANG_MISSING_DATA
-        ) {
+                || result == TextToSpeech.LANG_NOT_SUPPORTED
-            if (context != null) {
+            ) {
-                val firstDialog = FirstDialog(context)
+                if (context != null) {
-                firstDialog.setTitle("提示")
+                    val firstDialog = FirstDialog(context)
-                firstDialog.setMessage("设备不支持语音播报，请先下载语音助手。")
+                    firstDialog.setTitle("提示")
-                firstDialog.setConfirmListener { dialog, _ -> dialog.dismiss() }
+                    firstDialog.setMessage("设备不支持语音播报，请先下载语音助手。")
-                firstDialog.setNegativeView(View.GONE)
+                    firstDialog.setConfirmListener { dialog, _ -> dialog.dismiss() }
-                firstDialog.show()
+                    firstDialog.setNegativeView(View.GONE)
+                    firstDialog.show()
+                }
             }
+            Log.i("TextToSpeechDemo", status.toString())
         }
-        Log.i("TextToSpeechDemo", status.toString())
     }
 
     //读语音处理

app/src/main/java/com/navinfo/omqs/util/TimePeriod.kt

@@ -0,0 +1,6 @@
+package com.navinfo.omqs.util
+
+data class TimePeriod(
+    val child: TimePeriod? = null
+
+)

app/src/main/res/color/selector_black_blue_color.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true"  android:color="@color/default_blue_text_color" />
-    <item android:color="@color/black" />
+    <item android:color="#15141F" />
 </selector>

app/src/main/res/color/selector_gray_blue_color.xml

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

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/red" />
+
+</shape>

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

@@ -141,7 +141,7 @@
         <ImageButton
             android:id="@+id/main_activity_calc_distance"
             style="@style/top_right_drawer_btns_style"
-            android:onClick="@{()->mainActivity.onClickCalcDistance()}"
+            android:onClick="@{()->mainActivity.measuringToolOn()}"
             android:src="@drawable/icon_calc_disance" />
 
         <ImageButton

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
+    android:background="@drawable/selector_adapter_item_select_bg"
     android:padding="5dp">
 
     <TextView
@@ -10,6 +11,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="name"
-        android:textColor="@color/black"
+        android:textColor="@color/selector_black_blue_color"
         android:textSize="16sp" />
 </FrameLayout>

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

@@ -27,7 +27,7 @@
         android:layout_marginRight="30dp"
         android:layout_toRightOf="@id/task_head"
         android:text="linkPID"
-        android:textColor="#15141F"
+        android:textColor="@color/selector_black_blue_color"
         android:textSize="14sp" />
 
     <TextView
@@ -39,7 +39,7 @@
         android:layout_alignLeft="@id/task_link_pid"
         android:layout_marginTop="5dp"
         android:text="mesh"
-        android:textColor="@color/gray_121"
+        android:textColor="@color/selector_gray_blue_color"
         android:textSize="13sp" />
 
     <ImageView
@@ -49,4 +49,15 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:src="@drawable/selector_task_link_edit_icon" />
+
+    <ImageView
+        android:id="@+id/task_badge"
+        android:layout_width="8dp"
+        android:layout_height="8dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="4dp"
+        android:visibility="gone"
+        android:layout_alignTop="@id/task_edit"
+        android:layout_alignRight="@id/task_edit"
+        android:background="@drawable/shape_oval_red_bg" />
 </RelativeLayout>

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

@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_toRightOf="@id/task_list_head"
             android:text="任务名称"
-            android:textColor="#15141F"
+            android:textColor="@color/selector_black_blue_color"
             android:textSize="14sp" />
 
 
@@ -47,7 +47,7 @@
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
             android:text="版本号"
-            android:textColor="@color/gray_121"
+            android:textColor="@color/selector_gray_blue_color"
             android:textSize="13sp" />
 
         <TextView
@@ -58,7 +58,7 @@
             android:layout_below="@id/task_data_version"
             android:layout_alignLeft="@id/task_name"
             android:text="省市名称"
-            android:textColor="@color/gray_121"
+            android:textColor="@color/selector_gray_blue_color"
             android:textSize="13sp" />
 
         <com.navinfo.omqs.ui.widget.TextProgressButtonBar

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

@@ -44,29 +44,27 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
-        <ImageButton
-            android:id="@+id/evaluation_bar_cancel"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginRight="10dp"
-            android:background="@color/transparent"
-            android:src="@drawable/icon_fragment_close"
-            android:visibility="gone"
-            app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save"
-            app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
-
-
         <ImageButton
             android:id="@+id/evaluation_bar_delete"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_centerInParent="true"
             android:layout_marginRight="5dp"
             android:background="@color/transparent"
             android:src="@drawable/icon_delete"
-            app:layout_constraintRight_toLeftOf="@id/evaluation_bar_cancel"
+            app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save"
-            app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" />
+            app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
+            app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save" />
+
+
+        <ImageButton
+            android:id="@+id/evaluation_bar_measuring"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@color/transparent"
+            android:src="@drawable/measuring_tool_distance"
+            app:layout_constraintRight_toLeftOf="@id/evaluation_bar_delete"
+            app:layout_constraintTop_toTopOf="@id/evaluation_bar_save"
+            app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save"/>
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="0dp"
@@ -86,6 +84,23 @@
                 android:layout_height="match_parent"
                 android:layout_marginBottom="7dp"
                 android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="7dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/evaluation_fragment_title_text_style"
+                        android:text="ID" />
+
+                    <TextView
+                        android:id="@+id/evaluation_id"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"

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

@@ -10,10 +10,12 @@
 
     <TextView
         android:id="@+id/sign_info_title"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
+        android:layout_toLeftOf="@id/sign_info_cancel"
         android:drawablePadding="4dp"
+        android:gravity="center_vertical"
+        android:layout_marginRight="5dp"
         android:text="电子眼"
         android:textColor="@color/orange" />
 

collect-library/src/main/assets/editormarker.xml

@@ -1551,399 +1551,399 @@
             <m k="currentType" v="0">
                 <m k="currentDirect" v="1">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_1_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_1_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_4_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_4_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_4_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_4_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_5_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_5_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/normal/1301_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/normal/1301_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
             </m>
             <m k="currentType" v="1">
                 <m k="currentDirect" v="0">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_0.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_0.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_1_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_1_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_4_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_4_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_4_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_4_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_5_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_5_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/extend/1301_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/extend/1301_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
             </m>
             <m k="currentType" v="2">
                 <m k="currentDirect" v="0">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_0.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_0.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="1_7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_1_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_1_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="2_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_2_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_2_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_3.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_3.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_3_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_3_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_3_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_3_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="3_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_3_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_3_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_4.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_4.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_4_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_4_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="4_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_4_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_4_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_5.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_5.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="5_6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_5_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_5_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="6">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_6.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_6.svg" symbol-height="24" degree="90"></symbol>
                 </m>
                 <m k="currentDirect" v="7">
                     <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                        src="assets:omdb/4601/bus/1301_7.svg" symbol-height="24" symbol-width="24"></symbol>
+                        src="assets:omdb/4601/bus/1301_7.svg" symbol-height="24" degree="90"></symbol>
                 </m>
             </m>
         </m>
@@ -2312,11 +2312,11 @@
             <m k="eleceyeId">
                 <caption dy="-30" fill="#0000FF" k="name" priority="0" size="12"
                     stroke="#ffffff" stroke-width="1.0"></caption>
-                <symbol repeat="false" src="assets:omdb/4010/icon_electroniceye_4010.svg" symbol-height="24" symbol-width="24"></symbol>
+                <symbol repeat="false" src="assets:omdb/4010/icon_electroniceye_4010.svg" symbol-height="44" symbol-width="44"></symbol>
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
-                    src="assets:omdb/4010/right.svg" symbol-height="24" symbol-width="24"></symbol>
+                    src="assets:omdb/4010/right.svg" symbol-height="44" symbol-width="44"></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line use="s2e" />
@@ -2326,7 +2326,7 @@
         <!-- 导流区 -->
         <m v="OMDB_FILL_AREA">
             <area use="obj-area" repeat="true" src="assets:omdb/tex_fill_area_3012.png" longEdge="t"></area>
-            <text use="area-name"></text>
+<!--            <text use="area-name"></text>-->
 <!--            <area use="obj-area" repeat="false"></area>-->
 <!--            <symbol src="assets:omdb/icon_fill_area_3012.svg"></symbol>-->
         </m>
@@ -2352,7 +2352,7 @@
         <m v="OMDB_WARNINGSIGN">
             <m k="type" v="dynamicSrc">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
-                    src="@src" symbol-height="24" symbol-width="24" degree="90"></symbol>
+                    src="@src" symbol-height="36" symbol-width="36" degree="90"></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line use="s2e" />

collect-library/src/main/assets/omdb/4601/bus/1301_0.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="10px" viewBox="0 0 10 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="10px" height="30px" viewBox="0 0 10 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_o</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 5, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-949.000000, -713.000000)" fill-rule="nonzero">
-            <g id="1301_1_o-2">
+            <g id="1301_1_o-2" transform="translate(949.000000, 713.000000)">
                 <g id="1301_1_o">
                     <rect id="矩形" fill="#FFB400" x="0.604" y="0.667" width="8.792" height="28.667"></rect>
                     <rect id="矩形" fill="#FFFFFF" x="2.604" y="2.833" width="4.899" height="24.395"></rect>

collect-library/src/main/assets/omdb/4601/bus/1301_1.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="12px" viewBox="0 0 12 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="12px" height="31px" viewBox="0 0 12 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_a</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 6, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-"  fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-865.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12" >
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
-                <g id="1301_1_a">
+                <g id="1301_1_a" transform="translate(602.000000, 67.207000)">
                     <polygon id="path22940_2_" points="7.341 29.432 7.311 4.846 11.71 8.412 11.789 5.139 6.066 0.568 0.21 5.132 0.298 8.617 4.97 4.645 4.985 29.43"></polygon>
                 </g>
             </g>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_g</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-390.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12">
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
-                <g id="1301_1_g">
+                <g id="1301_1_g" transform="translate(127.000000, 67.207000)">
                     <polygon id="path2214_7_" points="13.399 29.168 13.414 4.004 17.091 7.131 17.16 4.387 12.55 0.793 8.046 4.392 8.109 6.969 11.572 4.114 11.56 29.208"></polygon>
                     <path d="M11.776,17.839 C11.797,17.422 11.543,15.976 10.416,15.185 C9.29,14.393 7.37,14.529 7.37,14.529 L4.05,14.544 L7.178,18.221 L4.437,18.291 L0.84,13.68 L4.441,9.176 L7.019,9.238 L4.164,12.701 L7.17,12.689 C7.17,12.689 9.013,12.637 10.061,13.123 C11.106,13.608 12.461,14.723 12.606,15.132 C12.885,15.948 11.751,18.237 11.776,17.839 Z" id="path2249_3_"></path>
                 </g>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_h</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-414.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12">
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
-                <g id="1301_1_h">
+                <g id="1301_1_h" transform="translate(151.000000, 1.207000)">
                     <path d="M12.653,16.041 C12.51,15.631 11.395,14.759 10.348,14.273 C9.302,13.787 7.094,13.84 7.094,13.84 L4.084,13.852 L6.942,10.387 L4.362,10.325 L0.761,14.831 L4.357,19.444 L7.103,19.375 L3.974,15.696 L7.294,15.68 C7.294,15.68 9.158,15.43 10.285,16.222 C11.412,17.014 12.669,18.363 12.676,18.749 C12.689,19.521 12.94,16.859 12.653,16.041 Z" id="path2214"></path>
                     <polygon id="path2263" points="14.058 29.084 14.032 4.659 17.879 7.779 17.948 4.915 12.946 0.916 7.824 4.91 7.902 7.959 11.986 4.484 12 29.084"></polygon>
                     <path d="M13.348,16.041 C13.492,15.631 14.606,14.759 15.653,14.273 C16.699,13.787 18.906,13.84 18.906,13.84 L21.915,13.852 L19.058,10.387 L21.637,10.325 L25.239,14.831 L21.643,19.444 L18.897,19.375 L22.026,15.696 L18.705,15.68 C18.705,15.68 16.843,15.43 15.714,16.222 C14.587,17.014 13.33,18.363 13.324,18.749 C13.312,19.521 13.061,16.859 13.348,16.041 Z" id="path2198"></path>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="37px" height="26px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="37px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 19)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-898.000000, -709.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="23">
+            <g id="23" transform="translate(898.000000, 709.000000)">
                 <g id="1">
-                    <g id="1301_1_m复制-2">
+                    <g id="1301_1_m复制-2" transform="translate(0.000000, 7.327028)">
                         <polygon id="path2200_4_" points="11.82 29.099 11.848 7.259 14.202 7.119 14.184 29.106"></polygon>
                         <path d="M13.017,7.058 C12.87,6.634 11.463,5.48 10.381,4.978 C9.299,4.476 7.392,4.53 7.392,4.53 L4.283,4.542 L7.238,0.958 L4.57,0.894 L0.842,5.556 L4.563,10.329 L7.405,10.257 L4.168,6.451 L7.604,6.434 C7.604,6.434 9.282,6.428 10.448,7.247 C11.614,8.067 11.908,9.713 11.915,10.112 C11.923,10.91 13.313,7.904 13.017,7.058 Z" id="path2214_5_"></path>
                         <path d="M12.984,7.058 C13.13,6.634 14.537,5.48 15.619,4.978 C16.701,4.476 18.608,4.53 18.608,4.53 L21.718,4.542 L18.762,0.958 L21.43,0.894 L25.158,5.556 L21.436,10.329 L18.595,10.258 L21.832,6.452 L18.395,6.434 C18.395,6.434 16.719,6.428 15.553,7.247 C14.387,8.067 14.092,9.713 14.086,10.112 C14.076,10.91 12.686,7.904 12.984,7.058 Z" id="path2249_1_"></path>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_j</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 16)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-432.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12">
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
-                <g id="1301_1_j">
+                <g id="1301_1_j" transform="translate(169.000000, 67.207000)">
                     <path d="M12.059,12.145 C11.915,11.735 10.799,10.862 9.752,10.375 C8.705,9.889 6.495,9.942 6.495,9.942 L3.484,9.953 L6.343,6.485 L3.762,6.422 L0.158,10.932 L3.758,15.55 L6.506,15.48 L3.374,11.797 L6.698,11.782 C6.698,11.782 8.563,11.532 9.691,12.324 C10.819,13.117 12.077,14.467 12.083,14.854 C12.095,15.629 12.346,12.965 12.059,12.145 Z" id="path2214_1_"></path>
                     <path d="M13.74,20.555 C13.472,15.211 3.833,15.203 3.932,20.672 L3.958,26.174 L0.455,23.086 L0.389,25.144 L5.016,29.037 L9.436,25.17 L9.442,22.912 L5.951,26.08 L5.968,21.073 C6.051,17.487 11.694,17.618 11.879,20.979 L13.74,20.555 Z" id="path22940_1_"></path>
                     <polygon id="path2263_1_" points="13.95 29.096 13.924 4.649 17.775 7.773 17.843 4.906 12.836 0.904 7.71 4.902 7.788 7.953 11.876 4.475 11.89 29.096"></polygon>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>编组 13</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-850.000000, -645.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12">
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
-                <g id="编组-13">
+                <g id="编组-13" transform="translate(587.197000, 0.042000)">
                     <path d="M12.223,23.004 C12.245,22.587 11.99,21.141 10.863,20.35 C9.737,19.558 7.817,19.694 7.817,19.694 L4.498,19.709 L7.626,23.386 L4.884,23.456 L1.288,18.845 L4.888,14.341 L7.466,14.403 L4.611,17.866 L7.618,17.854 C7.618,17.854 9.46,17.802 10.508,18.288 C11.553,18.773 12.908,19.888 13.053,20.297 C13.332,21.112 12.199,23.401 12.223,23.004 Z" id="path2249_5_"></path>
                     <polygon id="path2214_12_" points="13.725 14.498 3.183 7.982 7.779 6.506 5.483 5 0 7.023 0.684 12.747 2.906 14.052 2.306 9.604 13.129 16.285"></polygon>
                     <polygon id="path2214_13_" points="13.845 29.333 13.86 4.169 17.538 7.296 17.606 4.552 12.997 0.958 8.493 4.556 8.556 7.133 12.019 4.278 12.007 29.372"></polygon>

collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_3</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-313.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_3" transform="translate(50.000000, 1.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_f</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 14, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-347.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_f" transform="translate(84.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="24px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="31px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_i</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-613.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_i" transform="translate(350.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_4</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-363.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_4" transform="translate(100.000000, 1.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_5</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-263.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_5" transform="translate(0.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_e</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-305.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_e" transform="translate(42.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_t</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-474.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_t" transform="translate(211.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="17px" viewBox="0 0 17 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="17px" height="31px" viewBox="0 0 17 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>提示前方可自行或右后方掉头</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-898.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="编组-7" transform="translate(635.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="24px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="31px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_v</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-709.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_v" transform="translate(446.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_w</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-788.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_w" transform="translate(525.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="18px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="31px" viewBox="0 0 18 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_x</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-516.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_x" transform="translate(253.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="24px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="31px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_y</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-757.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_y" transform="translate(494.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_z</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-826.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_z" transform="translate(563.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_2.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_b</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-559.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_b" transform="translate(296.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_k</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-464.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_k" transform="translate(201.000000, 1.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_m</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-514.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_m" transform="translate(251.000000, 1.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_l</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-635.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_l" transform="translate(372.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_u</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-750.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_u" transform="translate(487.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_c</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-597.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_c" transform="translate(334.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="24px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="31px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_n</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-661.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_n" transform="translate(398.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="29px" height="20px" viewBox="0 0 20 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="20px" height="29px" viewBox="0 0 20 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_d</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 10, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-806.000000, -648.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_d" transform="translate(543.000000, 3.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="24px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="31px" viewBox="0 0 24 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_0</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-564.000000, -647.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_0" transform="translate(301.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_r</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-673.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_r" transform="translate(410.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="26px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="31px" viewBox="0 0 26 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_1</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#FFB400" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-263.000000, -646.000000)" fill="#FFB400" fill-rule="nonzero">
-            <g id="编组-12">
+            <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_1" transform="translate(0.000000, 1.207000)">
                     <polygon id="path2214_34_" points="13.608 9.595 4.074 3.778 8.671 2.302 6.374 0.796 0.891 2.819 1.575 8.543 3.798 9.848 3.197 5.4 13.298 11.626"></polygon>
                     <polygon id="path2200_23_" points="11.777 29.413 11.743 9.658 13.792 10.496 13.823 29.397"></polygon>

collect-library/src/main/assets/omdb/4601/bus/1301_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="31px" height="14px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="31px" viewBox="0 0 14 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_1_s</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-712.000000, -712.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="1301_1_s" transform="translate(449.000000, 67.207000)">

collect-library/src/main/assets/omdb/4601/bus/1301_7.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="29px" height="18px" viewBox="0 0 18 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="29px" viewBox="0 0 18 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>提示右后方掉头</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-941.000000, -649.000000)" fill="#FFB400" fill-rule="nonzero">
             <g id="编组-12" transform="translate(263.000000, 645.000000)">
                 <g id="编组-7" transform="translate(635.000000, 2.207000)">

collect-library/src/main/assets/omdb/4601/extend/1301_0.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="10px" viewBox="0 0 10 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="10px" height="30px" viewBox="0 0 10 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_o</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 5, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-959.000000, -885.000000)" fill-rule="nonzero">
-            <g id="1301_2_o-2">
+            <g id="1301_2_o-2" transform="translate(959.000000, 885.000000)">
                 <g id="1301_2_o">
                     <rect id="矩形" fill="#00C800" x="0.604" y="0.667" width="8.792" height="28.667"></rect>
                     <rect id="矩形" fill="#FFFFFF" x="2.604" y="2.833" width="4.899" height="24.395"></rect>

collect-library/src/main/assets/omdb/4601/extend/1301_1.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="12px" viewBox="0 0 12 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="12px" height="30px" viewBox="0 0 12 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_a</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 6, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#00C800" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-746.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
-            <g id="编组-14">
+            <g id="编组-14" transform="translate(263.000000, 820.000000)">
-                <g id="1301_2_a">
+                <g id="1301_2_a" transform="translate(483.000000, 3.000000)">
                     <polygon id="path22940_2_" points="7.341 29.432 7.311 4.846 11.71 8.412 11.789 5.139 6.066 0.568 0.21 5.132 0.298 8.617 4.97 4.645 4.985 29.43"></polygon>
                 </g>
             </g>

collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_g</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#00C800" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-390.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
-            <g id="编组-14">
+            <g id="编组-14" transform="translate(263.000000, 820.000000)">
-                <g id="1301_2_g">
+                <g id="1301_2_g" transform="translate(127.000000, 3.000000)">
                     <polygon id="path2214_7_" points="13.399 29.168 13.414 4.004 17.091 7.131 17.16 4.387 12.55 0.793 8.046 4.392 8.109 6.969 11.572 4.114 11.56 29.208"></polygon>
                     <path d="M11.776,17.839 C11.797,17.422 11.543,15.976 10.416,15.185 C9.29,14.393 7.37,14.529 7.37,14.529 L4.05,14.544 L7.178,18.221 L4.437,18.291 L0.84,13.68 L4.441,9.176 L7.019,9.238 L4.164,12.701 L7.17,12.689 C7.17,12.689 9.013,12.637 10.061,13.123 C11.106,13.608 12.461,14.723 12.606,15.132 C12.885,15.948 11.751,18.237 11.776,17.839 Z" id="path2249_3_"></path>
                 </g>

collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_h</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-456.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_h" transform="translate(193.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="37px" height="26px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="37px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>2</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 18)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-885.000000, -881.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="24" transform="translate(885.000000, 881.000000)">
                 <g id="2">

collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_j</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-432.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_j" transform="translate(169.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_2</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-844.000000, -889.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_2" transform="translate(581.000000, 69.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_3</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-355.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_3" transform="translate(92.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_f</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-347.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_f" transform="translate(84.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_i</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-655.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_i" transform="translate(392.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_4</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-406.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_4" transform="translate(143.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_5</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-263.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_5" transform="translate(0.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_e</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-305.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_e" transform="translate(42.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_t</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-474.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_t" transform="translate(211.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_x</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-263.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_x" transform="translate(0.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="17px" viewBox="0 0 17 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="17px" height="30px" viewBox="0 0 17 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>提示前方可自行或右后方掉头复制</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-907.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="编组-6" transform="translate(644.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_b</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-516.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_b" transform="translate(253.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_k</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-506.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_k" transform="translate(243.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_m</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-556.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_m" transform="translate(293.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_l</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-593.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_l" transform="translate(330.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_u</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-708.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_u" transform="translate(445.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_y</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-820.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_y" transform="translate(557.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_3.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_c</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-555.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_c" transform="translate(292.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_n</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-703.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_n" transform="translate(440.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_v</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-751.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_v" transform="translate(488.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_z</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-782.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_z" transform="translate(519.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28px" height="20px" viewBox="0 0 20 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="20px" height="28px" viewBox="0 0 20 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_d</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 10, 14)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-800.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_d" transform="translate(537.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_w</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-869.000000, -823.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_w" transform="translate(606.000000, 3.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_0</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-607.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_0" transform="translate(344.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_r</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 7, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-631.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_r" transform="translate(368.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_1</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-305.000000, -888.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_1" transform="translate(42.000000, 68.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="14px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="30px" viewBox="0 0 14 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_2_s</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-669.000000, -820.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="1301_2_s" transform="translate(406.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/extend/1301_7.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28px" height="18px" viewBox="0 0 18 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="28px" viewBox="0 0 18 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>提示右后方掉头复制</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 14)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-951.000000, -822.000000)" fill="#00C800" fill-rule="nonzero">
             <g id="编组-14" transform="translate(263.000000, 820.000000)">
                 <g id="编组-6" transform="translate(644.000000, 0.000000)">

collect-library/src/main/assets/omdb/4601/normal/1301_1.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="12px" viewBox="0 0 12 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="12px" height="30px" viewBox="0 0 12 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_a</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 6, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-865.000000, -995.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10">
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_a">
+                <g id="1301_0_a" transform="translate(602.000000, 0.000000)">
                     <polygon id="path22940_2_" points="7.341 29.432 7.311 4.846 11.71 8.412 11.789 5.139 6.066 0.568 0.21 5.132 0.298 8.617 4.97 4.645 4.985 29.43"></polygon>
                 </g>
             </g>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_g</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-390.000000, -995.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10">
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_g">
+                <g id="1301_0_g" transform="translate(127.000000, 0.000000)">
                     <polygon id="path2214_7_" points="13.399 29.168 13.414 4.004 17.091 7.131 17.16 4.387 12.55 0.793 8.046 4.392 8.109 6.969 11.572 4.114 11.56 29.208"></polygon>
                     <path d="M11.776,17.839 C11.797,17.422 11.543,15.976 10.416,15.185 C9.29,14.393 7.37,14.529 7.37,14.529 L4.05,14.544 L7.178,18.221 L4.437,18.291 L0.84,13.68 L4.441,9.176 L7.019,9.238 L4.164,12.701 L7.17,12.689 C7.17,12.689 9.013,12.637 10.061,13.123 C11.106,13.608 12.461,14.723 12.606,15.132 C12.885,15.948 11.751,18.237 11.776,17.839 Z" id="path2249_3_"></path>
                 </g>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_h</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-414.000000, -1060.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10" >
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_h">
+                <g id="1301_0_h" transform="translate(151.000000, 65.000000)">
                     <path d="M12.653,16.041 C12.51,15.631 11.395,14.759 10.348,14.273 C9.302,13.787 7.094,13.84 7.094,13.84 L4.084,13.852 L6.942,10.387 L4.362,10.325 L0.761,14.831 L4.357,19.444 L7.103,19.375 L3.974,15.696 L7.294,15.68 C7.294,15.68 9.158,15.43 10.285,16.222 C11.412,17.014 12.669,18.363 12.676,18.749 C12.689,19.521 12.94,16.859 12.653,16.041 Z" id="path2214"></path>
                     <polygon id="path2263" points="14.058 29.084 14.032 4.659 17.879 7.779 17.948 4.915 12.946 0.916 7.824 4.91 7.902 7.959 11.986 4.484 12 29.084"></polygon>
                     <path d="M13.348,16.041 C13.492,15.631 14.606,14.759 15.653,14.273 C16.699,13.787 18.906,13.84 18.906,13.84 L21.915,13.852 L19.058,10.387 L21.637,10.325 L25.239,14.831 L21.643,19.444 L18.897,19.375 L22.026,15.696 L18.705,15.68 C18.705,15.68 16.843,15.43 15.714,16.222 C14.587,17.014 13.33,18.363 13.324,18.749 C13.312,19.521 13.061,16.859 13.348,16.041 Z" id="path2198"></path>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="37px" height="26px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="37px" viewBox="0 0 26 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>3</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 18)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-901.000000, -1052.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="26">
+            <g id="26" transform="translate(901.000000, 1052.000000)">
                 <g id="3">
                     <g id="1301_1_m复制-3" transform="translate(0.000000, 7.327028)">
                         <polygon id="path2200_4_" points="11.82 29.099 11.848 7.259 14.202 7.119 14.184 29.106"></polygon>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_j</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 14, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-432.000000, -995.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10">
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_j">
+                <g id="1301_0_j" transform="translate(169.000000, 0.000000)">
                     <path d="M12.059,12.145 C11.915,11.735 10.799,10.862 9.752,10.375 C8.705,9.889 6.495,9.942 6.495,9.942 L3.484,9.953 L6.343,6.485 L3.762,6.422 L0.158,10.932 L3.758,15.55 L6.506,15.48 L3.374,11.797 L6.698,11.782 C6.698,11.782 8.563,11.532 9.691,12.324 C10.819,13.117 12.077,14.467 12.083,14.854 C12.095,15.629 12.346,12.965 12.059,12.145 Z" id="path2214_1_"></path>
                     <path d="M13.74,20.555 C13.472,15.211 3.833,15.203 3.932,20.672 L3.958,26.174 L0.455,23.086 L0.389,25.144 L5.016,29.037 L9.436,25.17 L9.442,22.912 L5.951,26.08 L5.968,21.073 C6.051,17.487 11.694,17.618 11.879,20.979 L13.74,20.555 Z" id="path22940_1_"></path>
                     <polygon id="path2263_1_" points="13.95 29.096 13.924 4.649 17.775 7.773 17.843 4.906 12.836 0.904 7.71 4.902 7.788 7.953 11.876 4.475 11.89 29.096"></polygon>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_2</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 14, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-850.000000, -1060.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10">
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_2">
+                <g id="1301_0_2" transform="translate(587.000000, 65.000000)">
                     <polygon id="path2214_13_" points="14.042 29.168 14.057 4.004 17.735 7.131 17.803 4.387 13.194 0.793 8.69 4.391 8.753 6.968 12.216 4.113 12.204 29.207"></polygon>
                     <path d="M12.42,22.839 C12.442,22.422 12.187,20.976 11.06,20.185 C9.934,19.393 8.014,19.529 8.014,19.529 L4.695,19.544 L7.823,23.221 L5.081,23.291 L1.485,18.68 L5.085,14.176 L7.663,14.238 L4.808,17.701 L7.815,17.689 C7.815,17.689 9.657,17.637 10.705,18.123 C11.75,18.608 13.105,19.723 13.25,20.132 C13.529,20.947 12.396,23.236 12.42,22.839 Z" id="path2249_5_"></path>
                     <polygon id="path2214_12_" points="13.922 14.333 3.38 7.817 7.976 6.341 5.68 4.835 0.197 6.858 0.881 12.582 3.103 13.887 2.503 9.439 13.326 16.12"></polygon>

collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_3</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-313.000000, -1060.000000)" fill="#2271FF" fill-rule="nonzero">
             <g id="编组-10" transform="translate(263.000000, 995.000000)">
                 <g id="1301_0_3" transform="translate(50.000000, 65.000000)">

collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="18px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="18px" height="30px" viewBox="0 0 18 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_f</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 9, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="C9_6_icon-汇总说明-" fill="#2271FF" fill-rule="nonzero">
+        <g id="C9_6_icon-汇总说明-" transform="translate(-347.000000, -995.000000)" fill="#2271FF" fill-rule="nonzero">
-            <g id="编组-10">
+            <g id="编组-10" transform="translate(263.000000, 995.000000)">
-                <g id="1301_0_f">
+                <g id="1301_0_f" transform="translate(84.000000, 0.000000)">
                     <polygon id="path2214_6_" points="6.439 29.208 6.425 4.113 9.89 6.968 9.953 4.391 5.449 0.792 0.839 4.386 0.908 7.13 4.585 4.003 4.602 29.167"></polygon>
                     <path d="M5.398,15.129 C5.541,14.72 6.898,13.605 7.943,13.12 C8.99,12.634 10.832,12.686 10.832,12.686 L13.838,12.698 L10.984,9.235 L13.562,9.173 L17.161,13.677 L13.566,18.288 L10.823,18.218 L13.951,14.541 L10.63,14.525 C10.63,14.525 8.71,14.389 7.584,15.181 C6.457,15.972 6.2,17.418 6.226,17.835 C6.245,18.236 5.111,15.946 5.398,15.129 Z" id="path2249_2_"></path>
                 </g>

collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="24px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24px" height="30px" viewBox="0 0 24 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_i</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 12, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-613.000000, -1060.000000)" fill="#2271FF" fill-rule="nonzero">
             <g id="编组-10" transform="translate(263.000000, 995.000000)">
                 <g id="1301_0_i" transform="translate(350.000000, 65.000000)">

collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30px" height="26px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="26px" height="30px" viewBox="0 0 26 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
     <title>1301_0_4</title>
     <desc>Created with Sketch.</desc>
-    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="rotate(90, 13, 15)">
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="C9_6_icon-汇总说明-" transform="translate(-363.000000, -1060.000000)" fill="#2271FF" fill-rule="nonzero">
             <g id="编组-10" transform="translate(263.000000, 995.000000)">
                 <g id="1301_0_4" transform="translate(100.000000, 65.000000)">