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

fix: 适配面纹理及文字类型

Browse Source
This commit is contained in:
xiaoyan 2023-08-09 17:20:57 +08:00
parent 4b7ccbc3b4
commit d11dd5e806
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
View File

@ -108,7 +108,7 @@ class TaskDownloadScope(
if (status != FileDownloadStatus.LOADING && status != FileDownloadStatus.IMPORTING) { if (status != FileDownloadStatus.LOADING && status != FileDownloadStatus.IMPORTING) {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
realm.executeTransaction { realm.executeTransaction {
it.copyToRealmOrUpdate(taskBean) it.insertOrUpdate(taskBean)
} }
} }
} }

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

@ -123,7 +123,8 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
//116.25017070328308 40.061730653134696 //116.25017070328308 40.061730653134696
// 定位到指定位置 // 定位到指定位置
niMapController.mMapView.vtmMap.animator() niMapController.mMapView.vtmMap.animator()
.animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 ))
.animateTo(GeoPoint( 39.91975038055932,116.35447089476969 ))
} }
// R.id.personal_center_menu_task_list -> { // R.id.personal_center_menu_task_list -> {
// findNavController().navigate(R.id.TaskManagerFragment) // findNavController().navigate(R.id.TaskManagerFragment)

6
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt
View File

@ -169,6 +169,12 @@ class PersonalCenterViewModel @Inject constructor(
importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, task).collect { importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, task).collect {
Log.d("importOMDBData", it) Log.d("importOMDBData", it)
} }
} else {
val newTask = TaskBean()
newTask.id = 9999
importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, newTask).collect {
Log.d("importOMDBData", it)
}
} }
Log.d("OMQSApplication", "导入数据完成") Log.d("OMQSApplication", "导入数据完成")
} }

3
collect-library/src/main/assets/editormarker.xml
View File

@ -1951,7 +1951,8 @@
</m> </m>
<m v="OMDB_AREA"> <m v="OMDB_AREA">
<area use="sign-bg" repeat="false" src="assets:omdb/diversion_zone.jpg" stroke="#ff0000" stroke-width="2"></area> <!-- <area use="sign-bg" repeat="false" src="assets:omdb/veer_side_walk.jpg" stroke="#ff0000" stroke-width="2"></area>-->
<area use="sign-bg" repeat="false" src="@text:人行横道" stroke="#ff0000" stroke-width="2"></area>
</m> </m>
<!-- 路口 --> <!-- 路口 -->
<m v="OMDB_INTERSECTION"> <m v="OMDB_INTERSECTION">

2
vtm

@ -1 +1 @@
Subproject commit 0b3c93403228c41607d8f2d40a9c0f6a86403c34 Subproject commit 58f231037c44ccc1c82d00818c402a2894ca4e09