fix: 修改vtm配置
This commit is contained in:
commit
471e869ad9
@ -158,9 +158,13 @@ class MainActivity : BaseActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
val checkIntent = Intent()
|
||||
checkIntent.action = TextToSpeech.Engine.ACTION_CHECK_TTS_DATA
|
||||
someActivityResultLauncher.launch(checkIntent)
|
||||
try {
|
||||
val checkIntent = Intent()
|
||||
checkIntent.action = TextToSpeech.Engine.ACTION_CHECK_TTS_DATA
|
||||
someActivityResultLauncher.launch(checkIntent)
|
||||
} catch (e: Exception) {
|
||||
Log.e("jingo", "检查TTS失败 $e")
|
||||
}
|
||||
|
||||
binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
|
||||
|
||||
|
@ -8,6 +8,7 @@ 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
|
||||
@ -327,7 +328,7 @@ class MainViewModel @Inject constructor(
|
||||
val realm = realmOperateHelper.getRealmDefaultInstance()
|
||||
realm.executeTransaction {
|
||||
val objects =
|
||||
realmOperateHelper.getRealmTools(QsRecordBean::class.java,false).findAll()
|
||||
realmOperateHelper.getRealmTools(QsRecordBean::class.java, false).findAll()
|
||||
list = realm.copyFromRealm(objects)
|
||||
}
|
||||
mapController.markerHandle.removeAllQsMarker()
|
||||
@ -344,7 +345,7 @@ class MainViewModel @Inject constructor(
|
||||
var list = mutableListOf<NoteBean>()
|
||||
val realm = realmOperateHelper.getRealmDefaultInstance()
|
||||
realm.executeTransaction {
|
||||
val objects = realmOperateHelper.getRealmTools(NoteBean::class.java,false).findAll()
|
||||
val objects = realmOperateHelper.getRealmTools(NoteBean::class.java, false).findAll()
|
||||
list = realm.copyFromRealm(objects)
|
||||
}
|
||||
|
||||
@ -486,10 +487,13 @@ class MainViewModel @Inject constructor(
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
|
||||
val linkList = realmOperateHelper.queryLink(point = point)
|
||||
val linkList = realmOperateHelper.queryLink(point = point)
|
||||
|
||||
/* val linkList = realmOperateHelper.queryLine(
|
||||
point = point,
|
||||
)
|
||||
|
||||
// val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE")
|
||||
buffer = 2.5,
|
||||
table = "OMDB_LANE_MARK_BOUNDARYTYPE"
|
||||
)*/
|
||||
@ -513,7 +517,7 @@ class MainViewModel @Inject constructor(
|
||||
var elementList = realmOperateHelper.queryLinkByLinkPid(it)
|
||||
for (element in elementList) {
|
||||
|
||||
if (element.code == "2011") {
|
||||
if (element.code == DataCodeEnum.OMDB_LINK_NAME.code) {
|
||||
hisRoadName = true
|
||||
liveDataRoadName.postValue(element)
|
||||
continue
|
||||
@ -536,12 +540,56 @@ class MainViewModel @Inject constructor(
|
||||
)
|
||||
Log.e("jingo", "捕捉到的数据code ${element.code}")
|
||||
when (element.code) {
|
||||
//车道数,种别,功能等级,线限速,道路方向
|
||||
DataCodeEnum.OMDB_LANE_NUM.code, DataCodeEnum.OMDB_RD_LINK_KIND.code, DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code, DataCodeEnum.OMDB_LINK_DIRECT.code -> topSignList.add(
|
||||
DataCodeEnum.OMDB_MULTI_DIGITIZED.code,//上下线分离
|
||||
DataCodeEnum.OMDB_CON_ACCESS.code,//全封闭
|
||||
-> {
|
||||
if (signBean.iconText != "") {
|
||||
topSignList.add(
|
||||
signBean
|
||||
)
|
||||
}
|
||||
}
|
||||
DataCodeEnum.OMDB_LANE_NUM.code, //车道数
|
||||
DataCodeEnum.OMDB_RD_LINK_KIND.code,//种别,
|
||||
DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, // 功能等级,
|
||||
DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code, //线限速,
|
||||
DataCodeEnum.OMDB_LINK_DIRECT.code,//道路方向,
|
||||
DataCodeEnum.OMDB_RAMP.code, //匝道
|
||||
DataCodeEnum.OMDB_BRIDGE.code,//桥
|
||||
DataCodeEnum.OMDB_TUNNEL.code,//隧道
|
||||
DataCodeEnum.OMDB_ROUNDABOUT.code,//环岛
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code,//出入口
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code,//辅路
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code,//SA
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code,//PA
|
||||
DataCodeEnum.OMDB_LINK_FORM1_1.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM1_2.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM1_3.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_1.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_2.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_3.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_4.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_5.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_6.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_7.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_8.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_9.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_10.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_11.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_12.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_13.code,
|
||||
DataCodeEnum.OMDB_VIADUCT.code,
|
||||
-> topSignList.add(
|
||||
signBean
|
||||
)
|
||||
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code, DataCodeEnum.OMDB_SPEEDLIMIT_VAR.code, DataCodeEnum.OMDB_ELECTRONICEYE.code, DataCodeEnum.OMDB_TRAFFICLIGHT.code, DataCodeEnum.OMDB_LANEINFO.code -> signList.add(
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT.code,//常规点限速
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT_COND.code,//条件点限速
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT_VAR.code,//可变点限速
|
||||
DataCodeEnum.OMDB_ELECTRONICEYE.code,//电子眼
|
||||
DataCodeEnum.OMDB_TRAFFICLIGHT.code,//交通灯
|
||||
DataCodeEnum.OMDB_LANEINFO.code,//车信
|
||||
-> signList.add(
|
||||
signBean
|
||||
)
|
||||
}
|
||||
@ -550,17 +598,23 @@ class MainViewModel @Inject constructor(
|
||||
|
||||
val realm = realmOperateHelper.getRealmDefaultInstance()
|
||||
|
||||
val entity = realmOperateHelper.getRealmTools(RenderEntity::class.java,true).and()
|
||||
.equalTo("table", DataCodeEnum.OMDB_RESTRICTION.tableName).and().equalTo(
|
||||
"properties['linkIn']", it
|
||||
).findFirst()
|
||||
val entity =
|
||||
realmOperateHelper.getRealmTools(RenderEntity::class.java, true)
|
||||
.and()
|
||||
.equalTo("table", DataCodeEnum.OMDB_RESTRICTION.tableName).and()
|
||||
.equalTo(
|
||||
"properties['linkIn']", it
|
||||
).findFirst()
|
||||
if (entity != null) {
|
||||
val outLink = entity.properties["linkOut"]
|
||||
val linkOutEntity = realmOperateHelper.getRealmTools(RenderEntity::class.java,true).and()
|
||||
.equalTo("table", DataCodeEnum.OMDB_RD_LINK.tableName).and().equalTo(
|
||||
"properties['${RenderEntity.Companion.LinkTable.linkPid}']",
|
||||
outLink
|
||||
).findFirst()
|
||||
val linkOutEntity =
|
||||
realmOperateHelper.getRealmTools(RenderEntity::class.java, true)
|
||||
.and()
|
||||
.equalTo("table", DataCodeEnum.OMDB_RD_LINK.tableName).and()
|
||||
.equalTo(
|
||||
"properties['${RenderEntity.Companion.LinkTable.linkPid}']",
|
||||
outLink
|
||||
).findFirst()
|
||||
if (linkOutEntity != null) {
|
||||
mapController.lineHandler.linksLayer.addLine(
|
||||
linkOutEntity.geometry, 0x7DFF0000
|
||||
|
@ -3,6 +3,7 @@ package com.navinfo.omqs.ui.activity.map
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.navinfo.collect.library.enums.DataCodeEnum
|
||||
import com.navinfo.omqs.R
|
||||
import com.navinfo.omqs.bean.SignBean
|
||||
import com.navinfo.omqs.databinding.AdapterTopSignBinding
|
||||
@ -23,7 +24,16 @@ class TopSignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = nul
|
||||
val item = data[position]
|
||||
if (item.iconId != 0)
|
||||
bd.topSignText.background = holder.viewBinding.root.context.getDrawable(item.iconId)
|
||||
bd.topSignName.text = item.name
|
||||
when (item.renderEntity.code) {
|
||||
DataCodeEnum.OMDB_CON_ACCESS.code,
|
||||
DataCodeEnum.OMDB_MULTI_DIGITIZED.code,
|
||||
DataCodeEnum.OMDB_TUNNEL.code,
|
||||
DataCodeEnum.OMDB_ROUNDABOUT.code,
|
||||
DataCodeEnum.OMDB_VIADUCT.code,
|
||||
-> bd.topSignName.text = ""
|
||||
else -> bd.topSignName.text = item.name
|
||||
}
|
||||
|
||||
bd.topSignText.text = item.iconText
|
||||
if (data.size == 1) {
|
||||
bd.topSignLeftLine.visibility = View.GONE
|
||||
|
@ -51,7 +51,7 @@ class SignMoreInfoFragment : BaseFragment() {
|
||||
|
||||
when (it.code) {
|
||||
//道路名
|
||||
DataCodeEnum.OMDB_RD_LINK.code -> {
|
||||
DataCodeEnum.OMDB_LINK_NAME.code -> {
|
||||
val adapter = RoadNameInfoAdapter()
|
||||
binding.signInfoRecyclerview.adapter = adapter
|
||||
adapter.refreshData(SignUtil.getRoadNameList(it))
|
||||
|
@ -29,14 +29,70 @@ class SignUtil {
|
||||
DataCodeEnum.OMDB_LINK_DIRECT.code -> getRoadDirectionText(data)
|
||||
//常规线限速
|
||||
DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> getLineSpeedLimitText(data)
|
||||
//全封闭
|
||||
DataCodeEnum.OMDB_CON_ACCESS.code -> getConAccessText(data)
|
||||
//匝道
|
||||
DataCodeEnum.OMDB_RAMP.code -> getRampText(data)
|
||||
//车道数
|
||||
DataCodeEnum.OMDB_LANE_NUM.code -> getLaneNumText(data)
|
||||
//常规点限速,条件点限速
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText(data)
|
||||
DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText(
|
||||
data
|
||||
)
|
||||
//上下线分离
|
||||
DataCodeEnum.OMDB_MULTI_DIGITIZED.code -> getMultiDigitized(data)
|
||||
//桥
|
||||
DataCodeEnum.OMDB_BRIDGE.code -> getBridgeType(data)
|
||||
//隧道
|
||||
DataCodeEnum.OMDB_TUNNEL.code -> "隧道"
|
||||
//环岛
|
||||
DataCodeEnum.OMDB_ROUNDABOUT.code -> "环岛"
|
||||
//主辅路出入口
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code -> "出入口"
|
||||
//辅路
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code -> "辅路"
|
||||
//SA
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code -> "SA"
|
||||
//PA
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "PA"
|
||||
DataCodeEnum.OMDB_LINK_FORM1_1.code -> "U-T"
|
||||
DataCodeEnum.OMDB_LINK_FORM1_2.code -> "提右"
|
||||
DataCodeEnum.OMDB_LINK_FORM1_3.code -> "提左"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_1.code -> "IC"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_2.code -> "JCT"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_3.code -> "跨线地"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_4.code -> "私道"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_5.code -> "步行街"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_6.code -> "公交道"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_7.code -> "POI"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_8.code -> "区域内"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_9.code -> "P出入"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_10.code -> "P虚拟"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_11.code -> "风景路"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_12.code -> "测试路"
|
||||
DataCodeEnum.OMDB_LINK_FORM2_13.code -> "驾考路"
|
||||
DataCodeEnum.OMDB_VIADUCT.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 ""
|
||||
}
|
||||
|
||||
/**
|
||||
* 常规线限速值
|
||||
*/
|
||||
@ -44,6 +100,45 @@ class SignUtil {
|
||||
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 ""
|
||||
}
|
||||
|
||||
/**
|
||||
*获取道路功能等级文字
|
||||
*/
|
||||
@ -87,6 +182,10 @@ class SignUtil {
|
||||
DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code -> "车道边界类型"
|
||||
//常规线限速
|
||||
DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速"
|
||||
//全封闭
|
||||
DataCodeEnum.OMDB_CON_ACCESS.code -> "全封闭" //暂时不要标题
|
||||
//匝道
|
||||
DataCodeEnum.OMDB_RAMP.code -> "匝道"
|
||||
//车道数
|
||||
DataCodeEnum.OMDB_LANE_NUM.code -> "车道数"
|
||||
//常规点限速
|
||||
@ -103,10 +202,44 @@ class SignUtil {
|
||||
DataCodeEnum.OMDB_TRAFFICLIGHT.code -> "交通灯"
|
||||
//车信
|
||||
DataCodeEnum.OMDB_LANEINFO.code -> "车信"
|
||||
//上下线分离
|
||||
DataCodeEnum.OMDB_MULTI_DIGITIZED.code -> "上下线分离"
|
||||
//桥
|
||||
DataCodeEnum.OMDB_BRIDGE.code -> "桥"
|
||||
//隧道
|
||||
DataCodeEnum.OMDB_TUNNEL.code -> "隧道"
|
||||
//环岛
|
||||
DataCodeEnum.OMDB_ROUNDABOUT.code -> "环岛"
|
||||
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code,
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code,
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code,
|
||||
DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性"
|
||||
|
||||
DataCodeEnum.OMDB_LINK_FORM1_1.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM1_2.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM1_3.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_1.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_2.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_3.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_4.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_5.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_6.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_7.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_8.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_9.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_10.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_11.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_12.code,
|
||||
DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态"
|
||||
|
||||
DataCodeEnum.OMDB_VIADUCT.code -> "高架"
|
||||
|
||||
else -> ""
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取车道边界类型详细信息
|
||||
*/
|
||||
@ -296,6 +429,21 @@ class SignUtil {
|
||||
return result != 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取上下线分离值
|
||||
*/
|
||||
private fun getMultiDigitized(data: RenderEntity): String {
|
||||
|
||||
val multiDigitized = data.properties["multiDigitized"]
|
||||
try {
|
||||
if (multiDigitized?.toInt() == 1)
|
||||
return "上下线"
|
||||
} catch (e: Throwable) {
|
||||
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取限速值文字
|
||||
*/
|
||||
@ -490,10 +638,22 @@ class SignUtil {
|
||||
stringBuffer.append("当前道路")
|
||||
for (item in topSignList) {
|
||||
when (item.renderEntity.code) {
|
||||
DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> stringBuffer.append("功能等级${item.iconText.substring(2)}级,")
|
||||
DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> stringBuffer.append(
|
||||
"功能等级${
|
||||
item.iconText.substring(
|
||||
2
|
||||
)
|
||||
}级,"
|
||||
)
|
||||
DataCodeEnum.OMDB_RD_LINK_KIND.code -> stringBuffer.append("种别${item.iconText},")
|
||||
DataCodeEnum.OMDB_LINK_DIRECT.code -> stringBuffer.append("${item.iconText},")
|
||||
DataCodeEnum.OMDB_LANE_NUM.code -> stringBuffer.append("${item.iconText.substringBefore("|")}车道")
|
||||
DataCodeEnum.OMDB_LANE_NUM.code -> stringBuffer.append(
|
||||
"${
|
||||
item.iconText.substringBefore(
|
||||
"|"
|
||||
)
|
||||
}车道"
|
||||
)
|
||||
}
|
||||
}
|
||||
return stringBuffer.toString()
|
||||
@ -504,34 +664,32 @@ class SignUtil {
|
||||
*/
|
||||
fun getRoadNameList(data: RenderEntity): MutableList<RoadNameBean> {
|
||||
val list = mutableListOf<RoadNameBean>()
|
||||
if (data.code == "2011") {
|
||||
try {
|
||||
val shapeStr = data.properties["shapeList"]
|
||||
val array = JSONArray(shapeStr)
|
||||
for (i in 0 until array.length()) {
|
||||
val jsonObject = array.getJSONObject(0)
|
||||
val name = jsonObject.optString("name", "")
|
||||
val type = jsonObject.optInt("nameType", 0)
|
||||
val seqNum = jsonObject.optInt("seqNum", 1)
|
||||
val nameClass = jsonObject.optInt("nameClass", 1)
|
||||
val bean = RoadNameBean(
|
||||
name = name, type = type, seqNum = seqNum, nameClass = nameClass
|
||||
)
|
||||
list.add(bean)
|
||||
}
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
list.sortWith { n1, n2 ->
|
||||
if (n1.nameClass != n2.nameClass) {
|
||||
n1.nameClass.compareTo(n2.nameClass)
|
||||
} else {
|
||||
n1.seqNum.compareTo(n2.seqNum)
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
|
||||
try {
|
||||
val shapeStr = data.properties["shapeList"]
|
||||
val array = JSONArray(shapeStr)
|
||||
for (i in 0 until array.length()) {
|
||||
val jsonObject = array.getJSONObject(i)
|
||||
val name = jsonObject.optString("name", "")
|
||||
val type = jsonObject.optInt("nameType", 0)
|
||||
val seqNum = jsonObject.optInt("seqNum", 1)
|
||||
val nameClass = jsonObject.optInt("nameClass", 1)
|
||||
val bean = RoadNameBean(
|
||||
name = name, type = type, seqNum = seqNum, nameClass = nameClass
|
||||
)
|
||||
list.add(bean)
|
||||
}
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
list.sortWith { n1, n2 ->
|
||||
if (n1.nameClass != n2.nameClass) {
|
||||
n1.nameClass.compareTo(n2.nameClass)
|
||||
} else {
|
||||
n1.seqNum.compareTo(n2.seqNum)
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
|
||||
}
|
||||
return list
|
||||
}
|
||||
|
@ -82,7 +82,7 @@
|
||||
android:id="@+id/main_activity_top_sign_recyclerview"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="280dp"
|
||||
android:layout_marginLeft="220dp"
|
||||
android:layout_marginTop="2dp"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
@ -1,7 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
|
@ -4,161 +4,63 @@ package com.navinfo.collect.library.enums
|
||||
* 要素枚举定义
|
||||
* */
|
||||
enum class DataCodeEnum(var tableName: String, var code: String) {
|
||||
OMDB_CHECKPOINT("检查点", "1012"), OMDB_RD_LINK(
|
||||
"道路线",
|
||||
"2001"
|
||||
),
|
||||
OMDB_CHECKPOINT("检查点", "1012"),
|
||||
OMDB_RD_LINK("道路线", "2001"),
|
||||
OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
|
||||
OMDB_LINK_ATTRIBUTE("道路属性", "2004"),
|
||||
OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"), OMDB_LINK_ATTRIBUTE_PA(
|
||||
"道路属性-PA",
|
||||
"2004-2"
|
||||
),
|
||||
OMDB_LINK_ATTRIBUTE_FORNTAGE(
|
||||
"道路属性-辅路",
|
||||
"2004-3"
|
||||
),
|
||||
OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS(
|
||||
"道路属性-主辅路出入口",
|
||||
"2004-4"
|
||||
),
|
||||
OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"),
|
||||
OMDB_LINK_ATTRIBUTE_PA("道路属性-PA", "2004-2"),
|
||||
OMDB_LINK_ATTRIBUTE_FORNTAGE("道路属性-辅路", "2004-3"),
|
||||
OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS("道路属性-主辅路出入口", "2004-4"),
|
||||
OMDB_RD_LINK_KIND("道路种别", "2008"),
|
||||
OMDB_LINK_DIRECT("道路方向", "2010"), OMDB_LINK_NAME(
|
||||
"道路名",
|
||||
"2011"
|
||||
),
|
||||
OMDB_LINK_DIRECT("道路方向", "2010"),
|
||||
OMDB_LINK_NAME("道路名", "2011"),
|
||||
OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型", "2013"),
|
||||
OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"), OMDB_LINK_SPEEDLIMIT_COND(
|
||||
"条件线限速",
|
||||
"2020"
|
||||
),
|
||||
OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"),
|
||||
OMDB_LINK_SPEEDLIMIT_COND("条件线限速", "2020"),
|
||||
OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
|
||||
OMDB_CON_ACCESS("全封闭", "2022"),
|
||||
OMDB_RAMP(
|
||||
"匝道",
|
||||
"2037"
|
||||
),
|
||||
OMDB_RAMP_1(
|
||||
"普通路连接匝道",
|
||||
"2037-1"
|
||||
),
|
||||
OMDB_RAMP_2(
|
||||
"高速入口匝道",
|
||||
"2037-2"
|
||||
),
|
||||
OMDB_RAMP_3(
|
||||
"高速出口匝道",
|
||||
"2037-3"
|
||||
),
|
||||
OMDB_RAMP_4(
|
||||
"高速连接匝道",
|
||||
"2037-4"
|
||||
),
|
||||
OMDB_RAMP_5(
|
||||
"高速直连入口匝道",
|
||||
"2037-5"
|
||||
),
|
||||
OMDB_RAMP_6(
|
||||
"高速直连出口匝道",
|
||||
"2037-6"
|
||||
),
|
||||
OMDB_RAMP_7(
|
||||
"高速直连出口匝道高速出入口匝道",
|
||||
"2037-7"
|
||||
),
|
||||
OMDB_MULTI_DIGITIZED("上下线分离", "2040"), OMDB_LANE_NUM("车道数", "2041"),
|
||||
OMDB_RAMP("匝道", "2037"),
|
||||
OMDB_RAMP_1("普通路连接匝道", "2037-1"),
|
||||
OMDB_RAMP_2("高速入口匝道", "2037-2"),
|
||||
OMDB_RAMP_3("高速出口匝道", "2037-3"),
|
||||
OMDB_RAMP_4("高速连接匝道", "2037-4"),
|
||||
OMDB_RAMP_5("高速直连入口匝道", "2037-5"),
|
||||
OMDB_RAMP_6("高速直连出口匝道", "2037-6"),
|
||||
OMDB_RAMP_7("高速直连出口匝道高速出入口匝道", "2037-7"),
|
||||
OMDB_MULTI_DIGITIZED("上下线分离", "2040"),
|
||||
OMDB_LANE_NUM("车道数", "2041"),
|
||||
OMDB_VIADUCT("高架", "2043"),
|
||||
OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"), OMDB_BRIDGE(
|
||||
"桥",
|
||||
"2201"
|
||||
),
|
||||
OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"),
|
||||
OMDB_BRIDGE("桥", "2201"),
|
||||
OMDB_TUNNEL("隧道", "2202"),
|
||||
OMDB_ROUNDABOUT(
|
||||
"环岛",
|
||||
"2204"
|
||||
),
|
||||
OMDB_LINK_FORM1(
|
||||
"道路形态1",
|
||||
"2205"
|
||||
),
|
||||
OMDB_LINK_FORM1_1(
|
||||
"U-Turn",
|
||||
"2205-1"
|
||||
),
|
||||
OMDB_LINK_FORM1_2(
|
||||
"提前右转",
|
||||
"2205-2"
|
||||
),
|
||||
OMDB_LINK_FORM1_3(
|
||||
"提前左转",
|
||||
"2205-3"
|
||||
),
|
||||
OMDB_LINK_FORM2(
|
||||
"道路形态2",
|
||||
"2206"
|
||||
),
|
||||
OMDB_LINK_FORM2_1(
|
||||
"IC",
|
||||
"2206-1"
|
||||
),
|
||||
OMDB_LINK_FORM2_2(
|
||||
"JCT",
|
||||
"2206-2"
|
||||
),
|
||||
OMDB_LINK_FORM2_3(
|
||||
"跨线地道",
|
||||
"2206-3"
|
||||
),
|
||||
OMDB_LINK_FORM2_4(
|
||||
"私道",
|
||||
"2206-4"
|
||||
),
|
||||
OMDB_LINK_FORM2_5(
|
||||
"步行街",
|
||||
"2206-5"
|
||||
),
|
||||
OMDB_LINK_FORM2_6(
|
||||
"公交专用道",
|
||||
"2206-6"
|
||||
),
|
||||
OMDB_LINK_FORM2_7(
|
||||
"POI 连接路",
|
||||
"2206-7"
|
||||
),
|
||||
OMDB_LINK_FORM2_8(
|
||||
"区域内道路",
|
||||
"2206-8"
|
||||
),
|
||||
OMDB_LINK_FORM2_9(
|
||||
"停车场出入口连接路",
|
||||
"2206-9"
|
||||
),
|
||||
OMDB_LINK_FORM2_10(
|
||||
"停车场内部虚拟连接路",
|
||||
"2206-10"
|
||||
),
|
||||
OMDB_LINK_FORM2_11(
|
||||
"风景路线",
|
||||
"2206-11"
|
||||
),OMDB_LINK_FORM2_12(
|
||||
"车辆测试路段",
|
||||
"2206-12"
|
||||
),
|
||||
OMDB_LINK_FORM2_13(
|
||||
"驾照考试路段",
|
||||
"2206-13"
|
||||
),
|
||||
|
||||
OMDB_ROUNDABOUT("环岛", "2204"),
|
||||
OMDB_LINK_FORM1("道路形态1", "2205"),
|
||||
OMDB_LINK_FORM1_1("U-Turn", "2205-1"),
|
||||
OMDB_LINK_FORM1_2("提前右转", "2205-2"),
|
||||
OMDB_LINK_FORM1_3("提前左转", "2205-3"),
|
||||
OMDB_LINK_FORM2("道路形态2", "2206"),
|
||||
OMDB_LINK_FORM2_1("IC", "2206-1"),
|
||||
OMDB_LINK_FORM2_2("JCT", "2206-2"),
|
||||
OMDB_LINK_FORM2_3("跨线地道", "2206-3"),
|
||||
OMDB_LINK_FORM2_4("私道", "2206-4"),
|
||||
OMDB_LINK_FORM2_5("步行街", "2206-5"),
|
||||
OMDB_LINK_FORM2_6("公交专用道", "2206-6"),
|
||||
OMDB_LINK_FORM2_7("POI 连接路", "2206-7"),
|
||||
OMDB_LINK_FORM2_8("区域内道路", "2206-8"),
|
||||
OMDB_LINK_FORM2_9("停车场出入口连接路", "2206-9"),
|
||||
OMDB_LINK_FORM2_10("停车场内部虚拟连接路", "2206-10"),
|
||||
OMDB_LINK_FORM2_11("风景路线", "2206-11"),
|
||||
OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"),
|
||||
OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"),
|
||||
OMDB_INTERSECTION("路口", "4001"),
|
||||
OMDB_SPEEDLIMIT("常规点限速", "4002"), OMDB_SPEEDLIMIT_COND(
|
||||
"条件点限速",
|
||||
"4003"
|
||||
),
|
||||
OMDB_SPEEDLIMIT_VAR("可变点限速", "4004"), OMDB_RESTRICTION("普通交限", "4006"),
|
||||
OMDB_ELECTRONICEYE("电子眼", "4010"), OMDB_TRAFFICLIGHT(
|
||||
"交通灯",
|
||||
"4022"
|
||||
),
|
||||
OMDB_LANEINFO("车信", "4601"), OMDB_LANE_LINK_LG("车道中心线", "5001")
|
||||
OMDB_SPEEDLIMIT("常规点限速", "4002"),
|
||||
OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),
|
||||
OMDB_SPEEDLIMIT_VAR("可变点限速", "4004"),
|
||||
OMDB_RESTRICTION("普通交限", "4006"),
|
||||
OMDB_ELECTRONICEYE("电子眼", "4010"),
|
||||
OMDB_TRAFFICLIGHT("交通灯", "4022"),
|
||||
OMDB_LANEINFO("车信", "4601"),
|
||||
OMDB_LANE_LINK_LG("车道中心线", "5001")
|
||||
}
|
||||
|
||||
|
2
vtm
2
vtm
@ -1 +1 @@
|
||||
Subproject commit e6d60ddc82654754a1bd27f54f439dc7de23a31b
|
||||
Subproject commit bb130bcdbead90cf923d36c837af4afcdf846701
|
Loading…
x
Reference in New Issue
Block a user