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
commit f775267612
15 changed files with 180 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/omdb_config.json
View File

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

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
}

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 B

BIN
app/src/main/res/drawable-xxhdpi/icon_3005_8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

52
collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg
View File

@ -1,30 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="30px" height="28px" viewBox="0 0 30 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
<title>qita_icon</title>
<desc>Created with Sketch.</desc>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="84.6" height="40.5"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 84.6 40.5">
<defs>
<polygon id="path-1" points="0.0002 0.672 29.465 0.672 29.465 27.9996 0.0002 27.9996"></polygon>
<style>
.e{fill:#fad950;}.f{fill:#1e1e1e;}.g{fill:#0a0a0a;}.h{fill:url(#d);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1.2px;}
</style>
<linearGradient id="d" x1=".6" y1="20.3" x2="84" y2="20.3" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#afbacb" />
<stop offset=".1" stop-color="#c1ccda" />
<stop offset=".4" stop-color="#d9e6f0" />
<stop offset=".5" stop-color="#e3f0f8" />
<stop offset=".6" stop-color="#dde9f2" />
<stop offset=".8" stop-color="#ccd8e4" />
<stop offset="1" stop-color="#b1bbcc" />
<stop offset="1" stop-color="#aeb8c9" />
</linearGradient>
</defs>
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-432.000000, -394.000000)">
<g id="qita_icon-2" transform="translate(432.000000, 393.000000)">
<g id="qita_icon">
<g id="编组复制-25">
<g id="编组" transform="translate(0.000000, 0.328000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-2"></g>
<path d="M28.5572,27.9986 C29.0572,27.9986 29.4652,27.5706 29.4652,27.0356 C29.4652,26.8666 29.4212,26.6986 29.3432,26.5536 L15.5192,1.1546 C15.3582,0.8566 15.0582,0.6716 14.7302,0.6716 C14.4082,0.6716 14.1062,0.8566 13.9452,1.1546 L0.1172,26.5546 C0.0432,26.6996 0.0002,26.8686 0.0002,27.0366 C0.0002,27.5666 0.4062,27.9996 0.9092,27.9996 L28.5572,27.9986 Z" id="Fill-1" fill="#100808" mask="url(#mask-2)"></path>
</g>
<polygon id="Fill-3" fill="#F7BD42" points="25.4156 25.4369 4.0526 25.4369 14.7326 5.8169"></polygon>
</g>
<circle id="椭圆形" fill="#000000" cx="10.3" cy="19.3" r="1.3"></circle>
<circle id="椭圆形复制-9" fill="#000000" cx="14.8" cy="19.3" r="1.3"></circle>
<circle id="椭圆形复制-10" fill="#000000" cx="19.3" cy="19.3" r="1.3"></circle>
</g>
<g id="c">
<g>
<rect class="h" x=".6" y=".6" width="83.4" height="39.3" rx="4.6" ry="4.6" />
<g>
<path class="e"
d="M5.8,4.4H78.8c1.4,0,2.6,1.1,2.6,2.6v28.8c0,1.4-1.1,2.6-2.6,2.6H5.8c-1.4,0-2.6-1.1-2.6-2.6V7c0-1.4,1.1-2.6,2.6-2.6Z" />
<path class="g"
d="M78.8,6.5c.3,0,.5,.2,.5,.5v28.8c0,.3-.2,.5-.5,.5H5.8c-.3,0-.5-.2-.5-.5V7c0-.3,.2-.5,.5-.5H78.8m0-4.1H5.8C3.3,2.4,1.2,4.4,1.2,7v28.8c0,2.6,2.1,4.6,4.6,4.6H78.8c2.6,0,4.6-2.1,4.6-4.6V7c0-2.6-2.1-4.6-4.6-4.6h0Z" />
</g>
</g>
<g>
<path class="f"
d="M27.6,22.5c-.3-.5-.7-1-1-1.4v6.9h-1.5v-6.6c-.5,1.1-1.1,2.2-1.6,3.1l-1-1.3c.8-1.2,1.9-3.2,2.5-4.9h-1.7v-1.5h1.8v-2.8h1.5v2.8h1.5v1.5h-1.5v1.4l.2-.2c.5,.5,1.3,1.5,1.7,2.1l-1,1Zm3.2-.8c-.5,1.6-1.4,3.8-2.2,5.2l-1.4-.8c.8-1.4,1.7-3.5,2.2-5l1.4,.6Zm2.3-1.4v6.1c0,1.3-.5,1.5-1.8,1.7h-.8c0,0-.5-1.5-.5-1.5h.8c.7-.1,.8-.2,.8-.8v-5.4h-3.4v-1.6h8.6v1.6h-3.7Zm2.9-3.9h-7.2v-1.6h7.2v1.6Zm-1.1,4.8c.5,1.2,1.7,3.7,2.1,5l-1.4,.7c-.4-1.2-1.5-3.8-2-5.1l1.3-.6Z" />
<path class="f"
d="M48.9,21.4h2.5v6.5h-1.3v-5h-1.2c-.1,2.3-.5,3.7-1.2,5.3l-1.4-.7c.9-2.2,1.3-3.2,1.3-7v-6h1.4v3.9h1.1v-4.2h1.3v4.2h1v1.5h-3.3v1.5Zm11.5,4.1h-3.2v2.5h-1.5v-2.5h-4v-1.4h1.3l-.4-.5c.7-.5,1.3-.8,1.7-1.3h-1.9v-7h2.2c.2-.6,.5-1.3,.6-1.7l1.5,.4c-.1,.3-.3,.8-.5,1.3h3.2v7h-3.7c-.4,.7-1,1.3-1.7,1.9h1.5v-1.5h1.5v1.5h3.2v1.4Zm-6.6-8.9v1.5h1.6v-1.5h-1.6Zm1.3,4.3c.1-.4,.2-.9,.2-1.5h-1.5v1.5h1.3Zm3.1,0v-1.5h-1.6c0,.5-.1,1-.2,1.5h1.8Zm0-4.3h-1.5v1.5h1.5v-1.5Z" />
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

