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

2023-04-24 17:21:31 +08:00
parent 0a1e6c6f2b 2a6dad3ac0
commit d174c82cb6
55 changed files with 1346 additions and 648 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
@@ -212,7 +212,7 @@ class EvaluationResultViewModel @Inject constructor(
                it.copyToRealmOrUpdate(liveDataQsRecordBean.value)
            }
 //            realm.close()
-            mapController.layerManagerHandler.addOrUpdateQsRecordMark(liveDataQsRecordBean.value!!)
+            mapController.markerHandle.addOrUpdateQsRecordMark(liveDataQsRecordBean.value!!)
            liveDataFinish.postValue(true)
        }
    }
@@ -228,7 +228,7 @@ class EvaluationResultViewModel @Inject constructor(
                objects?.deleteFromRealm()
            }
 //            realm.close()
-            mapController.layerManagerHandler.removeQsRecordMark(liveDataQsRecordBean.value!!)
+            mapController.markerHandle.removeQsRecordMark(liveDataQsRecordBean.value!!)
            liveDataFinish.postValue(true)
        }
    }
--- 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
@@ -125,6 +125,9 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
                R.id.personal_center_menu_task_list -> {
                    findNavController().navigate(R.id.TaskListFragment)
                }
+                R.id.personal_center_menu_qs_record_list -> {
+                    findNavController().navigate(R.id.QsRecordListFragment)
+                }
            }
            true
        }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListAdapter.kt
