fix: 修改道路面的渲染

app/build.gradle

@@ -12,8 +12,8 @@ android {
 
     defaultConfig {
         applicationId "com.navinfo.omqs"
-        minSdk 26
+        minSdk 21
-        targetSdk 32
+        targetSdk 21
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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(
     /**
      * 图幅号

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

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 String -> renderEntity.properties.put(key, value)
-                            is Int -> renderEntity.properties[key.toString()] = value.toInt().toString()
+                            is Int -> renderEntity.properties.put(key, value.toInt().toString())
-                            is Double -> renderEntity.properties[key.toString()] = value.toDouble().toString()
+                            is Double -> renderEntity.properties.put(key, value.toDouble().toString())
-                            else -> renderEntity.properties[key.toString()] = value.toString()
+                            else -> renderEntity.properties.put(key, value.toString())
                         }
                     }
-                    Realm.getDefaultInstance().insert(renderEntity)
+                    Realm.getDefaultInstance().copyToRealm(renderEntity)
                 }
                 // 1个文件发送一次flow流
                 emit("${index + 1}/${importConfig.tables.size}")

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}")
                     }

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)

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>

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