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

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
This commit is contained in:
squallzhjch
2023-04-27 15:03:32 +08:00
parent b028975221 61ba1d1d2f
commit 3dc650a76b
9 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/navinfo/omqs/bean/HadLinkDvoBean.kt
View File

@@ -3,7 +3,6 @@ package com.navinfo.omqs.bean
import io.realm.RealmObject
import io.realm.annotations.RealmClass
@RealmClass
open class HadLinkDvoBean @JvmOverloads constructor(
/**
* 图幅号

1
app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
View File

@@ -10,7 +10,6 @@ import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey
import io.realm.annotations.RealmClass
@RealmClass
open class TaskBean @JvmOverloads constructor(
/**
* 测评任务id

14
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

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

2
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
View File

@@ -119,11 +119,9 @@ class MainViewModel @Inject constructor(
}
TraceDataBase.getDatabase(context, Constant.USER_DATA_PATH + "/trace.sqlite").niLocationDao.insert(niLocation)
niLocationList.remove(niLocation)
Log.e("qj", "saveTrace==${niLocationList.size}")
}
Thread.sleep(30)
}

3
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
View File

@@ -109,8 +109,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)