修改UI部分

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -39,7 +39,7 @@ class MainViewModel @Inject constructor(
     private var niLocationList: MutableList<NiLocation> = ArrayList<NiLocation>()
 
     init {
-        mapController.layerManagerHandler.setOnQsRecordItemClickListener(object :
+        mapController.markerHandle.setOnQsRecordItemClickListener(object :
             OnQsRecordItemClickListener {
             override fun onQsRecordList(list: MutableList<String>) {
                 liveDataQsRecordIdList.value = list

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)
         }
     }

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

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() {

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)
         }
 
     }