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

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan 2023-08-30 14:20:04 +08:00
commit 4fc6b0cd5b
14 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -21,11 +21,11 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- 这个权限用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<!-- 访问网络，网络定位需要上网 -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- 写入扩展存储，向扩展卡写入数据，用于写入离线定位数据-->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<!-- 访问网络，网络定位需要上网 -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- 允许访问振动设备 -->
<uses-permission android:name="android.permission.VIBRATE" />
<!-- 允许使用PowerManager的 WakeLocks保持进程在休眠时从屏幕消失 -->

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

@ -158,7 +158,14 @@
"name": "隧道",
"zoomMin": 15,
"zoomMax": 20,
"transformer2Code": ""
"transformer": [
{
"k": "geometry",
"v": "~",
"klib": "geometry",
"vlib": "generateS2EReferencePoint()"
}
]
},
"3002":{
"table": "OMDB_OBJECT_TEXT",
@ -216,6 +223,13 @@
"zoomMin": 18,
"zoomMax": 20
},
"3014":{
"table": "OMDB_CROSS_WALK",
"code": 3014,
"name": "人行横道",
"zoomMin": 18,
"zoomMax": 20
},
"3016":{
"table": "OMDB_OBJECT_STOPLOCATION",
"code": 3016,

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

@ -443,6 +443,8 @@ class ImportPreProcess {
referenceEntity.table = renderEntity.table
referenceEntity.enable = renderEntity.enable
referenceEntity.taskId = renderEntity.taskId
referenceEntity.zoomMin = renderEntity.zoomMin
referenceEntity.zoomMax = renderEntity.zoomMax
// 与原数据使用相同的geometry
referenceEntity.geometry = renderEntity.geometry.toString()
referenceEntity.properties["qi_table"] = renderEntity.table

5
app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
View File

@ -14,6 +14,7 @@ import com.navinfo.omqs.bean.SysUserBean
import com.navinfo.omqs.http.DefaultResponse
import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus
import com.navinfo.omqs.util.DateTimeUtil
import com.navinfo.omqs.util.FileUtils
import io.realm.Realm
import kotlinx.coroutines.*
import java.util.*
@ -134,7 +135,7 @@ class TaskUploadScope(
evaluationTaskId = taskBean.id.toString(),
linkPid = hadLinkDvoBean.linkPid,//"84207223282277331"
linkStatus = linkStatus,
markId = hadLinkDvoBean.mesh,//"20065597"
markId = UUID.randomUUID().toString(),//"20065597"
trackPhotoNumber = "",
markGeometry = "",
featureName = "",
@ -195,7 +196,7 @@ class TaskUploadScope(
evaluationTaskId = taskBean.id.toString(),
linkPid = hadLinkDvoBean.linkPid,//"84207223282277331"
linkStatus = linkStatus,
markId = hadLinkDvoBean.mesh,//"20065597"
markId = it.id,//"20065597"
trackPhotoNumber = "",
markGeometry = it.geometry,
featureName = it.classCode,

11
collect-library/src/main/assets/editormarker.xml
View File

@ -2163,7 +2163,7 @@
<!--隧道-->
<m v="OMDB_TUNNEL">
<m k="formOfWay">
<line dasharray="4,4" stroke="#4624FF" width="0.4" />
<line dasharray="4,4" stroke="#4624FF" width="1.2" />
</m>
<m k="type" v="s_2_p">
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
@ -2316,7 +2316,7 @@
</m>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="assets:omdb/4010/right.svg" symbol-height="44" symbol-width="44"></symbol>
src="assets:omdb/4010/right.svg" symbol-height="40" symbol-width="40"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
@ -2375,6 +2375,11 @@
<area use="obj-area" repeat="false" src="assets:omdb/tex_fill_area_3012.png" longEdge="t"></area>
</m>
<!-- 人行横道 -->
<m v="OMDB_CROSS_WALK">
<area use="obj-area" fill="#00000000" stroke="#00000000" repeat="true" src="assets:omdb/tex_fill_area_3014_4.svg" longEdge="s"></area>
</m>
<!-- 道路施工 -->
<m v="OMDB_LINK_CONSTRUCTION">
<line stroke="#FF0000" width="1" />
@ -2396,7 +2401,7 @@
<m v="OMDB_WARNINGSIGN">
<m k="type" v="dynamicSrc">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="@src" symbol-height="36" symbol-width="36" degree="90"></symbol>
src="@src" symbol-height="24" symbol-width="24" degree="90"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />

BIN
collect-library/src/main/assets/omdb/tex_fill_area_3014.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

1
collect-library/src/main/assets/omdb/tex_fill_area_3014.svg Normal file
View File

@ -0,0 +1 @@
<?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="1693189486200" class="icon" viewBox="0 0 2495 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4072" data-spm-anchor-id="a313x.search_index.0.i2.24ff3a81RzdsdX" width="311.875" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M0 0m58.510875 0l56.170441 0q58.510875 0 58.510875 58.510875l0 523.379781q0 58.510875-58.510875 58.510875l-56.170441 0q-58.510875 0-58.510875-58.510875l0-523.379781q0-58.510875 58.510875-58.510875Z" fill="#ffffff" p-id="4073" data-spm-anchor-id="a313x.search_index.0.i0.24ff3a81RzdsdX" class=""></path><path d="M462.52847 0m58.510875 0l56.17044 0q58.510875 0 58.510876 58.510875l0 523.379781q0 58.510875-58.510876 58.510875l-56.17044 0q-58.510875 0-58.510875-58.510875l0-523.379781q0-58.510875 58.510875-58.510875Z" fill="#1296db" p-id="4074" data-spm-anchor-id="a313x.search_index.0.i1.24ff3a81RzdsdX" class=""></path><path d="M925.05694 0m58.510875 0l56.17044 0q58.510875 0 58.510876 58.510875l0 523.379781q0 58.510875-58.510876 58.510875l-56.17044 0q-58.510875 0-58.510875-58.510875l0-523.379781q0-58.510875 58.510875-58.510875Z" fill="#d4237a" p-id="4075" data-spm-anchor-id="a313x.search_index.0.i3.24ff3a81RzdsdX" class=""></path><path d="M1387.585409 0m58.510876 0l56.17044 0q58.510875 0 58.510875 58.510875l0 523.379781q0 58.510875-58.510875 58.510875l-56.17044 0q-58.510875 0-58.510876-58.510875l0-523.379781q0-58.510875 58.510876-58.510875Z" fill="#FF0000" p-id="4076" data-spm-anchor-id="a313x.search_index.0.i4.24ff3a81RzdsdX" class="selected"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

7
collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg Normal file
View File

@ -0,0 +1,7 @@
<?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="1693200786104" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="7178" width="256" height="256"
xmlns:xlink="http://www.w3.org/1999/xlink">
<path d="M389.03333333 0H676.33333333v1023.9H389.03333333z" fill="#ffffff" p-id="7179"></path>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 443 B

BIN
collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

10
collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg Normal file
View File

@ -0,0 +1,10 @@
<?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="1693201455124" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="9781" width="512" height="512"
xmlns:xlink="http://www.w3.org/1999/xlink">
<path
d="M154.64448633 60.60726526h112.85069721v902.78546947H154.64448633zM756.50481646 60.60726526h112.85069721v902.78546947H756.50481646z"
fill="#ffffff" p-id="9782" data-spm-anchor-id="a313x.search_index.0.i48.24ff3a81RzdsdX"
class="selected"></path>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 626 B

1
collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
View File

@ -57,6 +57,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_LINK_FORM2_11("风景路线", "2206-11"),
OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"),
OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"),
OMDB_CROSS_WALK("人行横道", "3014"),
OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
OMDB_INTERSECTION("路口", "4001"),
OMDB_SPEEDLIMIT("常规点限速", "4002"),

2
vtm

@ -1 +1 @@
Subproject commit fdf36bde1364241a6d2ebfad686ee3b2311b73b0
Subproject commit c5070ba78b73d69af40d33396ad8255f82535dc4