30
collect-library/src/main/assets/omdb/appendix/1105_00101_01.svg Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="30px" height="28px" viewBox="0 0 30 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
<title>qita_icon</title>
<desc>Created with Sketch.</desc>
<defs>
<polygon id="path-1" points="0.0002 0.672 29.465 0.672 29.465 27.9996 0.0002 27.9996"></polygon>
</defs>
<g id="待定" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="工具栏汇总复制" transform="translate(-432.000000, -394.000000)">
<g id="qita_icon-2" transform="translate(432.000000, 393.000000)">
<g id="qita_icon">
<g id="编组复制-25">
<g id="编组" transform="translate(0.000000, 0.328000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-2"></g>
<path d="M28.5572,27.9986 C29.0572,27.9986 29.4652,27.5706 29.4652,27.0356 C29.4652,26.8666 29.4212,26.6986 29.3432,26.5536 L15.5192,1.1546 C15.3582,0.8566 15.0582,0.6716 14.7302,0.6716 C14.4082,0.6716 14.1062,0.8566 13.9452,1.1546 L0.1172,26.5546 C0.0432,26.6996 0.0002,26.8686 0.0002,27.0366 C0.0002,27.5666 0.4062,27.9996 0.9092,27.9996 L28.5572,27.9986 Z" id="Fill-1" fill="#100808" mask="url(#mask-2)"></path>
</g>
<polygon id="Fill-3" fill="#F7BD42" points="25.4156 25.4369 4.0526 25.4369 14.7326 5.8169"></polygon>
</g>
<circle id="椭圆形" fill="#000000" cx="10.3" cy="19.3" r="1.3"></circle>
<circle id="椭圆形复制-9" fill="#000000" cx="14.8" cy="19.3" r="1.3"></circle>
<circle id="椭圆形复制-10" fill="#000000" cx="19.3" cy="19.3" r="1.3"></circle>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