@@ -0,0 +1,64 @@
+package com.navinfo.omqs.ui.fragment.tasklist
+
+import android.content.Context
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.navinfo.collect.library.data.entity.QsRecordBean
+import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.TaskBean
+import com.navinfo.omqs.databinding.AdapterQsRecordListBinding
+import com.navinfo.omqs.databinding.AdapterTaskListBinding
+import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
+import com.navinfo.omqs.tools.FileManager.Companion.FileDownloadStatus
+import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
+import com.navinfo.omqs.ui.other.BaseViewHolder
+
+/**
+ * 离线地图城市列表 RecyclerView 适配器
+ *
+ * 在 RecycleView 的 ViewHolder 中监听 ViewModel 的 LiveData，然后此时传递的 lifecycleOwner 是对应的 Fragment。由于 ViewHolder 的生命周期是比 Fragment 短的，所以当 ViewHolder 销毁时，由于 Fragment 的 Lifecycle 还没有结束，此时 ViewHolder 会发生内存泄露（监听的 LiveData 没有解绑）
+ *   这种场景下有两种解决办法：
+ *使用 LiveData 的 observeForever 然后在 ViewHolder 销毁前手动调用 removeObserver
+ *使用 LifecycleRegistry 给 ViewHolder 分发生命周期(这里使用了这个)
+ */
+class QsRecordListAdapter(
+    private val context: Context
+) : BaseRecyclerViewAdapter<QsRecordBean>() {
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
+        val viewBinding =
+            AdapterQsRecordListBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return BaseViewHolder(viewBinding)
+    }
+
+    override fun onViewRecycled(holder: BaseViewHolder) {
+        super.onViewRecycled(holder)
+        //页面滑动时会用holder重构页面，但是对进度条的监听回调会一直返回，扰乱UI，所以当当前holder去重构的时候，移除监听
+    }
+
+    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
+        val binding: AdapterQsRecordListBinding =
+            holder.viewBinding as AdapterQsRecordListBinding
+        val qsRecordBean = data[position]
+        //tag 方便onclick里拿到数据
+        holder.tag = qsRecordBean.id.toString()
+        changeViews(binding, qsRecordBean)
+    }
+
+    private fun changeViews(binding: AdapterQsRecordListBinding, qsRecordBean: QsRecordBean) {
+        binding.qsRecordClassType.text = qsRecordBean.classType
+        binding.qsRecordProblemType.text = qsRecordBean.problemType
+        binding.qsRecordPhenomenon.text = qsRecordBean.phenomenon
+        binding.qsRecordProblemLink.text = qsRecordBean.problemLink
+    }
+
+    override fun getItemViewRes(position: Int): Int {
+        return R.layout.adapter_qs_record_list
+    }
+}
+
+
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListFragment.kt
@@ -0,0 +1,60 @@
+package com.navinfo.omqs.ui.fragment.qsrecordlist
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView.VERTICAL
+import com.navinfo.omqs.R
+import com.navinfo.omqs.databinding.FragmentQsRecordListBinding
+import com.navinfo.omqs.ui.fragment.BaseFragment
+import com.navinfo.omqs.ui.fragment.tasklist.QsRecordListAdapter
+import com.navinfo.omqs.ui.widget.RecycleViewDivider
+import dagger.hilt.android.AndroidEntryPoint
+import org.apache.poi.xwpf.usermodel.VerticalAlign
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class QsRecordListFragment : BaseFragment(){
+    private var _binding: FragmentQsRecordListBinding? = null
+    private val viewModel by viewModels<QsRecordListViewModel>()
+    private val binding get() = _binding!!
+    private val adapter: QsRecordListAdapter by lazy {
+        QsRecordListAdapter(
+            requireContext()
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentQsRecordListBinding.inflate(inflater, container, false)
+        return binding.root
+
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val layoutManager = LinearLayoutManager(context)
+        //// 设置 RecyclerView 的固定大小，避免在滚动时重新计算视图大小和布局，提高性能
+        binding.qsRecyclerview.setHasFixedSize(true)
+        binding.qsRecyclerview.layoutManager = layoutManager
+        binding.qsRecyclerview.adapter = adapter
+        viewModel.liveDataQSList.observe(viewLifecycleOwner) {
+            adapter.refreshData(it)
+        }
+        val itemDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
+        itemDecoration.setDrawable(resources.getDrawable(R.drawable.separator))
+        binding.qsRecyclerview.addItemDecoration(itemDecoration)
+        viewModel.getList(requireContext())
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/qsrecordlist/QsRecordListViewModel.kt
@@ -0,0 +1,30 @@
+package com.navinfo.omqs.ui.fragment.qsrecordlist
+
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.navinfo.collect.library.data.entity.QsRecordBean
+import dagger.hilt.android.lifecycle.HiltViewModel
+import io.realm.Realm
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class QsRecordListViewModel @Inject constructor(
+) : ViewModel() {
+
+    val liveDataQSList = MutableLiveData<List<QsRecordBean>>()
+
+    fun getList(context: Context) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val realm = Realm.getDefaultInstance()
+            Log.e("jingo","realm hashCOde ${realm.hashCode()}")
+            val objects = realm.where(QsRecordBean::class.java).findAll()
+            liveDataQSList.postValue(realm.copyFromRealm(objects))
+        }
+    }
+
+}
--- 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
@@ -23,7 +23,7 @@ import com.navinfo.omqs.ui.other.BaseViewHolder
 *使用 LifecycleRegistry 给 ViewHolder 分发生命周期(这里使用了这个)
 */
 class TaskListAdapter(
-    private val downloadManager: TaskDownloadManager, private val context: Context
+    private val downloadManager: TaskDownloadManager
 ) : BaseRecyclerViewAdapter<TaskBean>() {


@@ -70,6 +70,8 @@ class TaskListAdapter(
        binding.taskDownloadBtn.tag = position
        binding.taskDownloadBtn.setOnClickListener(downloadBtnClick)
        binding.taskName.text = taskBean.evaluationTaskName
+        binding.taskCityName.text = taskBean.cityName
+        binding.taskDataVersion.text = "版本号：${taskBean.dataVersion}"
 //        binding.offlineMapCitySize.text = cityBean.getFileSizeText()
    }

@@ -82,10 +84,12 @@ class TaskListAdapter(
    }


-    private fun changeViews(binding: AdapterTaskListBinding, cityBean: TaskBean) {
-        binding.taskProgress.progress =
-            (cityBean.currentSize * 100 / cityBean.fileSize).toInt()
-        when (cityBean.status) {
+    private fun changeViews(binding: AdapterTaskListBinding, taskBean: TaskBean) {
+        if (taskBean.fileSize > 0L) {
+            binding.taskProgress.progress =
+                (taskBean.currentSize * 100 / taskBean.fileSize).toInt()
+        }
+        when (taskBean.status) {
            FileDownloadStatus.NONE -> {
                if (binding.taskProgress.visibility == View.VISIBLE) binding.taskProgress.visibility =
                    View.INVISIBLE
--- 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
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.navinfo.omqs.databinding.FragmentTaskListBinding
 import com.navinfo.omqs.http.taskdownload.TaskDownloadManager
@@ -22,7 +23,6 @@ class TaskListFragment : BaseFragment(){
    private val adapter: TaskListAdapter by lazy {
        TaskListAdapter(
            downloadManager,
-            requireContext()
        )
    }

@@ -46,6 +46,9 @@ class TaskListFragment : BaseFragment(){
            adapter.refreshData(it)
        }
        viewModel.getTaskList(requireContext())
+        binding.taskBack.setOnClickListener{
+            findNavController().navigateUp()
+        }
    }

    override fun onDestroyView() {
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
@@ -52,8 +52,11 @@ class TaskListViewModel @Inject constructor(
                else -> {}
            }
            val objects = realm.where(TaskBean::class.java).findAll()
-            liveDataTaskList.postValue(realm.copyFromRealm(objects))
-//            realm.close()
+            val taskList = realm.copyFromRealm(objects)
+            for(item in taskList){
+                FileManager.checkOMDBFileInfo(item)
+            }
+            liveDataTaskList.postValue(taskList)
        }

    }