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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
2023-07-14 11:07:57 +08:00
parent 108c6daa2f be2d0389cf
commit c3f299222a
7 changed files with 429 additions and 213 deletions
--- a/app/src/main/java/com/navinfo/omqs/Constant.kt
+++ b/app/src/main/java/com/navinfo/omqs/Constant.kt
@@ -94,6 +94,8 @@ class Constant {
        const val EVENT_LAYER_MANAGER_CHANGE = "EVENT_LAYER_MANAGER_CHANGE" // 图层管理中的配置修改

        const val SELECT_TASK_ID = "select_task_id" //选中的任务ID
+
+        const val SHARED_SYNC_TASK_LINK_ID = "shared_sync_task_link_id"//利用shared通知任务页面更新
    }


--- 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
@@ -18,11 +18,14 @@ import android.widget.PopupWindow
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.findNavController
 import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.data.dao.impl.TraceDataBase
 import com.navinfo.collect.library.data.entity.NiLocation
+import com.navinfo.collect.library.data.entity.NoteBean
+import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.collect.library.data.entity.RenderEntity
 import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.collect.library.map.NIMapController
@@ -43,6 +46,7 @@ import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
 import io.realm.RealmSet
+import io.realm.kotlin.where
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -65,7 +69,7 @@ class MainViewModel @Inject constructor(
    private val mapController: NIMapController,
    private val traceDataBase: TraceDataBase,
    private val realmOperateHelper: RealmOperateHelper,
-    private val sharedPreferences: SharedPreferences,
+    private val sharedPreferences: SharedPreferences
 ) : ViewModel() {

    private var mCameraDialog: CommonDialog? = null
@@ -158,12 +162,15 @@ class MainViewModel @Inject constructor(
                }
            }
        }
-
-        initTaskData()
+        viewModelScope.launch(Dispatchers.IO) {
+            initTaskData()
+            initQsRecordData()
+            initNoteData()
+        }
    }

    /**
-     * 初始话任务高亮高亮
+     * 初始化选中的任务高亮高亮
     */
    @RequiresApi(Build.VERSION_CODES.M)
    private fun initTaskData() {
@@ -182,11 +189,54 @@ class MainViewModel @Inject constructor(
            for (item in list) {
                mapController.lineHandler.omdbTaskLinkLayer.addLineList(item.hadLinkDvoList)
            }
+    private suspend fun initTaskData() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
+            val realm = Realm.getDefaultInstance()
+            val res = realm.where(TaskBean::class.java).equalTo("id", id).findFirst()
+            if (res != null) {
+                val taskBean = realm.copyFromRealm(res)
+                mapController.lineHandler.omdbTaskLinkLayer.addLineList(taskBean.hadLinkDvoList)
+            }
+        }
+    }
+
+    /**
+     * 初始化渲染质检数据
+     */
+    private suspend fun initQsRecordData() {
+        var list = mutableListOf<QsRecordBean>()
+        val realm = Realm.getDefaultInstance()
+        realm.executeTransaction {
+            val objects = realm.where<QsRecordBean>().findAll()
+            list = realm.copyFromRealm(objects)
+        }
+        for (item in list) {
+            mapController.markerHandle.addOrUpdateQsRecordMark(item)
+        }
+    }
+
+    /**
+     * 初始化渲染便签数据
+     */
+    private suspend fun initNoteData() {
+        var list = mutableListOf<NoteBean>()
+        val realm = Realm.getDefaultInstance()
+        realm.executeTransaction {
+            val objects = realm.where<NoteBean>().findAll()
+            list = realm.copyFromRealm(objects)
        }


+
+        for (item in list) {
+            mapController.markerHandle.addOrUpdateNoteMark(item)
+        }
    }

+    /**
+     * 初始化定位信息
+     */
    private fun initLocation() {
        //用于定位点存储到数据库
        viewModelScope.launch(Dispatchers.Default) {
--- 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
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.viewModels
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import com.navinfo.collect.library.map.NIMapController
@@ -14,7 +13,6 @@ import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentTaskLinkBinding
 import com.navinfo.omqs.ui.activity.map.MainActivity
 import com.navinfo.omqs.ui.fragment.BaseFragment
-import com.navinfo.omqs.ui.other.BaseToast
 import com.navinfo.omqs.ui.other.shareViewModels
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -144,7 +142,9 @@ class TaskLinkFragment : BaseFragment(), View.OnClickListener {
                onBackPressed()
            }
            binding.taskLinkBarSave -> {
-                viewModel.saveData()
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    viewModel.saveData()
+                }
            }
        }
    }
