From 51b021ba5966f549d80a56e2f4a5e2a0b38259dd Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Wed, 27 Sep 2023 11:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=96=B9=E9=9A=9C?= =?UTF-8?q?=E7=A2=8D=E7=89=A9=EF=BC=8C=E7=AC=A6=E5=8F=B7=EF=BC=8C=E8=B7=AF?= =?UTF-8?q?=E5=8F=A3=E5=86=85=E4=BA=A4=E9=80=9A=E5=B2=9B=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signMoreInfo/SignMoreInfoFragment.kt | 2 +- .../java/com/navinfo/omqs/util/SignUtil.kt | 77 ++++++++++++++++++- .../collect/library/enums/DataCodeEnum.kt | 2 + 3 files changed, 76 insertions(+), 5 deletions(-) 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 2ecf8477..37023521 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 @@ -101,7 +101,7 @@ class SignMoreInfoFragment : BaseFragment() { DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> { val adapter = TwoItemAdapter() binding.signInfoRecyclerview.adapter = adapter - adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it)) + adapter.refreshData(SignUtil.getTrafficSignMoreInfo(it.renderEntity)) } else -> { val adapter = SignUtil.getMoreInfoAdapter(it.renderEntity) diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index ebe4a882..705c7fce 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -1,7 +1,6 @@ package com.navinfo.omqs.util import android.util.Log -import androidx.lifecycle.lifecycleScope import com.navinfo.collect.library.data.entity.RenderEntity import com.navinfo.collect.library.enums.DataCodeEnum import com.navinfo.collect.library.utils.FootAndDistance @@ -17,7 +16,6 @@ import com.navinfo.omqs.ui.fragment.signMoreInfo.TwoItemAdapterItem import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.json.JSONArray import org.json.JSONObject import org.locationtech.jts.geom.Geometry @@ -432,6 +430,7 @@ class SignUtil { ) ) } + //停止位置 DataCodeEnum.OMDB_OBJECT_STOPLOCATION.code -> { list.add( TwoItemAdapterItem( @@ -501,6 +500,7 @@ class SignUtil { ) ) } + //文字 DataCodeEnum.OMDB_OBJECT_TEXT.code -> { list.add( TwoItemAdapterItem( @@ -545,7 +545,75 @@ class SignUtil { ) ) } - + //上方障碍物 + DataCodeEnum.OMDB_OBJECT_OH_STRUCT.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", + text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "车道组", text = "${data.properties["lgId"]}" + ) + ) + } + DataCodeEnum.OMDB_OBJECT_SYMBOL.code -> { + list.add( + TwoItemAdapterItem( + title = "对象号码", + text = "${data.properties["objectPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "颜色", + text = when (data.properties["color"]) { + "0" -> "未验证" + "1" -> "白色" + "2" -> "黄色" + "3" -> "红色" + "4" -> "彩色" + "9" -> "其他" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "符合高精", text = when (data.properties["compliant"]) { + "0" -> "否" + "1" -> "是" + else -> "" + } + ) + ) + list.add( + TwoItemAdapterItem( + title = "关联车道中心线", text = "${data.properties["laneLinkPid"]}" + ) + ) + list.add( + TwoItemAdapterItem( + title = "长度", text = "${data.properties["length"]}mm" + ) + ) + list.add( + TwoItemAdapterItem( + title = "宽度", text = "${data.properties["width"]}mm" + ) + ) + } } adapter.data = list return adapter @@ -838,7 +906,8 @@ class SignUtil { val job = scope.launch(Dispatchers.IO) { val typeCode = data.properties["typeCode"] if (typeCode != null) { - describe = roomAppDatabase.getScWarningCodeDao().findScWarningDescribe(typeCode).toString() + describe = roomAppDatabase.getScWarningCodeDao() + .findScWarningDescribe(typeCode).toString() } } job.join() diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt index c7362231..3a3b4f1d 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt @@ -57,6 +57,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_FORM2_11("风景路线", "2206-11"), OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"), OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"), + OMDB_OBJECT_OH_STRUCT("上方障碍物","3001"), OMDB_OBJECT_TEXT("文字", "3002"), OMDB_OBJECT_SYMBOL("符号", "3003"), OMDB_OBJECT_ARROW("箭头", "3004"), @@ -65,6 +66,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_FILL_AREA("导流区", "3012"), OMDB_CROSS_WALK("人行横道", "3014"), OMDB_OBJECT_STOPLOCATION("停止位置", "3016"), + OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛","3027"), OMDB_INTERSECTION("路口", "4001"), OMDB_SPEEDLIMIT("常规点限速", "4002"), OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),