增加上方障碍物，符号，路口内交通岛 详情

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)

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()

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"),