--- 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
@@ -2,12 +2,14 @@ package com.navinfo.omqs.ui.fragment.tasklink

 import android.content.SharedPreferences
 import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.navinfo.collect.library.data.entity.HadLinkDvoBean
 import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.omqs.Constant
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
@@ -22,14 +24,14 @@ import javax.inject.Inject

@HiltViewModel
 class TaskLinkViewModel @Inject constructor(
-    val mapController: NIMapController,
-    val sharedPreferences: SharedPreferences
+    private val mapController: NIMapController,
+    private val sharedPreferences: SharedPreferences
 ) : ViewModel(), SharedPreferences.OnSharedPreferenceChangeListener {

    /**
     * 种别
     */
-    private val kindList = listOf<TaskLinkInfoAdapterItem>(
+    private val kindList = listOf(
        TaskLinkInfoAdapterItem("高速道路", "1"),
        TaskLinkInfoAdapterItem("城市高速", "2"),
        TaskLinkInfoAdapterItem("国道", "3"),
@@ -47,7 +49,7 @@ class TaskLinkViewModel @Inject constructor(
    /**
     * FunctionGrade 功能等级
     */
-    private val functionLevelList = listOf<TaskLinkInfoAdapterItem>(
+    private val functionLevelList = listOf(
        TaskLinkInfoAdapterItem("等级1", "1"),
        TaskLinkInfoAdapterItem("等级2", "2"),
        TaskLinkInfoAdapterItem("等级3", "3"),
@@ -58,7 +60,7 @@ class TaskLinkViewModel @Inject constructor(
    /**
     * 数据级别
     */
-    private val dataLevelList = listOf<TaskLinkInfoAdapterItem>(
+    private val dataLevelList = listOf(
        TaskLinkInfoAdapterItem("Pro lane model(有高精车道模型覆盖的高速和城高link)", "1"),
        TaskLinkInfoAdapterItem("Lite lane model(有高精车道模型覆盖的普通路link)", "2"),
        TaskLinkInfoAdapterItem("Standard road model(其他link)", "3"),
@@ -115,7 +117,7 @@ class TaskLinkViewModel @Inject constructor(
            val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
            val realm = Realm.getDefaultInstance()
            val res = realm.where(TaskBean::class.java).equalTo("id", id).findFirst()
-            liveDataTaskBean.postValue(realm.copyFromRealm(res))
+            liveDataTaskBean.postValue(res?.let { realm.copyFromRealm(it) })
        }
    }

@@ -162,18 +164,17 @@ class TaskLinkViewModel @Inject constructor(
    /**
     * 保存数据
     */
+    @RequiresApi(Build.VERSION_CODES.M)
    fun saveData() {
        viewModelScope.launch(Dispatchers.Default) {
            if (liveDataTaskBean.value == null) {
                liveDataToastMessage.postValue("还没有选择任何一条任务！")
                return@launch
            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {

-                if (mapController.measureLayerHandler.mPathLayer.points.size < 2) {
-                    liveDataToastMessage.postValue("道路点少于2个！")
-                    return@launch
-                }
+            if (mapController.measureLayerHandler.mPathLayer.points.size < 2) {
+                liveDataToastMessage.postValue("道路点少于2个！")
+                return@launch
            }
            if (liveDataSelectKind.value == null) {
                liveDataToastMessage.postValue("请选择种别！")
@@ -187,7 +188,21 @@ class TaskLinkViewModel @Inject constructor(
                liveDataToastMessage.postValue("请选择数据等级！")
                return@launch
            }
-            val linkBean = HadLinkDvoBean(linkPid = UUID.randomUUID().toString())
+            val linkBean = HadLinkDvoBean(
+                linkPid = UUID.randomUUID().toString(),
+                linkStatus = 3,
+                geometry = GeometryTools.getLineString(mapController.measureLayerHandler.mPathLayer.points),
+                linkLength = mapController.measureLayerHandler.lineLenghtLiveData.value!!,
+            )
+            val task: TaskBean = liveDataTaskBean.value!!
+            task.hadLinkDvoList.add(linkBean)
+            val realm = Realm.getDefaultInstance()
+            realm.executeTransaction {
+                it.copyToRealmOrUpdate(task)
+            }
+            sharedPreferences.edit().putString(Constant.SHARED_SYNC_TASK_LINK_ID, linkBean.linkPid)
+                .apply()
+            liveDataFinish.postValue(true)
        }
    }

--- 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
@@ -1,9 +1,8 @@
 package com.navinfo.omqs.ui.fragment.tasklist

-import android.app.Dialog
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.Color
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Build
 import android.widget.Toast
 import androidx.annotation.RequiresApi
@@ -51,6 +50,8 @@ class TaskViewModel @Inject constructor(
     */
    val liveDataTaskUpload = MutableLiveData<Map<TaskBean, Boolean>>()

+//    private val colors =
+//        arrayOf(Color.RED, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.GREEN, Color.CYAN)
    /**
     * 用来确定是否关闭
     */
@@ -72,13 +73,16 @@ class TaskViewModel @Inject constructor(
    private var filterTaskJob: Job? = null


+    init {
+        sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
    /**
     * 下载任务列表
     */
    fun getTaskList(context: Context) {
        viewModelScope.launch(Dispatchers.IO) {

-            var taskList: List<TaskBean> = mutableListOf()
            when (val result = networkService.getTaskList(Constant.USER_ID)) {
                is NetResult.Success -> {
                    if (result.data != null) {
@@ -94,6 +98,7 @@ class TaskViewModel @Inject constructor(
                                        task.fileSize = item.fileSize
                                        task.status = item.status
                                        task.currentSize = item.currentSize
+                                        task.hadLinkDvoList = item.hadLinkDvoList
                                        //已上传后不在更新操作时间
                                        if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
                                            //赋值时间，用于查询过滤
@@ -127,27 +132,40 @@ class TaskViewModel @Inject constructor(

                is NetResult.Loading -> {}
            }
-            val realm = Realm.getDefaultInstance()
-            //过滤掉已上传的超过90天的数据
-            var nowTime: Long = DateTimeUtil.getNowDate().time
-            var beginNowTime: Long = nowTime - 90 * 3600 * 24 * 1000L
-            var syncUpload: Int = FileManager.Companion.FileUploadStatus.DONE
-            val objects =
-                realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or()
-                    .between("operationTime", beginNowTime, nowTime)
-                    .equalTo("syncStatus", syncUpload).findAll()
-            taskList = realm.copyFromRealm(objects)
+            getLocalTaskList()
+        }
+    }
+
+    /**
+     * 获取任务列表
+     */
+    private suspend fun getLocalTaskList() {
+        val realm = Realm.getDefaultInstance()
+        //过滤掉已上传的超过90天的数据
+        val nowTime: Long = DateTimeUtil.getNowDate().time
+        val beginNowTime: Long = nowTime - 90 * 3600 * 24 * 1000L
+        val syncUpload: Int = FileManager.Companion.FileUploadStatus.DONE
+        val objects =
+            realm.where(TaskBean::class.java).notEqualTo("syncStatus", syncUpload).or()
+                .between("operationTime", beginNowTime, nowTime)
+                .equalTo("syncStatus", syncUpload).findAll()
+        val taskList = realm.copyFromRealm(objects)
+        for (item in taskList) {
+            FileManager.checkOMDBFileInfo(item)
+        }
+        liveDataTaskList.postValue(taskList)
+        val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
+        if (id > -1) {
            for (item in taskList) {
-                FileManager.checkOMDBFileInfo(item)
-            }
-            liveDataTaskList.postValue(taskList)
-            val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1)
-            if (id > -1) {
-                for(item in taskList){
-                    if(item.id == id){
-                        currentSelectTaskBean = item
-                        liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
+                if (item.id == id) {
+                    currentSelectTaskBean = item
+                    liveDataTaskLinks.postValue(currentSelectTaskBean!!.hadLinkDvoList)
+                    withContext(Dispatchers.Main) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            showTaskLinks(currentSelectTaskBean!!)
+                        }
                    }
+                    break
                }
            }
        }
@@ -156,14 +174,21 @@ class TaskViewModel @Inject constructor(
    /**
     * 设置当前选择的任务，并高亮当前任务的所有link
     */
-    @RequiresApi(Build.VERSION_CODES.M)
+
    fun setSelectTaskBean(taskBean: TaskBean) {

-        sharedPreferences.edit().putInt(Constant.SELECT_TASK_ID, taskBean.id).commit()
+        sharedPreferences.edit().putInt(Constant.SELECT_TASK_ID, taskBean.id).apply()

        currentSelectTaskBean = taskBean

        liveDataTaskLinks.value = taskBean.hadLinkDvoList
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            showTaskLinks(taskBean)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    private fun showTaskLinks(taskBean: TaskBean) {

        mapController.lineHandler.omdbTaskLinkLayer.removeAll()
        mapController.markerHandle.clearNiLocationLayer()
@@ -238,7 +263,9 @@ class TaskViewModel @Inject constructor(
        super.onCleared()
    }

-
+    /**
+     * 保存link补作业原因
+     */
    suspend fun saveLinkReason(bean: HadLinkDvoBean, text: String) {
        withContext(Dispatchers.IO) {
            currentSelectTaskBean?.let {
@@ -247,11 +274,12 @@ class TaskViewModel @Inject constructor(
                        item.reason = text
                    }
                }
+                val realm = Realm.getDefaultInstance()
+                realm.executeTransaction { r ->
+                    r.copyToRealmOrUpdate(it)
+                }
            }
-            val realm = Realm.getDefaultInstance()
-            realm.executeTransaction {
-                realm.copyToRealmOrUpdate(currentSelectTaskBean)
-            }
+
        }
    }

@@ -275,6 +303,9 @@ class TaskViewModel @Inject constructor(
        }
    }

+    /**
+     * 筛选link
+     */
    fun filterTask(pidKey: String) {
        if (currentSelectTaskBean == null)
            return
@@ -292,6 +323,9 @@ class TaskViewModel @Inject constructor(
        }
    }

+    /**
+     * 关闭任务
+     */
    fun removeTask(context: Context, taskBean: TaskBean) {
        if (taskBean != null) {
            val mDialog = FirstDialog(context)
@@ -345,6 +379,50 @@ class TaskViewModel @Inject constructor(
            })
            mDialog.show()
        }
+        val mDialog = FirstDialog(context)
+        mDialog.setTitle("提示？")
+        mDialog.setMessage("是否关闭，请确认！")
+        mDialog.setPositiveButton(
+            "确定"
+        ) { _, _ ->
+            mDialog.dismiss()
+            viewModelScope.launch(Dispatchers.IO) {
+                val realm = Realm.getDefaultInstance()
+                realm.executeTransaction {
+                    val objects = it.where(TaskBean::class.java)
+                        .equalTo("id", taskBean.id).findFirst()
+                    objects?.deleteFromRealm()
+                }
+                //遍历删除对应的数据
+                taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
+                    val qsRecordList = realm.where(QsRecordBean::class.java)
+                        .equalTo("linkId", hadLinkDvoBean.linkPid).findAll()
+                    if (qsRecordList != null && qsRecordList.size > 0) {
+                        val copyList = realm.copyFromRealm(qsRecordList)
+                        copyList.forEach {
+                            it.deleteFromRealm()
+                            mapController.markerHandle.removeQsRecordMark(it)
+                            mapController.mMapView.vtmMap.updateMap(true)
+                        }
+                    }
+                }
+                //过滤掉已上传的超过90天的数据
+                val nowTime: Long = DateTimeUtil.getNowDate().time
+                val beginNowTime: Long = nowTime - 90 * 3600 * 24 * 1000L
+                val syncUpload: Int = FileManager.Companion.FileUploadStatus.DONE
+                val objects = realm.where(TaskBean::class.java)
+                    .notEqualTo("syncStatus", syncUpload).or()
+                    .between("operationTime", beginNowTime, nowTime)
+                    .equalTo("syncStatus", syncUpload).findAll()
+                val taskList = realm.copyFromRealm(objects)
+                for (item in taskList) {
+                    FileManager.checkOMDBFileInfo(item)
+                }
+                liveDataTaskList.postValue(taskList)
+            }
+        }
+        mDialog.setNegativeButton("取消", null)
+        mDialog.show()
    }

    fun checkUploadTask(context: Context, taskBean: TaskBean) {
@@ -361,19 +439,15 @@ class TaskViewModel @Inject constructor(
                        mDialog.setTitle("提示？")
                        mDialog.setMessage("此任务中存在未测评link，请确认！")
                        mDialog.setPositiveButton(
-                            "确定",
-                            object : FirstDialog.OnClickListener {
-                                override fun onClick(dialog: Dialog?, which: Int) {
-                                    mDialog.dismiss()
-                                    map[taskBean] = true
-                                    liveDataTaskUpload.postValue(map)
-                                }
-                            })
-                        mDialog.setNegativeButton("取消", object : FirstDialog.OnClickListener {
-                            override fun onClick(dialog: Dialog?, which: Int) {
-                                mDialog.dismiss()
-                            }
-                        })
+                            "确定"
+                        ) { _, _ ->
+                            mDialog.dismiss()
+                            map[taskBean] = true
+                            liveDataTaskUpload.postValue(map)
+                        }
+                        mDialog.setNegativeButton(
+                            "取消"
+                        ) { _, _ -> mDialog.dismiss() }
                        mDialog.show()
                    }
                    return@launch
@@ -383,4 +457,15 @@ class TaskViewModel @Inject constructor(
            }
        }
    }
+
+    /**
+     * 监听新增的评测link
+     */
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        if (key == Constant.SHARED_SYNC_TASK_LINK_ID) {
+            viewModelScope.launch(Dispatchers.IO) {
+                getLocalTaskList()
+            }
+        }
+    }
 }