xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	vtm
This commit is contained in:
squallzhjch
2023-09-20 16:21:40 +08:00
parent 7d29ce2309 2eb8528f98
commit f775267612
15 changed files with 180 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"
}

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

@@ -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)
}
}
}

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

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

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

@@ -810,6 +810,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 -> ""
}
}
@@ -1031,6 +1067,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
}