59
collect-library/src/main/assets/omdb/appendix/1105_00101_0_s.svg Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="124.7" height="124.8"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 124.7 124.8">
<defs>
<style>
.h{fill:url(#f);}.i{fill:#fad950;}.j{fill:#0a0a0a;}.k,.l{fill:#535a60;}.m{fill:#262d34;isolation:isolate;opacity:.2;}.n{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1px;}.l{opacity:0;}
</style>
<linearGradient id="f" x1="60.1" y1="50" x2="64.9" y2="50" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#989898" />
<stop offset="0" stop-color="#a3a3a3" />
<stop offset=".1" stop-color="#c4c5c5" />
<stop offset=".2" stop-color="#d8d9d9" />
<stop offset=".3" stop-color="#e0e1e1" />
<stop offset=".4" stop-color="#dbdcdc" />
<stop offset=".5" stop-color="#cccece" />
<stop offset=".6" stop-color="#b5b6b7" />
<stop offset=".7" stop-color="#949697" />
<stop offset=".8" stop-color="#6a6c6f" />
<stop offset=".8" stop-color="#3f4246" />
<stop offset="1" stop-color="#404247" />
<stop offset="1" stop-color="#43434a" />
</linearGradient>
<linearGradient id="g" x1="-422.2" y1="-703.9" x2="-375.8" y2="-703.9"
gradientTransform="translate(845.1 -193.1) rotate(-76.1)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#afbacb" />
<stop offset=".1" stop-color="#c1ccda" />
<stop offset=".4" stop-color="#d9e6f0" />
<stop offset=".5" stop-color="#e3f0f8" />
<stop offset=".6" stop-color="#dde9f2" />
<stop offset=".8" stop-color="#ccd8e4" />
<stop offset="1" stop-color="#b1bbcc" />
<stop offset="1" stop-color="#aeb8c9" />
</linearGradient>
</defs>
<g id="c">
<g>
<rect class="l" y="0" width="124.7" height="124.7" />
<g>
<ellipse id="d" class="m" cx="62.4" cy="61.4" rx="14.4" ry="3.7" />
<ellipse id="e" class="k" cx="62.4" cy="61.4" rx="7.5" ry="3" />
<path class="h"
d="M62.4,37.9h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z" />
<g>
<path class="n"
d="M64.8,1.9l22.1,36.4c1.1,1.9-.2,4.3-2.4,4.3H40.3c-2.2,0-3.6-2.4-2.4-4.3L59.9,1.9c1.1-1.8,3.7-1.8,4.8,0Z" />
<g>
<path class="i"
d="M40.4,41c-.3,0-.4-.2-.5-.3,0-.1-.1-.4,0-.6L61.8,5.2c.1-.2,.3-.3,.5-.3s.4,0,.5,.3l21.8,34.9c.2,.2,0,.5,0,.6,0,.1-.2,.3-.5,.3H40.4Z" />
<path class="j"
d="M62.3,8.7l18.8,30.1H43.4L62.3,8.7m0-6c-.9,0-1.8,.4-2.4,1.3l-21.8,34.9c-1.2,1.9,.2,4.3,2.4,4.3h43.7c2.2,0,3.6-2.4,2.4-4.3L64.7,4.1c-.6-.9-1.5-1.3-2.4-1.3h0Z" />
</g>
</g>
</g>
<path
d="M62.1,32.5c.6,0,1.1,.2,1.5,.6,.4,.4,.6,.9,.6,1.5s-.2,1-.6,1.4c-.4,.4-.9,.6-1.5,.6s-1.1-.2-1.5-.6c-.4-.4-.6-.9-.6-1.4s.2-1.1,.6-1.5c.4-.4,.9-.6,1.5-.6Zm1.8-14.8l-.4,12.8h-2.8l-.4-12.8h3.6Z" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB