增加条件线限速的展示

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

@@ -331,7 +331,7 @@ class RealmOperateHelper() {
         val result = mutableListOf<RenderEntity>()
         val realm = getSelectTaskRealmInstance()
         val realmList = getSelectTaskRealmTools(RenderEntity::class.java, false)
-            .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK_KIND.name)
+            .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
             .equalTo("properties['${LinkTable.linkPid}']", linkPid)
             .findAll()
         result.addAll(realm.copyFromRealm(realmList))

app/src/main/java/com/navinfo/omqs/tools/MetadataUtils.kt

@@ -13,7 +13,7 @@ class MetadataUtils {
 
         object ScRootCauseAnalysisTitle {
             const val TITLE_PROBLEM_LINK = "问题环节"
-            const val TITLE_PROBLEM_CAUSE = "初步问题原因"
+            const val TITLE_PROBLEM_CAUSE = "初步分析"
         }
     }
 }

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

@@ -756,11 +756,14 @@ class MainViewModel @Inject constructor(
 
                         val linePoints = GeometryTools.getGeoPoints(link.geometry)
                         val direct = link.properties["direct"]
-                        if(direct == "3"){
+                        if (direct == "3") {
                             linePoints.reverse()
                         }
 
-                        val footAndDistance = GeometryTools.pointToLineDistance(point, GeometryTools.createLineString(linePoints))
+                        val footAndDistance = GeometryTools.pointToLineDistance(
+                            point,
+                            GeometryTools.createLineString(linePoints)
+                        )
                         linePoints.add(
                             footAndDistance.footIndex + 1,
                             GeoPoint(
@@ -810,6 +813,7 @@ class MainViewModel @Inject constructor(
                                     DataCodeEnum.OMDB_RD_LINK_KIND.code,//种别，
                                     DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, // 功能等级,
                                     DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code, //线限速,
+                                    DataCodeEnum.OMDB_LINK_SPEEDLIMIT_COND.code,//条件线限速
                                     DataCodeEnum.OMDB_LINK_DIRECT.code,//道路方向,
                                     DataCodeEnum.OMDB_RAMP.code, //匝道
                                     DataCodeEnum.OMDB_BRIDGE.code,//桥

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

@@ -89,6 +89,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
 
         //返回按钮点击
         binding.evaluationBar.setOnClickListener {
+            it.isEnabled = false
             val mDialog = FirstDialog(context)
             mDialog.setTitle("提示？")
             mDialog.setMessage("是否退出，请确认！")
@@ -98,7 +99,10 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
                 mDialog.dismiss()
                 onBackPressed()
             }
-            mDialog.setNegativeButton("取消", null)
+            mDialog.setNegativeButton("取消") { _, _ ->
+                mDialog.dismiss()
+                it.isEnabled = true
+            }
             mDialog.show()
         }
 
@@ -199,7 +203,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
         viewModel.liveDataToastMessage.observe(viewLifecycleOwner) {
             Toast.makeText(requireContext(), it, Toast.LENGTH_SHORT).show()
         }
-        viewModel.liveDataQsRecordBean.observe(viewLifecycleOwner){
+        viewModel.liveDataQsRecordBean.observe(viewLifecycleOwner) {
             binding.evaluationId.text = it.id
         }
 

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

@@ -50,6 +50,10 @@ class SignUtil {
                 DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> {
                     "${data.properties["maxSpeed"]}"
                 }
+                //条件线限速
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT_COND.code -> {
+                    "${data.properties["maxSpeed"]}"
+                }
                 //全封闭
                 DataCodeEnum.OMDB_CON_ACCESS.code -> {
                     if (data.properties["conAccess"] === "1") "全封闭" else ""
@@ -130,6 +134,8 @@ class SignUtil {
                 DataCodeEnum.OMDB_LINK_DIRECT.code -> "方向"
                 //常规线限速
                 DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> "线限速"
+                //条件线限速
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT_COND.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 -> "道路属性"
 
@@ -870,13 +876,11 @@ class SignUtil {
                 )
             )
             val carType = renderEntity.properties["vehicleType"]
-            if (carType != "0") {
-                list.add(
-                    TwoItemAdapterItem(
-                        title = "车辆类型", text = getElectronicEyeVehicleType(carType!!.toInt())
-                    )
+            list.add(
+                TwoItemAdapterItem(
+                    title = "车辆类型", text = getElectronicEyeVehicleType(carType!!.toInt())
                 )
-            }
+            )
             val time = renderEntity.properties["validPeriod"]
             if (time?.isNotEmpty() == true) {
                 list.add(
@@ -893,7 +897,7 @@ class SignUtil {
          * 条件点限速文字
          */
         private fun getConditionLimitText(data: RenderEntity): String {
-            var stringBuffer = StringBuffer()
+            val stringBuffer = StringBuffer()
             try {
                 val dependent = data.properties["speedDependent"]
                 dependent?.let {
@@ -1515,7 +1519,8 @@ class SignUtil {
                 DataCodeEnum.OMDB_RD_LINK_KIND.code -> 1
                 DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> 2
                 DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> 3
-                DataCodeEnum.OMDB_LINK_DIRECT.code -> 4
+                DataCodeEnum.OMDB_LINK_SPEEDLIMIT_COND.code -> 4
+                DataCodeEnum.OMDB_LINK_DIRECT.code -> 5
                 else -> 999
             }
         }
@@ -1631,8 +1636,8 @@ class SignUtil {
             } else if (itemGeometry is LineString) {
                 val itemFoot = GeometryTools.pointToLineDistance(
                     GeoPoint(
-                        lineString.coordinates[lineString.coordinates.size-1].y,
-                        lineString.coordinates[lineString.coordinates.size-1].x
+                        lineString.coordinates[lineString.coordinates.size - 1].y,
+                        lineString.coordinates[lineString.coordinates.size - 1].x
                     ), lineString
                 )
                 var dis = GeometryTools.getDistance(
@@ -1649,7 +1654,5 @@ class SignUtil {
             }
             return 0
         }
-
     }
-
 }

vtm

@@ -1 +1 @@
-Subproject commit 719c44b65d3ed26d725b24b3a5366b281c9e4fad
+Subproject commit 39b9993b1cc5257d11c872161812ffe890e44bd9