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

 Conflicts:
	app/src/main/assets/omdb_config.json
This commit is contained in:
squallzhjch
2023-06-21 10:21:50 +08:00
7 changed files with 86 additions and 12 deletions

View File

@@ -23,7 +23,7 @@ class LayerManagerViewModel() : ViewModel() {
}
fun saveLayerConfigList(context: Context, listData: List<ImportConfig>) {
SPStaticUtils.put(Constant.EVENT_LAYER_MANAGER_CHANGE, gson.toJson(listData))
Constant.LAYER_CONFIG_LIST = listData
// 发送新的配置数据
viewModelScope.launch {
FlowEventBus.post(Constant.EVENT_LAYER_MANAGER_CHANGE, listData)

View File

@@ -112,7 +112,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
viewModel.readRealmData()
// 定位到指定位置
niMapController.mMapView.vtmMap.animator()
.animateTo(GeoPoint( 40.034842306317486, 116.31735963074652 ))
.animateTo(GeoPoint( 39.80392140200183, 116.51446703352337 ))
}
// R.id.personal_center_menu_task_list -> {
// findNavController().navigate(R.id.TaskManagerFragment)