From c4ee38d70313fb928bbb7d312bc85e45207476b1 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Thu, 27 Apr 2023 10:18:11 +0800 Subject: [PATCH] =?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>() + val listResult = mutableListOf>() currentConfig?.let { val list = FileIOUtils.readFile2List(txtFile, "UTF-8") if (list != null) { // 将list数据转换为map for (line in list) { - val map = gson.fromJson>(line, object:TypeToken>(){}.getType()) + val map = gson.fromJson>(line, object:TypeToken>(){}.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 @@ - @@ -1618,18 +1618,18 @@ - + - - + - @@ -1641,5 +1641,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 = RealmDictionary() + var properties: RealmDictionary = RealmDictionary() var tileX: RealmSet = RealmSet() // x方向的tile编码 var tileY: RealmSet = RealmSet() // y方向的tile编码 - constructor(name: String, properties: RealmDictionary): this() { + constructor(name: String): this() { this.name = name - this.properties = properties } } \ No newline at end of file