From 7c57a451f1d08b87a9ab5f5b8c83eeda63427486 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 5 Jul 2023 14:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=81=93=E9=9D=A2?= =?UTF-8?q?=E4=B8=BA=E8=BD=A6=E9=81=93=E4=B8=AD=E5=BF=83=E7=BA=BF=E5=B9=B6?= =?UTF-8?q?=E5=9C=A8=E8=BE=85=E5=8A=A9=E8=A1=A8=E4=B8=AD=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 10 +++++++++- .../java/com/navinfo/omqs/db/ImportPreProcess.kt | 15 +++++++++++++++ .../personalcenter/PersonalCenterFragment.kt | 2 +- .../omqs/ui/fragment/tasklist/TaskListAdapter.kt | 6 +++++- .../omqs/ui/fragment/tasklist/TaskListFragment.kt | 10 +++++++++- .../omqs/ui/fragment/tasklist/TaskViewModel.kt | 13 ++++++++++++- collect-library/src/main/assets/editormarker.xml | 13 +++++++++---- 7 files changed, 60 insertions(+), 9 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index a211f51e..87fe4af1 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -269,7 +269,15 @@ "5001":{ "table": "OMDB_LANE_LINK_LG", "code": 5001, - "name": "车道中心线" + "name": "车道中心线", + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "generateAddWidthLine()" + } + ] }, "5002":{ "table": "OMDB_AREA", diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index de475584..47a480d8 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -299,6 +299,21 @@ class ImportPreProcess { } } + /** + * 生成车道中心线面宽度 + * */ + fun generateAddWidthLine(renderEntity: RenderEntity) { + // 添加车道中心面渲染原则，根据车道宽度进行渲染 + val angleReference = ReferenceEntity() + angleReference.renderEntityId = renderEntity.id + angleReference.name = "${renderEntity.name}车道中线面" + angleReference.table = renderEntity.table + angleReference.geometry = renderEntity.geometry + angleReference.properties["qi_table"] = renderEntity.table + angleReference.properties["width"] = "3" + Realm.getDefaultInstance().insert(angleReference) + } + /** * 生成默认路口数据的参考数据 * */ 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 51d28ec0..83e3be9d 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 @@ -115,7 +115,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : viewModel.readRealmData() // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint( 39.799624915997725, 116.51407667184905 )) + .animateTo(GeoPoint( 40.10113947189571, 116.25585158012574)) } // R.id.personal_center_menu_task_list -> { // findNavController().navigate(R.id.TaskManagerFragment) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt index 2a82c060..841b1467 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt @@ -203,7 +203,11 @@ class TaskListAdapter( binding.taskDeleteLayout.setOnClickListener { //重置状态 leftDeleteView?.resetDeleteStatus() - itemListener?.invoke(position, ItemClickStatus.DELETE_LAYOUT_CLICK, taskBean) + if(taskBean.syncStatus != FileUploadStatus.DONE){ + Toast.makeText(binding.taskUploadBtn.context, "数据未上传，不允许关闭！", Toast.LENGTH_SHORT).show() + }else{ + itemListener?.invoke(position, ItemClickStatus.DELETE_LAYOUT_CLICK, taskBean) + } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt index 58ad3124..c8e69749 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt @@ -55,10 +55,10 @@ class TaskListFragment : BaseFragment() { if(status==TaskListAdapter.Companion.ItemClickStatus.ITEM_LAYOUT_CLICK){ viewModel.setSelectTaskBean(taskBean as TaskBean) }else if(status==TaskListAdapter.Companion.ItemClickStatus.DELETE_LAYOUT_CLICK){ + showLoadingDialog("正在关闭") context?.let { viewModel.removeTask(it, taskBean as TaskBean) } }else if(status==TaskListAdapter.Companion.ItemClickStatus.UPLOAD_LAYOUT_CLICK){ showLoadingDialog("正在校验") - Toast.makeText(context, "正在校验", Toast.LENGTH_SHORT).show() viewModel.checkUploadTask(binding.root.context,taskBean) } else { @@ -88,6 +88,14 @@ class TaskListFragment : BaseFragment() { adapter.refreshData(it) } + //监听关闭任务状态 + viewModel.liveDataCloseTask.observe(viewLifecycleOwner){ + if(it){ + Toast.makeText(binding.root.context,"成功关闭！",Toast.LENGTH_LONG).show() + } + hideLoadingDialog() + } + //监听并调用上传 viewModel.liveDataTaskUpload.observe(viewLifecycleOwner){ for ((key, value) in it) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt index 74ddacf6..6eb9da55 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt @@ -46,6 +46,11 @@ class TaskViewModel @Inject constructor( */ val liveDataTaskUpload = MutableLiveData>() + /** + * 用来确定是否关闭 + */ + val liveDataCloseTask = MutableLiveData() + private val colors = arrayOf(Color.RED, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.GREEN, Color.CYAN) @@ -297,10 +302,16 @@ class TaskViewModel @Inject constructor( FileManager.checkOMDBFileInfo(item) } liveDataTaskList.postValue(taskList) + liveDataCloseTask.postValue(true) } } }) - mDialog.setNegativeButton("取消", null) + mDialog.setNegativeButton("取消", object : FirstDialog.OnClickListener { + override fun onClick(dialog: Dialog?, which: Int) { + liveDataCloseTask.postValue(false) + mDialog.dismiss() + } + }) mDialog.show() } } diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 37f21eea..c093cfa5 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1560,7 +1560,7 @@ - + @@ -1698,8 +1698,13 @@ - - + + + + + 0