From 5b2fcbddd9ad8d13e1446577c59827b9847549c9 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Thu, 24 Aug 2023 10:14:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/RealmOperateHelper.kt | 45 +-- .../omqs/ui/activity/map/MainActivity.kt | 1 + .../omqs/ui/fragment/tasklist/TaskAdapter.kt | 31 ++- .../omqs/ui/fragment/tasklist/TaskFragment.kt | 7 + .../ui/fragment/tasklist/TaskViewModel.kt | 261 +++++++++++------- .../com/navinfo/omqs/ui/widget/SignUtil.kt | 52 +++- .../java/com/navinfo/omqs/util/SpeakMode.kt | 26 +- .../res/color/selector_black_blue_color.xml | 2 +- .../res/color/selector_gray_blue_color.xml | 5 + .../baseline_edit_note_48_select_red.xml | 5 + app/src/main/res/layout/adapter_task.xml | 4 +- app/src/main/res/layout/adapter_task_list.xml | 6 +- vtm | 2 +- 13 files changed, 299 insertions(+), 148 deletions(-) create mode 100644 app/src/main/res/color/selector_gray_blue_color.xml create mode 100644 app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index 863510f1..90d2c841 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/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") - .and() - .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd") + getRealmTools(RenderEntity::class.java, false) + .equalTo("table", "OMDB_RD_LINK") + .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() - .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) @@ -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") - .and().equalTo("properties['${LinkTable.linkPid}']", linkPid).findFirst() + getRealmTools(RenderEntity::class.java, true).equalTo("table", "OMDB_RD_LINK") + .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() - .equalTo("table", "QsRecordBean").and().equalTo("id", markId).findFirst() + val realmR = getRealmTools(QsRecordBean::class.java, false) + .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() - .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 queryResult = realmList?.stream()?.filter { @@ -287,10 +294,9 @@ class RealmOperateHelper() { suspend fun queryLinkByLinkPid(linkPid: String): MutableList { val result = mutableListOf() 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).and() + .equalTo("properties['${LinkTable.linkPid}']", linkPid) .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 } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 527528b5..e8aa4950 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -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) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt index 1c5d8efa..ca4401d9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt @@ -13,6 +13,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 +39,12 @@ class TaskAdapter( val binding: AdapterTaskBinding = holder.viewBinding as AdapterTaskBinding val bean = data[position] - if(bean.linkStatus==1){ - binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head) - }else{ - binding.taskHead.background = binding.root.context.getDrawable(R.drawable.selector_task_head_add_link) + if (bean.linkStatus == 1) { + binding.taskHead.background = + binding.root.context.getDrawable(R.drawable.selector_task_head) + } else { + binding.taskHead.background = + binding.root.context.getDrawable(R.drawable.selector_task_head_add_link) } binding.taskLinkPid.text = "PID:${bean.linkPid}" binding.taskMesh.text = "mesh:${bean.mesh}" @@ -58,6 +61,11 @@ class TaskAdapter( callback.itemOnClick(bean) } } + if (bean.reason != "") { + binding.taskEdit.setImageDrawable(binding.root.context.getDrawable(R.drawable.baseline_edit_note_48_select_red)) + } else { + binding.taskEdit.setImageDrawable(binding.root.context.getDrawable(R.drawable.selector_task_link_edit_icon)) + } binding.taskEdit.isSelected = bean.reason != "" 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 + } + } + } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt index e053d264..3bac53cc 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt +++ b/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) + } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt index 736b213e..1c21774b 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt +++ b/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() + /** + * 点击地图选中的link + */ + val liveDataSelectLink = MutableLiveData() + /** * 当前选中的任务 */ @@ -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 = - realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or() - .between("operationTime", beginNowTime, nowTime) - .equalTo("syncStatus", syncUpload).findAll().sort("id") + val objects = realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or() + .between("operationTime", beginNowTime, nowTime).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? = TraceDataBase.getDatabase( - mapController.mMapView.context, - Constant.USER_DATA_PATH + mapController.mMapView.context, 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) - filterTaskListJob!!.cancel() + if (filterTaskListJob != null) filterTaskListJob!!.cancel() filterTaskListJob = viewModelScope.launch(Dispatchers.IO) { delay(500) val realm = Realm.getDefaultInstance() - val list = realm.where(TaskBean::class.java) - .contains("evaluationTaskName", key) - .or() - .contains("dataVersion", key) - .or() - .contains("cityName", key) - .findAll() + val list = realm.where(TaskBean::class.java).contains("evaluationTaskName", key).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) - return + if (currentSelectTaskBean == null) return - if (filterTaskJob != null) - filterTaskJob!!.cancel() + if (filterTaskJob != null) filterTaskJob!!.cancel() filterTaskJob = viewModelScope.launch(Dispatchers.Default) { delay(500) val list = mutableListOf() for (item in currentSelectTaskBean!!.hadLinkDvoList) { - if (item.linkPid.contains(pidKey)) - list.add(item) + if (item.linkPid.contains(pidKey)) 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) - .equalTo("id", taskBean.id).findFirst() + val objects = + 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) - .notEqualTo("syncStatus", syncUpload).or() - .between("operationTime", beginNowTime, nowTime) - .equalTo("syncStatus", syncUpload).findAll() + val objects = + realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or() + .between("operationTime", beginNowTime, nowTime) + .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) - .equalTo("linkId", hadLinkDvoBean.linkPid).and() - .equalTo("taskId", hadLinkDvoBean.taskId).findAll() + val objects = + realm.where(QsRecordBean::class.java).equalTo("linkId", hadLinkDvoBean.linkPid) + .and().equalTo("taskId", hadLinkDvoBean.taskId).findAll() val map: MutableMap = HashMap() 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) { - mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener { - override fun onMapClick(tag: String, point: GeoPoint) { - if (tag == TAG) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - 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 { - mapController.mMapView.removeOnNIMapClickListener(TAG) - mapController.lineHandler.removeLine() - } +// //开始捕捉 +// if (selected) { +// mapController.mMapView.addOnNIMapClickListener(TAG, object : OnGeoPointClickListener { +// override fun onMapClick(tag: String, point: GeoPoint) { +// if (tag == TAG) { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { +// 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 { +// mapController.mMapView.removeOnNIMapClickListener(TAG) +// 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) - .and().equalTo("taskId", hadLinkDvoBean.taskId) - .findAll() + .equalTo("linkId", hadLinkDvoBean.linkPid).and() + .equalTo("taskId", hadLinkDvoBean.taskId).findAll() if (markers != null) { for (marker in markers) { mapController.markerHandle.removeQsRecordMark(marker) diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt index f6d4f88e..4db20a7a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt @@ -832,11 +832,43 @@ class SignUtil { */ fun getElectronicEyeMoreInfo(renderEntity: RenderEntity): List { val list = mutableListOf() + + + 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( - title = "电子眼类型", text = getElectronicEyeKindType(kindCode) + list.add( + TwoItemAdapterItem( + title = "电子眼类型", text = getElectronicEyeKindType(kindCode) + ) ) - list.add(kind) when (kindCode) { 1, 2, 3, 4, 5, 6, 20, 21 -> { list.add( @@ -870,6 +902,9 @@ class SignUtil { ) ) } + list.add( TwoItemAdapterItem( + title = "照射角度", text = "${renderEntity.properties["angle"]}" + )) return list } @@ -1125,12 +1160,11 @@ class SignUtil { ) } DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> { - val direction = data.properties["direction"] - var dir = "" - if (direction == "2") { - dir = "顺方向" - } else if (direction == "3") { - dir = "逆方向" + + val dir = when (data.properties["direction"]) { + "2" -> "顺方向" + "3" -> "逆方向" + else -> "" } if (dir != "") { list.add( diff --git a/app/src/main/java/com/navinfo/omqs/util/SpeakMode.kt b/app/src/main/java/com/navinfo/omqs/util/SpeakMode.kt index 9674b77d..0bb08846 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SpeakMode.kt +++ b/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 (result == TextToSpeech.LANG_MISSING_DATA - || result == TextToSpeech.LANG_NOT_SUPPORTED - ) { - if (context != null) { - val firstDialog = FirstDialog(context) - firstDialog.setTitle("提示") - firstDialog.setMessage("设备不支持语音播报，请先下载语音助手。") - firstDialog.setConfirmListener { dialog, _ -> dialog.dismiss() } - firstDialog.setNegativeView(View.GONE) - firstDialog.show() + if(mTextToSpeech != null) { + val result = mTextToSpeech.setLanguage(Locale.CHINESE) + if (result == TextToSpeech.LANG_MISSING_DATA + || result == TextToSpeech.LANG_NOT_SUPPORTED + ) { + if (context != null) { + val firstDialog = FirstDialog(context) + firstDialog.setTitle("提示") + firstDialog.setMessage("设备不支持语音播报，请先下载语音助手。") + firstDialog.setConfirmListener { dialog, _ -> dialog.dismiss() } + firstDialog.setNegativeView(View.GONE) + firstDialog.show() + } } + Log.i("TextToSpeechDemo", status.toString()) } - Log.i("TextToSpeechDemo", status.toString()) } //读语音处理 diff --git a/app/src/main/res/color/selector_black_blue_color.xml b/app/src/main/res/color/selector_black_blue_color.xml index aa4e0cf4..2331e071 100644 --- a/app/src/main/res/color/selector_black_blue_color.xml +++ b/app/src/main/res/color/selector_black_blue_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/selector_gray_blue_color.xml b/app/src/main/res/color/selector_gray_blue_color.xml new file mode 100644 index 00000000..344e58c1 --- /dev/null +++ b/app/src/main/res/color/selector_gray_blue_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml b/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml new file mode 100644 index 00000000..4b4261dd --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/adapter_task.xml b/app/src/main/res/layout/adapter_task.xml index 6b73fa64..e290cd74 100644 --- a/app/src/main/res/layout/adapter_task.xml +++ b/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" /> @@ -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" /> Date: Fri, 25 Aug 2023 09:28:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 8 +--- .../omqs/ui/activity/map/MainViewModel.kt | 16 ++++++- .../EvaluationResultFragment.kt | 10 ++++ .../EvaluationResultViewModel.kt | 3 ++ .../omqs/ui/fragment/itemlist/ItemAdapter.kt | 11 ++++- .../signMoreInfo/SignMoreInfoFragment.kt | 23 +++++---- .../omqs/ui/fragment/tasklist/TaskAdapter.kt | 10 ++-- .../baseline_edit_note_48_select_red.xml | 5 -- .../main/res/drawable/shape_oval_red_bg.xml | 7 +++ app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/adapter_item.xml | 3 +- app/src/main/res/layout/adapter_task.xml | 11 +++++ .../res/layout/fragment_evaluation_result.xml | 47 ++++++++++++------- .../main/res/layout/fragment_sign_info.xml | 6 ++- .../library/map/handler/MarkHandler.kt | 2 +- 15 files changed, 115 insertions(+), 49 deletions(-) delete mode 100644 app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml create mode 100644 app/src/main/res/drawable/shape_oval_red_bg.xml diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index e8aa4950..3fab9a26 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -524,7 +524,7 @@ class MainActivity : BaseActivity() { /** * 开始测量 */ - private fun measuringToolOn() { + fun measuringToolOn() { val root = binding.mainActivityMeasuringTool.root val valueView = root.findViewById(R.id.measuring_tool_value) val unitView = root.findViewById(R.id.measuring_tool_value_unit) @@ -673,12 +673,6 @@ class MainActivity : BaseActivity() { viewModel.onClickMenu() } - /** - * 点击测速 - */ - fun onClickCalcDistance() { - measuringToolOn() - } /** * 点击轨迹 diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 097a6bdf..05949894 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -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 @@ -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( diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt index 60a50bea..bb9028ee 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt @@ -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) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt index b4a9ce2e..82e57317 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt @@ -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() diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt index 5667a982..361fd9cb 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt +++ b/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() { + + 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) } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt index b0843186..06503f25 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt @@ -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); - drawable.setBounds( + val drawableLeft = resources.getDrawable(R.drawable.icon_main_moreinfo_text_left, null); + val drawableRight = resources.getDrawable(R.drawable.baseline_edit_note_48, null); + drawableLeft.setBounds( 0, 0, - drawable.minimumWidth, - drawable.minimumHeight - );//必须设置图片大小，否则不显示 + drawableLeft.minimumWidth, + 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 diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt index ca4401d9..f34158c6 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt +++ b/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 @@ -61,12 +62,11 @@ class TaskAdapter( callback.itemOnClick(bean) } } - if (bean.reason != "") { - binding.taskEdit.setImageDrawable(binding.root.context.getDrawable(R.drawable.baseline_edit_note_48_select_red)) + if (bean.reason == "") { + binding.taskBadge.visibility = View.GONE } else { - binding.taskEdit.setImageDrawable(binding.root.context.getDrawable(R.drawable.selector_task_link_edit_icon)) + binding.taskBadge.visibility = View.VISIBLE } - binding.taskEdit.isSelected = bean.reason != "" binding.taskEdit.setOnClickListener { callback.editOnClick(position, bean) } @@ -84,7 +84,7 @@ class TaskAdapter( notifyItemChanged(selectPosition) selectPosition = i notifyItemChanged(i) - if(callback != null){ + if (callback != null) { callback.scrollPosition(i) } break diff --git a/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml b/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml deleted file mode 100644 index 4b4261dd..00000000 --- a/app/src/main/res/drawable-v24/baseline_edit_note_48_select_red.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/shape_oval_red_bg.xml b/app/src/main/res/drawable/shape_oval_red_bg.xml new file mode 100644 index 00000000..e939b083 --- /dev/null +++ b/app/src/main/res/drawable/shape_oval_red_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 039b77d6..59738880 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -141,7 +141,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_task.xml b/app/src/main/res/layout/adapter_task.xml index e290cd74..86c17965 100644 --- a/app/src/main/res/layout/adapter_task.xml +++ b/app/src/main/res/layout/adapter_task.xml @@ -49,4 +49,15 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:src="@drawable/selector_task_link_edit_icon" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index d1186c70..fb8ae2b0 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -44,29 +44,27 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - + app:layout_constraintRight_toLeftOf="@id/evaluation_bar_save" + app:layout_constraintTop_toTopOf="@id/evaluation_bar_save" + app:layout_constraintBottom_toBottomOf="@id/evaluation_bar_save" /> + + + + + + + + + + diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt index e6d262ce..b2e9b9db 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt @@ -67,7 +67,7 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) : //新增marker图标样式 val mDefaultBitmap = AndroidBitmap(BitmapFactory.decodeResource(context.resources, R.mipmap.marker)) - + mDefaultBitmap.scaleTo(150, 150) val markerSymbol = MarkerSymbol( mDefaultBitmap, MarkerSymbol.HotspotPlace.CENTER From 31074e8e717c60424a046b5dc8ca7fc1e0cd72ad Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Fri, 25 Aug 2023 14:23:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E6=96=BD=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainViewModel.kt | 2 +- .../omqs/ui/activity/map/SignAdapter.kt | 2 +- .../signMoreInfo/SignMoreInfoFragment.kt | 2 +- .../omqs/{ui/widget => util}/SignUtil.kt | 706 +++++++++--------- .../java/com/navinfo/omqs/util/TimePeriod.kt | 6 + 5 files changed, 343 insertions(+), 375 deletions(-) rename app/src/main/java/com/navinfo/omqs/{ui/widget => util}/SignUtil.kt (85%) create mode 100644 app/src/main/java/com/navinfo/omqs/util/TimePeriod.kt diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 05949894..5adde8c5 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -44,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 diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt index 1f16516f..ea81b3e8 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt @@ -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) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt index 06503f25..f7da97ed 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/signMoreInfo/SignMoreInfoFragment.kt +++ b/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() { diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt similarity index 85% rename from app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt rename to app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index 4db20a7a..510e4b9a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/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() + 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 { val list = mutableListOf() 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 { } - /** * 获取种别图标 */ @@ -902,9 +1003,11 @@ class SignUtil { ) ) } - list.add( TwoItemAdapterItem( - title = "照射角度", text = "${renderEntity.properties["angle"]}" - )) + list.add( + TwoItemAdapterItem( + title = "照射角度", text = "${renderEntity.properties["angle"]}" + ) + ) return list } @@ -1066,236 +1169,95 @@ class SignUtil { } } - /** - * 获取更多信息 - */ - fun getMoreInfoAdapter(data: RenderEntity): TwoItemAdapter { - val adapter = TwoItemAdapter() + //常规线限速详细信息 + private fun getLinkSpeedLimitMoreInfo(data: RenderEntity): List { val list = mutableListOf() - 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 -> { - - val dir = when (data.properties["direction"]) { - "2" -> "顺方向" - "3" -> "逆方向" - else -> "" - } - 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 - ) - ) - } + val dir = when (data.properties["direction"]) { + "2" -> "顺方向" + "3" -> "逆方向" + else -> "" } - adapter.data = list - return adapter + 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 + ) + ) + } + return list } + + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/util/TimePeriod.kt b/app/src/main/java/com/navinfo/omqs/util/TimePeriod.kt new file mode 100644 index 00000000..c621b1ec --- /dev/null +++ b/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 + +) \ No newline at end of file From 29e78f78f4c54b98236508741a9e4c626796d461 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 25 Aug 2023 14:46:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=8D=A2=E8=BD=A6=E4=BF=A1?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/assets/editormarker.xml | 204 +++++++++--------- .../src/main/assets/omdb/4601/bus/1301_0.svg | 8 +- .../src/main/assets/omdb/4601/bus/1301_1.svg | 10 +- .../main/assets/omdb/4601/bus/1301_1_2.svg | 10 +- .../main/assets/omdb/4601/bus/1301_1_2_3.svg | 10 +- .../assets/omdb/4601/bus/1301_1_2_3_4.svg | 10 +- .../main/assets/omdb/4601/bus/1301_1_2_4.svg | 10 +- .../main/assets/omdb/4601/bus/1301_1_2_5.svg | 10 +- .../main/assets/omdb/4601/bus/1301_1_2_6.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_3.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_3_4.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_3_5.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_3_6.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_4.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_5.svg | 4 +- .../main/assets/omdb/4601/bus/1301_1_7.svg | 4 +- .../4601/bus/{1301_3_5.svg => 1301_1_v.svg} | 4 +- .../4601/bus/{1301_4_5.svg => 1301_1_w.svg} | 4 +- .../4601/bus/{1301_1_6.svg => 1301_1_x.svg} | 4 +- .../4601/bus/{1301_2_6.svg => 1301_1_y.svg} | 4 +- .../4601/bus/{1301_3_6.svg => 1301_1_z.svg} | 4 +- .../src/main/assets/omdb/4601/bus/1301_2.svg | 4 +- .../main/assets/omdb/4601/bus/1301_2_3.svg | 4 +- .../main/assets/omdb/4601/bus/1301_2_3_4.svg | 4 +- .../main/assets/omdb/4601/bus/1301_2_4.svg | 4 +- .../main/assets/omdb/4601/bus/1301_2_5.svg | 4 +- .../src/main/assets/omdb/4601/bus/1301_3.svg | 4 +- .../main/assets/omdb/4601/bus/1301_3_4.svg | 4 +- .../src/main/assets/omdb/4601/bus/1301_4.svg | 4 +- .../main/assets/omdb/4601/bus/1301_4_6.svg | 4 +- .../src/main/assets/omdb/4601/bus/1301_5.svg | 4 +- .../main/assets/omdb/4601/bus/1301_5_6.svg | 8 +- .../src/main/assets/omdb/4601/bus/1301_6.svg | 4 +- .../src/main/assets/omdb/4601/bus/1301_7.svg | 4 +- .../main/assets/omdb/4601/extend/1301_0.svg | 8 +- .../main/assets/omdb/4601/extend/1301_1.svg | 10 +- .../main/assets/omdb/4601/extend/1301_1_2.svg | 10 +- .../assets/omdb/4601/extend/1301_1_2_3.svg | 4 +- .../assets/omdb/4601/extend/1301_1_2_3_4.svg | 4 +- .../assets/omdb/4601/extend/1301_1_2_4.svg | 4 +- .../assets/omdb/4601/extend/1301_1_2_5.svg | 4 +- .../assets/omdb/4601/extend/1301_1_2_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_1_3.svg | 4 +- .../assets/omdb/4601/extend/1301_1_3_4.svg | 4 +- .../assets/omdb/4601/extend/1301_1_3_5.svg | 4 +- .../assets/omdb/4601/extend/1301_1_3_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_1_4.svg | 4 +- .../main/assets/omdb/4601/extend/1301_1_5.svg | 4 +- .../main/assets/omdb/4601/extend/1301_1_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_1_7.svg | 4 +- .../main/assets/omdb/4601/extend/1301_2.svg | 4 +- .../main/assets/omdb/4601/extend/1301_2_3.svg | 4 +- .../assets/omdb/4601/extend/1301_2_3_4.svg | 4 +- .../main/assets/omdb/4601/extend/1301_2_4.svg | 4 +- .../main/assets/omdb/4601/extend/1301_2_5.svg | 4 +- .../main/assets/omdb/4601/extend/1301_2_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_3.svg | 4 +- .../main/assets/omdb/4601/extend/1301_3_4.svg | 4 +- .../main/assets/omdb/4601/extend/1301_3_5.svg | 4 +- .../main/assets/omdb/4601/extend/1301_3_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_4.svg | 4 +- .../main/assets/omdb/4601/extend/1301_4_5.svg | 4 +- .../main/assets/omdb/4601/extend/1301_4_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_5.svg | 4 +- .../main/assets/omdb/4601/extend/1301_5_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_6.svg | 4 +- .../main/assets/omdb/4601/extend/1301_7.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1.svg | 10 +- .../main/assets/omdb/4601/normal/1301_1_2.svg | 10 +- .../assets/omdb/4601/normal/1301_1_2_3.svg | 10 +- .../assets/omdb/4601/normal/1301_1_2_3_4.svg | 8 +- .../assets/omdb/4601/normal/1301_1_2_4.svg | 10 +- .../assets/omdb/4601/normal/1301_1_2_5.svg | 10 +- .../assets/omdb/4601/normal/1301_1_2_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1_3.svg | 10 +- .../assets/omdb/4601/normal/1301_1_3_4.svg | 4 +- .../assets/omdb/4601/normal/1301_1_3_5.svg | 4 +- .../assets/omdb/4601/normal/1301_1_3_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1_4.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1_5.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_1_7.svg | 4 +- .../main/assets/omdb/4601/normal/1301_2.svg | 4 +- .../main/assets/omdb/4601/normal/1301_2_3.svg | 4 +- .../assets/omdb/4601/normal/1301_2_3_4.svg | 4 +- .../main/assets/omdb/4601/normal/1301_2_4.svg | 4 +- .../main/assets/omdb/4601/normal/1301_2_5.svg | 4 +- .../main/assets/omdb/4601/normal/1301_2_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_3.svg | 4 +- .../main/assets/omdb/4601/normal/1301_3_4.svg | 4 +- .../main/assets/omdb/4601/normal/1301_3_5.svg | 4 +- .../main/assets/omdb/4601/normal/1301_3_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_4.svg | 4 +- .../main/assets/omdb/4601/normal/1301_4_5.svg | 4 +- .../main/assets/omdb/4601/normal/1301_4_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_5.svg | 4 +- .../main/assets/omdb/4601/normal/1301_5_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_6.svg | 4 +- .../main/assets/omdb/4601/normal/1301_7.svg | 4 +- .../map/cluster/ClusterMarkerRenderer.kt | 4 +- vtm | 2 +- 101 files changed, 351 insertions(+), 351 deletions(-) rename collect-library/src/main/assets/omdb/4601/bus/{1301_3_5.svg => 1301_1_v.svg} (92%) rename collect-library/src/main/assets/omdb/4601/bus/{1301_4_5.svg => 1301_1_w.svg} (91%) rename collect-library/src/main/assets/omdb/4601/bus/{1301_1_6.svg => 1301_1_x.svg} (90%) rename collect-library/src/main/assets/omdb/4601/bus/{1301_2_6.svg => 1301_1_y.svg} (92%) rename collect-library/src/main/assets/omdb/4601/bus/{1301_3_6.svg => 1301_1_z.svg} (92%) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 2bceef42..c58d6192 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1551,399 +1551,399 @@ + src="assets:omdb/4601/normal/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_0.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_0.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_7.svg" symbol-height="24" degree="90"> @@ -2312,11 +2312,11 @@ - + + src="assets:omdb/4010/right.svg" symbol-height="44" symbol-width="44"> @@ -2326,7 +2326,7 @@ - + @@ -2352,7 +2352,7 @@ + src="@src" symbol-height="36" symbol-width="36" degree="90"> diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg index 11c4ad4a..6787d248 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg @@ -1,11 +1,11 @@ - + 1301_1_o Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg index 7fad797e..b8bea87f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_1_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg index ef978302..8f6f6b0c 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_1_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg index 7a4eaa39..60d2aaed 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg @@ -1,12 +1,12 @@ - + 1301_1_h Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg index b083effc..aa70807e 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg @@ -1,13 +1,13 @@ - + 1 Created with Sketch. - - - + + + - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg index f1783eb2..0342b5aa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg @@ -1,12 +1,12 @@ - + 1301_1_j Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg index 41817043..ed445eb7 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg @@ -1,12 +1,12 @@ - + 编组 13 Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg index 1ae6c322..f06a895a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_1_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg index dbb3b0a8..d807d280 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg @@ -1,9 +1,9 @@ - + 1301_1_f Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg index 95890b21..e21d5079 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg index a5f97b40..43860c88 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_1_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg index 7746a04e..91b52ffa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_1_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg index e102cc2e..ae7f1592 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_1_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg index 2ea27c43..c2e1ef97 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_1_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg index a168c5fe..d8005039 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg index 54be427f..d392ac9f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg @@ -1,9 +1,9 @@ - + 1301_1_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg similarity index 91% rename from collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg index 8d88db55..3a0c2918 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg @@ -1,9 +1,9 @@ - + 1301_1_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg similarity index 90% rename from collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg index 79506a9e..9be2fe1c 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg @@ -1,9 +1,9 @@ - + 1301_1_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg index 51a11221..dec1b080 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg @@ -1,9 +1,9 @@ - + 1301_1_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg index cff1424a..55305487 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg @@ -1,9 +1,9 @@ - + 1301_1_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg index ec913bb4..d9a9f805 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_1_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg index 2239d079..2d152b04 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_1_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg index 20da2578..523d2787 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg index 1eba8f6b..d3d362c0 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_1_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg index d5171f4b..a5619a47 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_1_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg index d2da475a..492f7c4f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_1_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg index c2ccda33..75d8e6aa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg index ec270561..ff047e6a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_1_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg index 3dda5a65..14ea578d 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_1_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg index c3bdba5f..adb4788a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_1_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg index e230cdf6..109280c0 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg @@ -1,11 +1,11 @@ - + 1301_1_1 Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg index 0452c08c..cfff198d 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_1_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg index 6c966615..73f7f1c4 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg index 31181865..b610804a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg @@ -1,11 +1,11 @@ - + 1301_2_o Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg index 2432424e..4d59163d 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_2_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg index 54900d75..e55748e7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_2_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg index 824e6503..c73d7414 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg @@ -1,9 +1,9 @@ - + 1301_2_h Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg index 9aae9284..508ff024 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg @@ -1,9 +1,9 @@ - + 2 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg index 6e952eab..aa1850cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg @@ -1,9 +1,9 @@ - + 1301_2_j Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg index 028e0281..ec798ad7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg @@ -1,9 +1,9 @@ - + 1301_2_2 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg index d79bb956..adaaac68 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_2_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg index 9c121433..0925b6ac 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg @@ -1,9 +1,9 @@ - + 1301_2_f Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg index b25a0cad..41e44082 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg index e6b10741..5c801072 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_2_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg index 3ff7e8b5..db79565a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_2_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg index 32b6d317..918e698d 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_2_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg index acb3d7ff..b63e4307 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_2_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg index 0ec4d847..f57de850 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg @@ -1,9 +1,9 @@ - + 1301_2_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg index e707aec2..53300e25 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg index ad77a66d..b4818b91 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_2_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg index f8f2c938..dad8c55c 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_2_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg index d073873d..52d41ff7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg index 3f2f9707..41b0d5cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_2_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg index d843eb38..bc25dc2f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_2_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg index bdb8fff7..c2be3c4c 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg @@ -1,9 +1,9 @@ - + 1301_2_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg index df172c9c..08766c81 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_2_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg index acb9ae05..9c265e49 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg index 069cbd0b..0543d49f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg @@ -1,9 +1,9 @@ - + 1301_2_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg index 79d5c087..d4ade4cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg @@ -1,9 +1,9 @@ - + 1301_2_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg index b6e1d0db..e7f75e57 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_2_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg index 81af0ab8..571c1a85 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg @@ -1,9 +1,9 @@ - + 1301_2_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg index 57990202..30e5875f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_2_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg index aba27872..184fc457 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_2_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg index 572458f7..19f1423a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg @@ -1,9 +1,9 @@ - + 1301_2_1 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg index b33898a2..6085283b 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_2_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg index eed6f75f..1aeeb819 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg index eee46b0a..61ee9895 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_0_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg index a17714ac..ddedb0c1 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_0_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg index 15b4e042..b052220c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg @@ -1,12 +1,12 @@ - + 1301_0_h Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg index 7e376960..03726e44 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg @@ -1,11 +1,11 @@ - + 3 Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg index 54172a31..a946f171 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg @@ -1,12 +1,12 @@ - + 1301_0_j Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg index 389ab0ab..2639d991 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg @@ -1,12 +1,12 @@ - + 1301_0_2 Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg index a42e748c..e5f4b00a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_0_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg index 98d227b3..214dfc3a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg @@ -1,12 +1,12 @@ - + 1301_0_f Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg index a790d632..0ddc8739 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg index 91980137..3bf84c25 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_0_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg index a8eb644b..3cb0cf6a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_0_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg index 002e5954..6cc93c5c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_0_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg index a57d2197..d206d43e 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_0_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg index 44e65ef4..644311e6 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg @@ -1,9 +1,9 @@ - + 1301_0_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg index 9e84d3c8..0e2949d5 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg index 5301bd45..b7ea9893 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_0_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg index a12e77c3..6759a145 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_0_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg index c65f71cb..3a872137 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg index 84f7e390..08c5da09 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_0_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg index 8b28100c..37186fc9 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_0_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg index 11521180..c12236bd 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg @@ -1,9 +1,9 @@ - + 1301_0_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg index aa94ed6e..f88672a9 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_0_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg index 178daa1f..575f302c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg index 0a722d82..5b95f428 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg @@ -1,9 +1,9 @@ - + 1301_0_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg index 70057c1c..b178cd11 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg @@ -1,9 +1,9 @@ - + 1301_0_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg index 8e5aeea7..c482dfe1 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_0_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg index 8dbbcd42..26b1fd48 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg @@ -1,9 +1,9 @@ - + 1301_0_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg index 1d34c49d..ca270524 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_0_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg index ab0df392..aab434e7 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_0_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg index 4fcaeb4e..45869d5b 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg @@ -1,9 +1,9 @@ - + 1301_0_1 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg index b1061c69..2c547235 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_0_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg index ab543afa..ba4b350e 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt index d9711c6b..f9943757 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt @@ -317,7 +317,7 @@ open class ClusterMarkerRenderer : MarkerRenderer { // this item will act as a cluster, just use a proper bitmap // depending on cluster size, instead of its marker val bitmap = getClusterBitmap(it.clusterSize + 1) - s.set(it.x, it.y, bitmap, true, false) + s.set(it.x, it.y, bitmap, true, false, 0f) s.offset = PointF(0.5f, 0.5f) s.billboard = true // could be a parameter } else { @@ -325,7 +325,7 @@ open class ClusterMarkerRenderer : MarkerRenderer { var symbol: MarkerSymbol? = it.item.marker if (symbol == null) symbol = mDefaultMarker symbol?.let { symbol -> - s.set(it.x, it.y, symbol.bitmap, true, false) + s.set(it.x, it.y, symbol.bitmap, true, false, 0f) s.offset = symbol.hotspot s.billboard = symbol.isBillboard } diff --git a/vtm b/vtm index c6a242fa..7258620e 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c6a242fab870bc5b1b0e62856afc6350abe5ff3c +Subproject commit 7258620e5f5c3692be0c2c71cc2e97ffd129b166