增加任务错误数据容错2.增加交通标牌详情显示

app/src/main/assets/omdb_config.json

@@ -7,6 +7,7 @@
 				"code": 1007,
 				"name": "点形态",
 				"existSubCode": true,
+				"checkLinkId": false,
 				"zoomMin": 15,
 				"zoomMax": 20
 			},
@@ -15,6 +16,7 @@
 				"code": 1007,
 				"name": "点形态PA",
 				"existSubCode": true,
+				"checkLinkId": false,
 				"zoomMin": 15,
 				"zoomMax": 20
 			},

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

@@ -845,9 +845,7 @@ class ImportPreProcess {
         val listResult = mutableListOf<ReferenceEntity>()
 
         val coorEnd = Coordinate(pointStart.getX() + dx, pointStart.getY() + dy, pointStart.z)
-        renderEntity.geometry =
-            WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
-
+        renderEntity.geometry = WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
         val code = renderEntity.properties["signType"]
         renderEntity.properties["src"] = "assets:omdb/appendix/1105_${code}_0.svg"
     }

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

@@ -271,6 +271,7 @@ class LoginViewModel @Inject constructor(
                     realm.executeTransaction {
                         result.data.obj?.let { list ->
                             for (index in list.indices) {
+                                var  inSertData = true
                                 val task = list[index]
                                 val item = realm.where(TaskBean::class.java).equalTo(
                                     "id", task.id
@@ -287,12 +288,20 @@ class LoginViewModel @Inject constructor(
                                     }
                                 } else {
                                     for (hadLink in task.hadLinkDvoList) {
-                                        hadLink.taskId = task.id
+                                        if(hadLink.geometry==null||hadLink.mesh==null){
+                                            inSertData = false
+                                        }else{
+                                            hadLink.taskId = task.id
+                                        }
+                                        Log.e("qj","mesh==${hadLink.mesh}")
                                     }
                                     //赋值时间，用于查询过滤
                                     task.operationTime = DateTimeUtil.getNowDate().time
                                 }
-                                realm.copyToRealmOrUpdate(task)
+                                Log.e("qj","task==${task.id}")
+                                if(inSertData){
+                                    realm.copyToRealmOrUpdate(task)
+                                }
                             }
                         }
 

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

@@ -475,7 +475,10 @@ class EvaluationResultViewModel @Inject constructor(
                             p.latitude, p.longitude
                         ), TAG, "", null
                     )
-
+                    //定位
+                    val mapPosition = mapController.mMapView.vtmMap.mapPosition
+                    mapPosition.setPosition(p.latitude, p.longitude)
+                    mapController.mMapView.vtmMap.animator().animateTo(300, mapPosition)
                     //获取linkid
                     if (it.linkId.isNotEmpty()) {
                         val link = realmOperateHelper.queryLink(it.linkId)

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

@@ -805,6 +805,42 @@ class SignUtil {
                         return ""
                     }
                 }
+                DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> {
+                    var color = data.properties["color"]
+                    if (color != null) {
+                        when(color){
+                            "0"->{
+                               return "颜色：未验证"
+                            }
+                            "1"->{
+                                return "颜色：白色"
+                            }
+                            "2"->{
+                                return "颜色：黄色"
+                            }
+                            "3"->{
+                                return "颜色：红色"
+                            }
+                            "5"->{
+                                return "颜色：棕色"
+                            }
+                            "6"->{
+                                return "颜色：蓝色"
+                            }
+                            "7"->{
+                                return "颜色：绿色"
+                            }
+                            "8"->{
+                                return "颜色：黑色"
+                            }
+                            "9"->{
+                                return "颜色：其他"
+                            }
+                        }
+
+                    }
+                    return "颜色：未验证"
+                }
                 else -> ""
             }
         }
@@ -1026,6 +1062,14 @@ class SignUtil {
                     }
                     return 0
                 }
+                DataCodeEnum.OMDB_TRAFFIC_SIGN.code -> {
+                    var trafsignShape = data.properties["trafsignShape"]
+                    if (trafsignShape != null) {
+                        trafsignShape = "icon_${DataCodeEnum.OMDB_TRAFFIC_SIGN.code}_${trafsignShape.lowercase()}"
+                        return getResId(trafsignShape, R.drawable::class.java)
+                    }
+                    return 0
+                }
                 else -> 0
             }