From 4c53144549040a5ff5a1e700ac64419851035ebd Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 30 Aug 2023 11:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E8=A1=8C=E6=A8=AA?=
=?UTF-8?q?=E9=81=93=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 4 ++--
app/src/main/assets/omdb_config.json | 7 +++++++
.../omqs/http/taskupload/TaskUploadScope.kt | 5 +++--
.../src/main/assets/editormarker.xml | 9 +++++++--
.../src/main/assets/omdb/tex_fill_area_3014.png | Bin 0 -> 7789 bytes
.../src/main/assets/omdb/tex_fill_area_3014.svg | 1 +
.../main/assets/omdb/tex_fill_area_3014_0.svg | 7 +++++++
.../main/assets/omdb/tex_fill_area_3014_1.png | Bin 0 -> 1491 bytes
.../main/assets/omdb/tex_fill_area_3014_2.png | Bin 0 -> 3770 bytes
.../main/assets/omdb/tex_fill_area_3014_3.png | Bin 0 -> 11162 bytes
.../main/assets/omdb/tex_fill_area_3014_4.svg | 10 ++++++++++
.../collect/library/enums/DataCodeEnum.kt | 1 +
12 files changed, 38 insertions(+), 6 deletions(-)
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014.png
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014.svg
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png
create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d84e4a52..dba0cc3b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -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保持进程在休眠时从屏幕消失 -->
diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 38169ef2..273c291c 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -207,6 +207,13 @@
"zoomMin": 18,
"zoomMax": 20
},
+ "3014":{
+ "table": "OMDB_CROSS_WALK",
+ "code": 3014,
+ "name": "人行横道",
+ "zoomMin": 18,
+ "zoomMax": 20
+ },
"3016":{
"table": "OMDB_OBJECT_STOPLOCATION",
"code": 3016,
diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
index 519430d6..e5d22648 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
@@ -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,
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index e1982691..79440e2f 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -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" />
@@ -2331,6 +2331,11 @@
<!-- <symbol src="assets:omdb/icon_fill_area_3012.svg"></symbol>-->
</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" />
@@ -2352,7 +2357,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" />
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014.png
new file mode 100644
index 0000000000000000000000000000000000000000..e261be02640f362ddb68b163e8b6ad76a3155a4c
GIT binary patch
literal 7789
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
AlmGw#
literal 0
HcmV?d00001
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg
new file mode 100644
index 00000000..f120c277
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg
@@ -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>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg
new file mode 100644
index 00000000..3955f1c3
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg
@@ -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>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d0cf474c45a2acbaaaf1e116b84523288dc8e29
GIT binary patch
literal 1491
zcma)+e>Br;9LK-I+K_FfYe`+j%|el*x-5~<u$murQpvA4=K7H=V_l1BSEZ5sO83wu
zqmnjf*(kp|R&=@;aTwZ4#+jLsY&K(e{!@S5=e(cudEU?YJpa6&=lx{+<1j`BI}88-
zF!J&C4AfQ%0DzpJo3yJ!-U?n@K-U5>Cje&ePO;YL;oVQW0{|<}P#po*di|^37p?&S
ztaE*Wx)Ps70RTA0$J6~RDOCCi`z$2L6f)1j1?t5)v>u{bJRlX8a;q$B!+R=l+&c&!
z%(IODeEXZstjdH12c8XXe>LM=>~7tpiH^H{**EJl{d^0pdRmY0w*AG<zh%X{-&`VW
z!|Njlzt4TGN|Orn$mBQ%pTCl!a7N+lQ*cJs)#QDny8>(jAeAXz`2&jqPb+bl)q~S&
zNjhuz6fiNVu^UaBat!TMSm>oLQLS_kC{1>Zd3oPRr4R#!<+=h%--Kq;phZ*N8>DlP
z$P~PEb1KFVG!k^Qlfgz%RymI2nI^8fMd&EdflHueH)sb}e}gy($_H&rwTTW-!+n1l
zXVAeuW(j<hUozDELXKp+c`5^99<ITs<^5qGLa!!A&Lh7A;7eW1tVW8fUY?gk2617r
zIymaRGgpsAOUI2zXpPie{Q@Ls=aA;q>=WK=WaT-!%FH8U2TF6f9jd*7A4Z4d;+ZtP
z1o;%EJfv5me1Lw$mP9MZm3^~f1ylt;4GtHxhSCD9&2uB#-3OP<XlIoKoG95>G=jw_
zTrVNVpdG!5b&MBvsd?O5aVqrd;i95{W*e&eTGchh94ong%P0}<qzp!8EMcN0Vj9uq
z3O4V>uejIh7dX?(NqEkhfq%4!O6>NpPbR6;z+=DtnG`bIQRqQK-L~7`2V>9gnP+eu
z&+~`4jerRXFy5%)6M)@N@720P2nyjPZ2Mfz0%Uiei*<aGkqf#Z-sMn1)}-5!B#-U^
zI(}`Nv_YA3K(&}fx0S_D1|LsvfsMRWI>cE3$a{0wU5d&3?C@?(tlCcm3Bk!moT49R
zH&S}8sCxOO!_BoH>Y2gTH6%ieeP1t8@&|EDKKC!STrlkBwe1I-T0<FbpOQn-9GSqZ
z$#(cau~hVqnS6BSTU7$Ko>mtswQFfwH9`tnRmC*obq`0-@|a*n_);3H$Sqs!n%S!H
zvQuUchFt&rnV+~88QI1{6Hs#U7jN-57U?jSm>svz`cb)vpm;L`DUXk&cNe%xCKE%{
zL$YzF=*5Ls$6BY`nk@%}j5D{o#m4k@9j<6rj*fa(AULc7CMVuMrrD--nNy0u;qH4y
zRHGJfQR&S6Ock7(KsF4I&^eg2QFQomoboL?sv_4sYlg)3wRtMJpGmMmy)&nj>4irq
z`3sPWD&gQBT~UE%lxwudPu3=D?1%N><NHS$abaU0xs4R*r&(r9(3E4tXF^F+-gl}M
z6VRkwR;-5Q%GU}$tSu*#R>{RPgtEDhHOXCxt1DFD^SA_Xc>Pm(db)F}c>O_M@R^1&
zZ`|PEKtHqIep`#$#`@FF1n1bju|e%8(a0g$mSij3vZ0wRBilG5c+kG`Zd3FwTC4<a
z8OqB)ZSSAJaOImfTM2X~-j?M}eF^An*^1KK+LU7G7j}1Q60UgSloEC&qIP6Gxnmch
z6bQy{PD<BoMwGCy{Q{?Q2c9;p2+jGk#$#{moj?ya>XnJkJX!kzG-Lr~&mVokH6Q>#
zSjhO_+U>$o)46Fa(0j-&(q(OiyCf{L_JRT5LHiXUc<{jtCZKsG@^_Uv^#~0~^kW~@
zX4W(1r1XwObqQV7{3J9-m0tG!_KMff2>!RH<a>+5N-IXJZBk>M*H8I);XIiq!f*Zu
DQSq@K
literal 0
HcmV?d00001
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d21b45d8a52bfe8a62b29ef50cc09987c6337ffc
GIT binary patch
literal 3770
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
literal 0
HcmV?d00001
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcad73bcb0233306b76b1c181776ad68b2f6968f
GIT binary patch
literal 11162
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
literal 0
HcmV?d00001
diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg
new file mode 100644
index 00000000..a1e0761d
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg
@@ -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>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index ad6c96bb..80d97d4f 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -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"),