From 31991ebe0021205e2dd490ed29ab0fa3e22f3355 Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Thu, 17 Aug 2023 17:37:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=82=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 20 ++++++++ .../omqs/ui/activity/map/MainViewModel.kt | 9 +++- .../omqs/ui/fragment/itemlist/ItemAdapter.kt | 30 +++++++++++ .../ui/fragment/itemlist/ItemListFragment.kt | 51 +++++++++++++++++++ app/src/main/res/layout/adapter_item.xml | 15 ++++++ .../main/res/layout/fragment_item_list.xml | 41 +++++++++++++++ .../main/res/layout/fragment_task_manager.xml | 3 +- .../collect/library/enums/DataCodeEnum.kt | 14 ++++- 8 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemListFragment.kt create mode 100644 app/src/main/res/layout/adapter_item.xml create mode 100644 app/src/main/res/layout/fragment_item_list.xml 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 7ebdb43a..dd6b949b 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 @@ -38,6 +38,7 @@ import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager import com.navinfo.omqs.tools.LayerConfigUtils import com.navinfo.omqs.ui.activity.BaseActivity import com.navinfo.omqs.ui.fragment.console.ConsoleFragment +import com.navinfo.omqs.ui.fragment.itemlist.ItemListFragment import com.navinfo.omqs.ui.fragment.offlinemap.OfflineMapFragment import com.navinfo.omqs.ui.fragment.qsrecordlist.QsRecordListFragment import com.navinfo.omqs.ui.fragment.signMoreInfo.SignMoreInfoFragment @@ -390,6 +391,25 @@ class MainActivity : BaseActivity() { } } + viewModel.liveDataItemList.observe(this) { + if (leftFragment == null || leftFragment !is ItemListFragment) { + leftFragment = ItemListFragment { + binding.mainActivityLeftFragment.visibility = View.GONE + supportFragmentManager.beginTransaction().remove(leftFragment!!).commit() + leftFragment = null + null + } + binding.mainActivityLeftFragment.visibility = View.VISIBLE + supportFragmentManager.beginTransaction() + .replace(R.id.main_activity_left_fragment, leftFragment!!) + .commit() + } else { + supportFragmentManager.beginTransaction() + .show(leftFragment!!) + .commit() + } + } + lifecycleScope.launch { // 初始化地图图层控制接收器 FlowEventBus.subscribe>( diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 8beb2dbb..4cecddfa 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -112,6 +112,11 @@ class MainViewModel @Inject constructor( */ val liveDataSignMoreInfo = MutableLiveData() + /** + * 捕捉到的itemList + */ + val liveDataItemList = MutableLiveData>() + private var traceTag: String = "TRACE_TAG" /** @@ -473,8 +478,10 @@ class MainViewModel @Inject constructor( ) ) - if (itemList.size > 0) { + if (itemList.size == 1) { liveDataSignMoreInfo.postValue(itemList[0]) + } else { + liveDataItemList.postValue(itemList) } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt new file mode 100644 index 00000000..5667a982 --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt @@ -0,0 +1,30 @@ +package com.navinfo.omqs.ui.fragment.itemlist + +import android.view.LayoutInflater +import android.view.ViewGroup +import com.navinfo.collect.library.data.entity.RenderEntity +import com.navinfo.collect.library.enums.DataCodeEnum +import com.navinfo.omqs.databinding.AdapterItemBinding +import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter +import com.navinfo.omqs.ui.other.BaseViewHolder + +class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = null) : + BaseRecyclerViewAdapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder { + val viewBinding = + AdapterItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return BaseViewHolder(viewBinding) + } + + override fun onBindViewHolder(holder: BaseViewHolder, position: Int) { + val binding = holder.viewBinding as AdapterItemBinding + var renderEntity = data[position] + + binding.name.text = DataCodeEnum.findTableNameByCode(renderEntity.code) + binding.root.setOnClickListener { + if (itemListener != null) { + itemListener!!.invoke(position, renderEntity) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemListFragment.kt new file mode 100644 index 00000000..cfbab4d6 --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemListFragment.kt @@ -0,0 +1,51 @@ +package com.navinfo.omqs.ui.fragment.itemlist + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.activityViewModels +import androidx.recyclerview.widget.LinearLayoutManager +import com.navinfo.omqs.databinding.FragmentItemListBinding +import com.navinfo.omqs.ui.activity.map.MainViewModel +import com.navinfo.omqs.ui.fragment.BaseFragment +import com.navinfo.omqs.ui.widget.RecycleViewDivider +import dagger.hilt.android.AndroidEntryPoint + + +@AndroidEntryPoint +class ItemListFragment(private var backListener: ((ItemListFragment) -> Unit?)? = null) : + BaseFragment() { + private var _binding: FragmentItemListBinding? = null + private val binding get() = _binding!! + private val viewModel by activityViewModels() + private val adapter by lazy { + ItemAdapter { _, data -> + viewModel.showSignMoreInfo(data) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? + ): View { + _binding = FragmentItemListBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + binding.itemListRecyclerview.layoutManager = LinearLayoutManager(requireContext()) + binding.itemListRecyclerview.adapter = adapter + binding.itemListRecyclerview.addItemDecoration( + RecycleViewDivider( + requireContext(), + LinearLayoutManager.VERTICAL + ) + ) + viewModel.liveDataItemList.observe(viewLifecycleOwner) { + adapter.refreshData(it) + } + binding.taskBack.setOnClickListener { + backListener?.invoke(this) + } + } +} diff --git a/app/src/main/res/layout/adapter_item.xml b/app/src/main/res/layout/adapter_item.xml new file mode 100644 index 00000000..38b68113 --- /dev/null +++ b/app/src/main/res/layout/adapter_item.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml new file mode 100644 index 00000000..1a043b4c --- /dev/null +++ b/app/src/main/res/layout/fragment_item_list.xml @@ -0,0 +1,41 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml index f533d173..d2c85a65 100644 --- a/app/src/main/res/layout/fragment_task_manager.xml +++ b/app/src/main/res/layout/fragment_task_manager.xml @@ -1,5 +1,6 @@ - Date: Fri, 18 Aug 2023 16:17:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=9D=A2=E7=BA=B9=E7=90=86=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-library/resources/rendertheme.xsd | 2 ++ collect-library/src/main/assets/editormarker.xml | 4 +++- collect-library/src/main/assets/omdb/area_1.png | Bin 0 -> 9010 bytes .../src/main/assets/omdb/icon_fill_area_3012.svg | 1 + vtm | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/area_1.png create mode 100644 collect-library/src/main/assets/omdb/icon_fill_area_3012.svg diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd index 6b2e9c6d..299bd87c 100644 --- a/collect-library/resources/rendertheme.xsd +++ b/collect-library/resources/rendertheme.xsd @@ -145,6 +145,8 @@ + + diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index d71cfdcb..3aaf3443 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2277,8 +2277,10 @@ - + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/area_1.png b/collect-library/src/main/assets/omdb/area_1.png new file mode 100644 index 0000000000000000000000000000000000000000..db5e5a33660e2b32bbd8e1ae3065c30ad75d04e0 GIT binary patch literal 9010 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 literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg b/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg new file mode 100644 index 00000000..bbe4ad98 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_fill_area_3012.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/vtm b/vtm index bb130bcd..33ba2c17 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit bb130bcdbead90cf923d36c837af4afcdf846701 +Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822