From 5defa32f03f47647a81234db7320ff845ff48eaf Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 26 Apr 2023 10:53:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 2 +-
.../java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt | 4 +++-
collect-library/{ => src/main/res}/resources/rendertheme.xsd | 0
3 files changed, 4 insertions(+), 2 deletions(-)
rename collect-library/{ => src/main/res}/resources/rendertheme.xsd (100%)
diff --git a/app/build.gradle b/app/build.gradle
index 525a541d..f8b483bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,7 +33,7 @@ android {
signingConfigs {
debug {
- storeFile file('D:/WrokSpace/OneMapQS/fastmap.keystore')
+ storeFile file('../fastmap.keystore')
storePassword "navinfo"
keyAlias "fastmap"
keyPassword "navinfo"
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index 92fa6dd0..8d4f0a39 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -123,7 +123,9 @@ class MainViewModel @Inject constructor(
context,
Constant.USER_DATA_PATH + "/trace.sqlite"
).niLocationDao.insert(niLocation)
- niLocationList.removeAt(0)
+ if (niLocationList.isNotEmpty()) {
+ niLocationList.removeAt(0)
+ }
Log.e("qj", "saveTrace")
}
Thread.sleep(30)
diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/src/main/res/resources/rendertheme.xsd
similarity index 100%
rename from collect-library/resources/rendertheme.xsd
rename to collect-library/src/main/res/resources/rendertheme.xsd
From c4812eada4c0a46eb3884cbccd7c0db9b6eeb181 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 26 Apr 2023 11:32:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9ManiFest=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 1 +
collect-library/src/main/AndroidManifest.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ee25edab..39d3b5bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,6 +58,7 @@
android:name=".ui.activity.map.MainActivity"
android:launchMode="singleTask"
android:screenOrientation="landscape"
+ android:exported="false"
android:theme="@style/Theme.OMQualityInspection" />
<meta-data
diff --git a/collect-library/src/main/AndroidManifest.xml b/collect-library/src/main/AndroidManifest.xml
index 0cc633b5..2ffd93be 100644
--- a/collect-library/src/main/AndroidManifest.xml
+++ b/collect-library/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
<service
android:name="com.baidu.location.f"
+ android:exported="true"
android:enabled="true"
android:process=":remote">
<intent-filter>
From c4ee38d70313fb928bbb7d312bc85e45207476b1 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 27 Apr 2023 10:18:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=81=93=E8=B7=AF?=
=?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 4 +-
.../com/navinfo/omqs/bean/HadLinkDvoBean.kt | 1 -
.../java/com/navinfo/omqs/bean/TaskBean.kt | 1 -
.../com/navinfo/omqs/db/ImportOMDBHelper.kt | 14 ++---
.../omqs/ui/activity/map/MainViewModel.kt | 4 +-
.../personalcenter/PersonalCenterFragment.kt | 2 +-
.../src/main/assets/editormarker.xml | 55 +++++++++++++++++--
.../library/data/entity/RenderEntity.kt | 5 +-
8 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 35154f67..ca7aa1cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
defaultConfig {
applicationId "com.navinfo.omqs"
- minSdk 26
- targetSdk 32
+ minSdk 21
+ targetSdk 21
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/navinfo/omqs/bean/HadLinkDvoBean.kt b/app/src/main/java/com/navinfo/omqs/bean/HadLinkDvoBean.kt
index 110307dc..28373667 100644
--- a/app/src/main/java/com/navinfo/omqs/bean/HadLinkDvoBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/HadLinkDvoBean.kt
@@ -3,7 +3,6 @@ package com.navinfo.omqs.bean
import io.realm.RealmObject
import io.realm.annotations.RealmClass
-@RealmClass
open class HadLinkDvoBean @JvmOverloads constructor(
/**
* 图幅号
diff --git a/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt b/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
index 86265253..ce2ff849 100644
--- a/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
@@ -9,7 +9,6 @@ import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey
import io.realm.annotations.RealmClass
-@RealmClass
open class TaskBean @JvmOverloads constructor(
/**
* 测评任务id
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index 0e287e21..55f7e545 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -136,13 +136,13 @@ class ImportOMDBHelper @AssistedInject constructor(
it.name == currentConfig.table
}
- val listResult = mutableListOf<Map<String, Any?>>()
+ val listResult = mutableListOf<Map<String, Any>>()
currentConfig?.let {
val list = FileIOUtils.readFile2List(txtFile, "UTF-8")
if (list != null) {
// 将list数据转换为map
for (line in list) {
- val map = gson.fromJson<Map<String, Any?>>(line, object:TypeToken<Map<String, Any?>>(){}.getType())
+ val map = gson.fromJson<Map<String, Any>>(line, object:TypeToken<Map<String, Any>>(){}.getType())
.toMutableMap()
map["qi_table"] = currentConfig.table
map["qi_name"] = currentConfig.name
@@ -162,13 +162,13 @@ class ImportOMDBHelper @AssistedInject constructor(
renderEntity.geometry = map["geometry"].toString()
for ((key, value) in map) {
when (value) {
- is String -> renderEntity.properties[key.toString()] = value
- is Int -> renderEntity.properties[key.toString()] = value.toInt().toString()
- is Double -> renderEntity.properties[key.toString()] = value.toDouble().toString()
- else -> renderEntity.properties[key.toString()] = value.toString()
+ is String -> renderEntity.properties.put(key, value)
+ is Int -> renderEntity.properties.put(key, value.toInt().toString())
+ is Double -> renderEntity.properties.put(key, value.toDouble().toString())
+ else -> renderEntity.properties.put(key, value.toString())
}
}
- Realm.getDefaultInstance().insert(renderEntity)
+ Realm.getDefaultInstance().copyToRealm(renderEntity)
}
// 1个文件发送一次flow流
emit("${index + 1}/${importConfig.tables.size}")
diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index 28dde80d..6e8895ca 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -120,9 +120,7 @@ class MainViewModel @Inject constructor(
}
TraceDataBase.getDatabase(context, Constant.USER_DATA_PATH + "/trace.sqlite").niLocationDao.insert(niLocation)
- if (niLocationList.isNotEmpty()) {
- niLocationList.remove(niLocation)
- }
+ niLocationList.remove(niLocation)
Log.e("qj", "saveTrace==${niLocationList.size}")
}
diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
index 0365731f..a068562b 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
@@ -106,7 +106,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
R.id.personal_center_menu_test -> {
viewModel.readRealmData()
// 定位到指定位置
- niMapController.mMapView.vtmMap.animator().animateTo(GeoPoint(30.270367985798032, 113.83513667119433))
+ niMapController.mMapView.vtmMap.animator().animateTo(GeoPoint(30.226256855699773, 113.84660523913344))
}
R.id.personal_center_menu_task_list -> {
findNavController().navigate(R.id.TaskListFragment)
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 81dba275..4e45ee2a 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -52,7 +52,7 @@
<style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
stroke-width="2.0" />
<!--speedlimit-->
- <style-text fill="#ffffff" id="max-speed-limit" k="name" size="15" stroke="#ffffff"
+ <style-text fill="#ffffff" id="max-speed-limit" k="name" size="14" stroke="#ffffff"
stroke-width="0.1" />
@@ -1618,18 +1618,18 @@
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag">
<m v="0">
- <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
+ <circle fill="#0000ff" radius="28" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
<m select="any">
<text k="maxSpeed" use="max-speed-limit"></text>
- <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="15" stroke="#ffffff"
+ <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
</m>
<m v="1">
- <circle fill="#0000ff" radius="26" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
+ <circle fill="#0000ff" radius="28" scale-radius="true" stroke="#ff0000" stroke-width="2"/>
<m select="any">
<text k="maxSpeed" use="max-speed-limit"></text>
- <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="15" stroke="#ffffff"
+ <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
stroke-width="1.0"></caption>
</m>
</m>
@@ -1641,5 +1641,50 @@
<!--可变点限速-->
<m v="OMDB_SPEEDLIMIT_VAR">
</m>
+ <!--车道数-->
+ <m v="OMDB_LANE_NUM">
+ <m k="laneNum">
+ <m v="1">
+ <line stroke="#545D6C" width="3"/>
+ </m>
+ <m v="2">
+ <line stroke="#545D6C" width="6"/>
+ </m>
+ <m v="3">
+ <line stroke="#545D6C" width="9"/>
+ </m>
+ <m v="4">
+ <line stroke="#545D6C" width="12"/>
+ </m>
+ <m v="5">
+ <line stroke="#545D6C" width="15"/>
+ </m>
+ <m v="6">
+ <line stroke="#545D6C" width="18"/>
+ </m>
+ <m v="7">
+ <line stroke="#545D6C" width="21"/>
+ </m>
+ <m v="8">
+ <line stroke="#545D6C" width="24"/>
+ </m>
+ <m v="9">
+ <line stroke="#545D6C" width="27"/>
+ </m>
+ <m v="10">
+ <line stroke="#545D6C" width="30"/>
+ </m>
+ <m v="11">
+ <line stroke="#545D6C" width="33"/>
+ </m>
+ <m v="12">
+ <line stroke="#545D6C" width="36"/>
+ </m>
+ </m>
+ </m>
+ <!--车道中心线-->
+ <m v="OMDB_LANE_LG_LINK">
+ <line stroke="#ecf0f1" width="0.1" dasharray="35,35"/>
+ </m>
</m>
</rendertheme>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
index 3f7f0df0..b9d3e94e 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
@@ -41,12 +41,11 @@ open class RenderEntity(): RealmObject() {
}
@Ignore
var wkt: Geometry? = null
- var properties: RealmDictionary<String?> = RealmDictionary()
+ var properties: RealmDictionary<String> = RealmDictionary()
var tileX: RealmSet<Int> = RealmSet() // x方向的tile编码
var tileY: RealmSet<Int> = RealmSet() // y方向的tile编码
- constructor(name: String, properties: RealmDictionary<String?>): this() {
+ constructor(name: String): this() {
this.name = name
- this.properties = properties
}
}
\ No newline at end of file