diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 04357aa9..c4b09ded 100644 --- a/app/src/main/assets/omdb_config.json +++ b/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 }, diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 9dc13333..4281b648 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -845,9 +845,7 @@ class ImportPreProcess { val listResult = mutableListOf() 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" } diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt index a6fff588..d0f840ca 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt +++ b/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) + } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt index 16168314..258ec4ec 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt +++ b/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) 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 cbda1321..47bf4c38 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/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 } diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_1.png b/app/src/main/res/drawable-xxhdpi/icon_3005_1.png new file mode 100644 index 00000000..4c76e442 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_1.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_2.png b/app/src/main/res/drawable-xxhdpi/icon_3005_2.png new file mode 100644 index 00000000..6f718c50 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_2.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_3.png b/app/src/main/res/drawable-xxhdpi/icon_3005_3.png new file mode 100644 index 00000000..ee76722e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_3.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_4.png b/app/src/main/res/drawable-xxhdpi/icon_3005_4.png new file mode 100644 index 00000000..4b3e9e7b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_4.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_6.png b/app/src/main/res/drawable-xxhdpi/icon_3005_6.png new file mode 100644 index 00000000..7de74751 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_6.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_7.png b/app/src/main/res/drawable-xxhdpi/icon_3005_7.png new file mode 100644 index 00000000..0b004760 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_7.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_3005_8.png b/app/src/main/res/drawable-xxhdpi/icon_3005_8.png new file mode 100644 index 00000000..b9c2f9cf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_3005_8.png differ diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg index 7e87f75d..18fca483 100644 --- a/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg @@ -1,30 +1,36 @@ - - - qita_icon - Created with Sketch. + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg new file mode 100644 index 00000000..7e87f75d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg @@ -0,0 +1,30 @@ + + + + qita_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg new file mode 100644 index 00000000..172175ad --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vtm b/vtm index f2af87c6..3d9400fb 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit f2af87c6a012ac41d6f22a77d6b45853b250ed3e +Subproject commit 3d9400fb6aa671ff05dceb616e412f024b2e4440