增加车道边界类型实线渲染样式2.修复数据无法上传问题
This commit is contained in:
qiji4215
parent
e37d7bc38f
commit
4b91feca22
@ -125,10 +125,13 @@ class TaskUploadScope(
|
|||||||
}
|
}
|
||||||
|
|
||||||
taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
|
taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
|
||||||
|
Log.e("jingo", "数据上传遍历开始")
|
||||||
|
|
||||||
val linkStatus = 1
|
val linkStatus = 1
|
||||||
//存在原因标记未测评
|
//存在原因标记未测评
|
||||||
if (hadLinkDvoBean.reason.isNotEmpty()) {
|
if (hadLinkDvoBean.reason.isNotEmpty()) {
|
||||||
|
Log.e("jingo", "数据上传遍历开始0${hadLinkDvoBean.linkPid}")
|
||||||
|
|
||||||
//未测评
|
//未测评
|
||||||
val linkStatus = 0
|
val linkStatus = 0
|
||||||
|
|
||||||
@ -160,6 +163,8 @@ class TaskUploadScope(
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
Log.e("jingo", "数据上传遍历开始1${hadLinkDvoBean.linkPid}")
|
||||||
|
|
||||||
val linkStatus = hadLinkDvoBean.linkStatus
|
val linkStatus = hadLinkDvoBean.linkStatus
|
||||||
|
|
||||||
var s: String = "%.3f".format(hadLinkDvoBean.length)//保留一位小数(且支持四舍五入)
|
var s: String = "%.3f".format(hadLinkDvoBean.length)//保留一位小数(且支持四舍五入)
|
||||||
@ -221,8 +226,9 @@ class TaskUploadScope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
realm.close()
|
Log.e("jingo", "数据上传遍历结束")
|
||||||
}
|
}
|
||||||
|
realm.close()
|
||||||
|
|
||||||
if (bodyList.size > 0) {
|
if (bodyList.size > 0) {
|
||||||
val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
|
val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
|
||||||
|
|||||||
@ -505,7 +505,6 @@ class TaskViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
if(result==1){
|
if(result==1){
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
liveDataTaskUpload.postValue(map)
|
|
||||||
val mDialog = FirstDialog(context)
|
val mDialog = FirstDialog(context)
|
||||||
mDialog.setTitle("提示？")
|
mDialog.setTitle("提示？")
|
||||||
mDialog.setMessage("此任务中存在新增Link无问题记录，请添加至少一条记录！")
|
mDialog.setMessage("此任务中存在新增Link无问题记录，请添加至少一条记录！")
|
||||||
@ -519,7 +518,6 @@ class TaskViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
}else if(result==2){
|
}else if(result==2){
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
liveDataTaskUpload.postValue(map)
|
|
||||||
val mDialog = FirstDialog(context)
|
val mDialog = FirstDialog(context)
|
||||||
mDialog.setTitle("提示？")
|
mDialog.setTitle("提示？")
|
||||||
mDialog.setMessage("此任务中存在未测评link，请确认！")
|
mDialog.setMessage("此任务中存在未测评link，请确认！")
|
||||||
|
|||||||
@ -1639,15 +1639,19 @@
|
|||||||
|
|
||||||
<outline-layer id="boundary" stroke="#ffffff" width="0.1" />
|
<outline-layer id="boundary" stroke="#ffffff" width="0.1" />
|
||||||
|
|
||||||
<!--只区分虚线与实线-->
|
<!--护栏-->
|
||||||
<!-- <m k="boundaryType" v="1">
|
<m k="boundaryType" v="4">
|
||||||
<line dasharray="5,5" repeat-start="5" stroke="#90A0BD" width="0.05"/>
|
<line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
|
||||||
</m>-->
|
<symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="46"></symbol>
|
||||||
|
</m>
|
||||||
|
<!--路牙-->
|
||||||
|
<m k="boundaryType" v="3">
|
||||||
|
<symbol repeat="true" repeat-gap="10" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
|
||||||
|
</m>
|
||||||
|
|
||||||
<m k="boundaryType" v="2">
|
<m k="boundaryType" v="2">
|
||||||
<!--标线-->
|
<!--标线-->
|
||||||
<m k="markType" v="0|1|4|5|6|7|8">
|
<m k="markType" v="1">
|
||||||
<!--其他|实线-->
|
|
||||||
<m k="markColor" v="1">
|
<m k="markColor" v="1">
|
||||||
<line stroke="#ffffff" use="boundaryType" />
|
<line stroke="#ffffff" use="boundaryType" />
|
||||||
</m>
|
</m>
|
||||||
@ -1667,11 +1671,7 @@
|
|||||||
<line stroke="#8e44ad" use="boundaryType" />
|
<line stroke="#8e44ad" use="boundaryType" />
|
||||||
</m>
|
</m>
|
||||||
</m>
|
</m>
|
||||||
<m k="markType" v="2|3">
|
<m k="markType" v="2">
|
||||||
<!--其他|实线-->
|
|
||||||
<m v="0|1|2|3|4|5|6|7|8">
|
|
||||||
|
|
||||||
<!--其他|实线-->
|
|
||||||
<m k="markColor" v="1">
|
<m k="markColor" v="1">
|
||||||
<line dasharray="2,2" repeat-start="0" stroke="#ffffff" width="0.1"/>
|
<line dasharray="2,2" repeat-start="0" stroke="#ffffff" width="0.1"/>
|
||||||
</m>
|
</m>
|
||||||
@ -1690,19 +1690,50 @@
|
|||||||
<m k="markColor" v="0|9">
|
<m k="markColor" v="0|9">
|
||||||
<line dasharray="2,2" repeat-start="0" stroke="#8e44ad" width="0.1"/>
|
<line dasharray="2,2" repeat-start="0" stroke="#8e44ad" width="0.1"/>
|
||||||
</m>
|
</m>
|
||||||
|
</m>
|
||||||
|
<m k="markType" v="8">
|
||||||
|
<m k="markColor" v="1">
|
||||||
|
<line dasharray="1,1" repeat-start="0" stroke="#ffffff" width="0.1"/>
|
||||||
|
</m>
|
||||||
|
<m k="markColor" v="2">
|
||||||
|
<line dasharray="1,1" repeat-start="0" stroke="#eccc68" width="0.1"/>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="6">
|
||||||
|
<line dasharray="1,1" repeat-start="0" stroke="#0000ff" width="0.1"/>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="7">
|
||||||
|
<line dasharray="1,1" repeat-start="0" stroke="#00ff00" width="0.1"/>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="0|9">
|
||||||
|
<line dasharray="1,1" repeat-start="0" stroke="#8e44ad" width="0.1"/>
|
||||||
|
</m>
|
||||||
|
</m>
|
||||||
|
<m k="markType" v="6">
|
||||||
|
<!--其他|实线-->
|
||||||
|
<m k="markColor" v="1">
|
||||||
|
<symbol repeat="true" repeat-start="0" repeat-gap="24" src="assets:omdb/icon_2013_1.svg"/>
|
||||||
|
</m>
|
||||||
|
<m k="markColor" v="2">
|
||||||
|
<symbol repeat="true" repeat-start="0" repeat-gap="24" src="assets:omdb/icon_2013_2.svg"></symbol>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="6">
|
||||||
|
<symbol repeat="true" repeat-start="0" repeat-gap="24" src="assets:omdb/icon_2013_6.svg"></symbol>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="7">
|
||||||
|
<symbol repeat="true" repeat-start="0" repeat-gap="24" src="assets:omdb/icon_2013_7.svg"></symbol>
|
||||||
|
</m>
|
||||||
|
|
||||||
|
<m k="markColor" v="0|9">
|
||||||
|
<symbol repeat="true" repeat-start="0" repeat-gap="24" src="assets:omdb/icon_2013_0.svg"></symbol>
|
||||||
</m>
|
</m>
|
||||||
</m>
|
</m>
|
||||||
</m>
|
</m>
|
||||||
<!--护栏-->
|
|
||||||
<m k="boundaryType" v="4">
|
|
||||||
<line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
|
|
||||||
<symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="46"></symbol>
|
|
||||||
</m>
|
|
||||||
<!--路牙-->
|
|
||||||
<m k="boundaryType" v="3">
|
|
||||||
<symbol repeat="true" repeat-gap="10" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
|
|
||||||
</m>
|
|
||||||
<m k="boundaryType" v="5|7">
|
<m k="boundaryType" v="5|7">
|
||||||
<line stroke="#ffffff" use="boundaryType" />
|
<line stroke="#ffffff" use="boundaryType" />
|
||||||
</m>
|
</m>
|
||||||
|
|||||||
11
collect-library/src/main/assets/omdb/icon_2013_0.svg
Normal file
11
collect-library/src/main/assets/omdb/icon_2013_0.svg
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg t="1695622778812" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg" p-id="8830" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
width="48" height="48">
|
||||||
|
<path
|
||||||
|
d="M284.444444 227.555556h739.555556L739.555556 796.444444H0L284.444444 227.555556z m26.368 42.666666l-241.777777 483.555556h644.152889l241.777777-483.555556H310.812444z"
|
||||||
|
fill="#8e44ad" p-id="8831"></path>
|
||||||
|
<path d="M310.812444 270.222222l-241.777777 483.555556h644.152889l241.777777-483.555556z"
|
||||||
|
fill="#8e44ad" fill-opacity=".99" p-id="8832"></path>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 730 B |
11
collect-library/src/main/assets/omdb/icon_2013_1.svg
Normal file
11
collect-library/src/main/assets/omdb/icon_2013_1.svg
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg t="1695622778812" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg" p-id="8830" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
width="48" height="48">
|
||||||
|
<path
|
||||||
|
d="M284.444444 227.555556h739.555556L739.555556 796.444444H0L284.444444 227.555556z m26.368 42.666666l-241.777777 483.555556h644.152889l241.777777-483.555556H310.812444z"
|
||||||
|
fill="#ffffff" p-id="8831"></path>
|
||||||
|
<path d="M310.812444 270.222222l-241.777777 483.555556h644.152889l241.777777-483.555556z"
|
||||||
|
fill="#ffffff" fill-opacity=".99" p-id="8832"></path>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 730 B |
11
collect-library/src/main/assets/omdb/icon_2013_2.svg
Normal file
11
collect-library/src/main/assets/omdb/icon_2013_2.svg
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg t="1695622778812" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg" p-id="8830" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
width="48" height="48">
|
||||||
|
<path
|
||||||
|
d="M284.444444 227.555556h739.555556L739.555556 796.444444H0L284.444444 227.555556z m26.368 42.666666l-241.777777 483.555556h644.152889l241.777777-483.555556H310.812444z"
|
||||||
|
fill="#eccc68" p-id="8831"></path>
|
||||||
|
<path d="M310.812444 270.222222l-241.777777 483.555556h644.152889l241.777777-483.555556z"
|
||||||
|
fill="#eccc68" fill-opacity=".99" p-id="8832"></path>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 730 B |
11
collect-library/src/main/assets/omdb/icon_2013_6.svg
Normal file
11
collect-library/src/main/assets/omdb/icon_2013_6.svg
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg t="1695622778812" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg" p-id="8830" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
width="48" height="48">
|
||||||
|
<path
|
||||||
|
d="M284.444444 227.555556h739.555556L739.555556 796.444444H0L284.444444 227.555556z m26.368 42.666666l-241.777777 483.555556h644.152889l241.777777-483.555556H310.812444z"
|
||||||
|
fill="#0000ff" p-id="8831"></path>
|
||||||
|
<path d="M310.812444 270.222222l-241.777777 483.555556h644.152889l241.777777-483.555556z"
|
||||||
|
fill="#0000ff" fill-opacity=".99" p-id="8832"></path>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 730 B |
11
collect-library/src/main/assets/omdb/icon_2013_7.svg
Normal file
11
collect-library/src/main/assets/omdb/icon_2013_7.svg
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||||
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg t="1695622778812" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||||
|
xmlns="http://www.w3.org/2000/svg" p-id="8830" xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
width="48" height="48">
|
||||||
|
<path
|
||||||
|
d="M284.444444 227.555556h739.555556L739.555556 796.444444H0L284.444444 227.555556z m26.368 42.666666l-241.777777 483.555556h644.152889l241.777777-483.555556H310.812444z"
|
||||||
|
fill="#00ff00" p-id="8831"></path>
|
||||||
|
<path d="M310.812444 270.222222l-241.777777 483.555556h644.152889l241.777777-483.555556z"
|
||||||
|
fill="#00ff00" fill-opacity=".99" p-id="8832"></path>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 730 B |
Loading…
x
Reference in New Issue
Block a user