From 54b30d5db5ac08b0384e82c86921c68c087c6d61 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Thu, 10 Aug 2023 14:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E9=87=8F=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=9A=84=E8=81=94=E5=8A=A8=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B4=A9=E6=BA=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/navinfo/omqs/ui/activity/map/MainActivity.kt | 2 +- .../navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt | 3 ++- .../omqs/ui/fragment/tasklink/TaskLinkViewModel.kt | 8 +++++--- .../library/map/source/OMDBReferenceDataSource.java | 1 - .../collect/library/map/source/OMDBTileDataSource.java | 3 --- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 25bd04f2..f3564217 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -503,7 +503,7 @@ class MainActivity : BaseActivity() { /** * 结束测量 */ - private fun measuringToolOff() { + fun measuringToolOff() { //监听测距值 mapController.measureLayerHandler.measureValueLiveData.removeObservers(this) mapController.measureLayerHandler.tempMeasureValueLiveData.removeObservers(this) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt index 269f04e3..52ae10b9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkFragment.kt @@ -97,7 +97,7 @@ class TaskLinkFragment : BaseFragment(), View.OnClickListener { * 线长度 */ mapController.measureLayerHandler.measureValueLiveData.observe(viewLifecycleOwner) { - binding.taskLinkLength.text = "${it}米" + binding.taskLinkLength.text = "${it.valueString}${it.unit}" } mapController.measureLayerHandler.tempMeasureValueLiveData.observe(viewLifecycleOwner) { (activity as MainActivity).setHomeCenterText("${it.valueString}${it.unit}") @@ -110,6 +110,7 @@ class TaskLinkFragment : BaseFragment(), View.OnClickListener { * 显示地图准星 */ activity?.let { + (activity as MainActivity).measuringToolOff() (activity as MainActivity).setHomeCenterVisibility(View.VISIBLE) } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt index 4d85f53a..2f33032a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt @@ -296,9 +296,11 @@ class TaskLinkViewModel @Inject constructor( if (task != null) { liveDataTaskBean.postValue(realm.copyFromRealm(task)) } - hadLinkDvoBean = realm.copyFromRealm(objects) - withContext(Dispatchers.Main) { - mapController.measureLayerHandler.initPathLine(hadLinkDvoBean?.geometry!!) + if(objects != null) { + hadLinkDvoBean = realm.copyFromRealm(objects) + withContext(Dispatchers.Main) { + mapController.measureLayerHandler.initPathLine(hadLinkDvoBean?.geometry!!) + } } } } diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java index 6b8d6c64..2380c259 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java @@ -51,7 +51,6 @@ public class OMDBReferenceDataSource implements ITileDataSource { if (!listResult.isEmpty()) { mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult); } - Log.e("jingo",listResult.size() + "条数据"); mapDataSink.completed(QueryResult.SUCCESS); // Log.d("RealmDBTileDataSource", "tile:"+tile.getBoundingBox().toString()); } else { diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java index 0a37ab79..62a43907 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java @@ -50,12 +50,9 @@ public class OMDBTileDataSource implements ITileDataSource { } List listResult = realmQuery/*.distinct("id")*/.findAll(); if (!listResult.isEmpty()) { - Log.e("qj", "查询数据==" + listResult.size() + "==地图级别" + tile.zoomLevel); mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult); } - Log.e("jingo",listResult.size() + "条数据 主"); mapDataSink.completed(QueryResult.SUCCESS); -// Log.d("RealmDBTileDataSource", "tile:"+tile.getBoundingBox().toString()); } else { mapDataSink.completed(QueryResult.SUCCESS); }