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

Conflicts: app/src/main/java/com/navinfo/omqs/Constant.kt app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
2023-06-26 14:18:48 +08:00
parent 97ad787f51 f6346acb89
commit fb08f42848
41 changed files with 516 additions and 460 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.transition.AutoTransition
 import androidx.transition.Scene
@@ -64,14 +65,12 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
            override fun onTransitionStart(transition: androidx.transition.Transition) {
                sceneFlag = true
                if (mFragment != null) {
-                    Log.e("jingo", "动画开始B mFragment 不为null")
                    childFragmentManager.beginTransaction().remove(mFragment!!).commit()
                    mFragment = null
                }
            }

            override fun onTransitionEnd(transition: androidx.transition.Transition) {
-                Log.e("jingo", "动画A结束")
                initOnClickListener()
            }

@@ -89,7 +88,6 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
            override fun onTransitionStart(transition: androidx.transition.Transition) {
                sceneFlag = false
                if (mFragment != null) {
-                    Log.e("jingo", "动画开始A mFragment 不为null")
                    childFragmentManager.beginTransaction().replace(fragmentId, mFragment!!)
                        .commit()
                }
@@ -156,6 +154,11 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
         */
        binding.consoleRoot.findViewById<View>(R.id.console_task_bg)?.setOnClickListener(this)
        binding.consoleRoot.findViewById<View>(R.id.console_task_icon_bg)?.setOnClickListener(this)
+        /**
+         * 路径规划
+         */
+        binding.consoleRoot.findViewById<View>(R.id.console_route_bg)?.setOnClickListener(this)
+        binding.consoleRoot.findViewById<View>(R.id.console_route_icon_bg)?.setOnClickListener(this)
    }

    override fun onDestroy() {
@@ -235,6 +238,9 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
                        (a as MainActivity).onClickResFragment()
                    }
                }
+                /**
+                 * 任务列表
+                 */
                R.id.console_task_icon_bg, R.id.console_task_bg -> {
                    activity?.let { a ->
                        a.supportFragmentManager.beginTransaction().remove(this).commit()
@@ -242,6 +248,12 @@ class ConsoleFragment : BaseFragment(), OnClickListener {
                    }

                }
+                /**
+                 * 路径规划
+                 */
+                R.id.console_route_bg, R.id.console_route_icon_bg -> {
+                    Toast.makeText(requireContext(), "功能开发中", Toast.LENGTH_SHORT).show()
+                }
                else -> {}
            }
        }
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
@@ -98,17 +98,14 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
            when (event?.action) {
                MotionEvent.ACTION_DOWN -> {
                    voiceOnTouchStart()//Do Something
-                    Log.e("qj", "voiceOnTouchStart")
                }

                MotionEvent.ACTION_UP -> {
                    voiceOnTouchStop()//Do Something
-                    Log.e("qj", "ACTION_UP")
                }

                MotionEvent.ACTION_CANCEL -> {
                    voiceOnTouchStop()//Do Something
-                    Log.e("qj", "ACTION_CANCEL")
                }
            }
            true
--- 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
@@ -97,7 +97,6 @@ class EvaluationResultViewModel @Inject constructor(

    init {
        liveDataQsRecordBean.value = QsRecordBean(id = UUID.randomUUID().toString())
-        Log.e("jingo", "EvaluationResultViewModel 创建了 ${hashCode()}")
        viewModelScope.launch {
            mapController.onMapClickFlow.collect {
                liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
@@ -111,7 +110,6 @@ class EvaluationResultViewModel @Inject constructor(

    override fun onCleared() {
        super.onCleared()
-        Log.e("jingo", "EvaluationResultViewModel 销毁了 ${hashCode()}")
        mapController.markerHandle.removeMarker(markerTitle)
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
            mapController.lineHandler.removeLine()
@@ -223,7 +221,6 @@ class EvaluationResultViewModel @Inject constructor(
     * 获取问题环节列表和初步问题
     */
    fun getProblemLinkList() {
-        Log.e("jingo", "getProblemLinkList S")
        viewModelScope.launch(Dispatchers.IO) {
            val list = roomAppDatabase.getScRootCauseAnalysisDao().findAllData()
            list?.let { tl ->
@@ -242,11 +239,9 @@ class EvaluationResultViewModel @Inject constructor(
                    }
                    if (liveDataQsRecordBean.value!!.problemLink.isEmpty()) {
                        liveDataQsRecordBean.value!!.problemLink = middleList[0]
-                        Log.e("jingo", "getProblemLinkList ${middleList[0]}")
                    }
                    if (liveDataQsRecordBean.value!!.cause.isEmpty()) {
                        liveDataQsRecordBean.value!!.cause = rightList[0].text
-                        Log.e("jingo", "getProblemLinkList ${rightList[0].text}")
                    }
                    liveDataQsRecordBean.postValue(liveDataQsRecordBean.value)
 //                    liveDataMiddleTypeList.postValue(middleList)
@@ -254,14 +249,12 @@ class EvaluationResultViewModel @Inject constructor(
                }
            }
        }
-        Log.e("jingo", "getProblemLinkList E")
    }

    /**
     * 获取问题类型列表和问题现象
     */
    private suspend fun getProblemList(classType: String) {
-        Log.e("jingo", "getProblemList S")
        val typeList = roomAppDatabase.getScProblemTypeDao().findProblemTypeList(classType)
        typeList?.let { tl ->
            if (tl.isNotEmpty()) {
@@ -279,18 +272,15 @@ class EvaluationResultViewModel @Inject constructor(
                }
                if (liveDataQsRecordBean.value!!.problemType.isEmpty()) {
                    liveDataQsRecordBean.value!!.problemType = typeTitleList[0]
-                    Log.e("jingo", "getProblemList ${typeTitleList[0]}")
                }
 //                liveDataMiddleTypeList.postValue(typeTitleList)
                if (liveDataQsRecordBean.value!!.phenomenon.isEmpty()) {
                    liveDataQsRecordBean.value!!.phenomenon = phenomenonRightList[0].text
-                    Log.e("jingo", "getProblemList ${phenomenonRightList[0].text}")
                }
                liveDataQsRecordBean.postValue(liveDataQsRecordBean.value)
                liveDataRightTypeList.postValue(phenomenonRightList)
            }
        }
-        Log.e("jingo", "getProblemList E")
    }

    /**
@@ -341,7 +331,6 @@ class EvaluationResultViewModel @Inject constructor(
                mDialog.dismiss()
                viewModelScope.launch(Dispatchers.IO) {
                    val realm = Realm.getDefaultInstance()
-                    Log.e("jingo", "realm hashCOde ${realm.hashCode()}")
                    realm.executeTransaction {
                        val objects = it.where(QsRecordBean::class.java)
                            .equalTo("id", liveDataQsRecordBean.value?.id).findFirst()
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt
@@ -34,7 +34,6 @@ class PhenomenonFragment :
        savedInstanceState: Bundle?
    ): View {
        _binding = FragmentPhenomenonBinding.inflate(inflater, container, false)
-        Log.e("jingo", "PhenomenonFragment onCreateView ${hashCode()}")
        return binding.root
    }

--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerViewModel.kt
@@ -23,7 +23,7 @@ class LayerManagerViewModel() : ViewModel() {
    }

    fun saveLayerConfigList(context: Context, listData: List<ImportConfig>) {
-        SPStaticUtils.put(Constant.EVENT_LAYER_MANAGER_CHANGE, gson.toJson(listData))
+        Constant.LAYER_CONFIG_LIST = listData
        // 发送新的配置数据
        viewModelScope.launch {
            FlowEventBus.post(Constant.EVENT_LAYER_MANAGER_CHANGE, listData)
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
@@ -34,15 +34,12 @@ class OfflineMapCityListAdapter(
            val cityBean = data[it.tag as Int]
            when (cityBean.status) {
                FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.ERROR -> {
-                    Log.e("jingo", "开始下载 ${cityBean.status}")
                    downloadManager.start(cityBean.id)
                }
                FileDownloadStatus.LOADING, FileDownloadStatus.WAITING -> {
-                    Log.e("jingo", "暂停 ${cityBean.status}")
                    downloadManager.pause(cityBean.id)
                }
                else -> {
-                    Log.e("jingo", "暂停 ${cityBean.status}")
                }
            }
        }
@@ -85,7 +82,6 @@ class OfflineMapCityListAdapter(
                if (id == holder.tag) {
                    val binding: AdapterOfflineMapCityBinding =
                        holder.viewBinding as AdapterOfflineMapCityBinding
-                    Log.e("jingo", "进度条更新 $id ${bean.id} ${holder.tag} ")
                    changeViews(binding, bean)
                }
            }
@@ -95,7 +91,6 @@ class OfflineMapCityListAdapter(


    private fun changeViews(binding: AdapterOfflineMapCityBinding, cityBean: OfflineMapCityBean) {
-        Log.e("jingo", "changeViews ${cityBean.status}")
        binding.offlineMapProgress.progress =
            (cityBean.currentSize * 100 / cityBean.fileSize).toInt()
        when (cityBean.status) {
--- 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
@@ -115,11 +115,17 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) :
                    viewModel.readRealmData()
                    // 定位到指定位置
                    niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint(40.031657799200346, 116.32207834810715))
-                }
-                R.id.personal_center_menu_task_list -> {
-                    findNavController().navigate(R.id.TaskManagerFragment)
+                        .animateTo(GeoPoint( 39.80392140200183, 116.51446703352337   ))
                }
+//                R.id.personal_center_menu_task_list -> {
+//                    findNavController().navigate(R.id.TaskManagerFragment)
+//                }
+//                R.id.personal_center_menu_qs_record_list -> {
+//                    findNavController().navigate(R.id.QsRecordListFragment)
+//                }
+//                R.id.personal_center_menu_layer_manager -> { // 图层管理
+//                    findNavController().navigate(R.id.QsLayerManagerFragment)
+//                }
                R.id.personal_center_menu_qs_record_list -> {
                    findNavController().navigate(R.id.QsRecordListFragment)
                }
--- 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
@@ -26,7 +26,6 @@ class QsRecordListViewModel @Inject constructor(
    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
@@ -39,17 +39,14 @@ class TaskListAdapter(
            if (taskBean.hadLinkDvoList.isNotEmpty()) {
                when (taskBean.status) {
                    FileDownloadStatus.NONE, FileDownloadStatus.UPDATE, FileDownloadStatus.PAUSE, FileDownloadStatus.IMPORT, FileDownloadStatus.ERROR -> {
-                        Log.e("jingo", "开始下载 ${taskBean.status}")
                        downloadManager.start(taskBean.id)
                    }

                    FileDownloadStatus.LOADING, FileDownloadStatus.WAITING -> {
-                        Log.e("jingo", "暂停 ${taskBean.status}")
                        downloadManager.pause(taskBean.id)
                    }

                    else -> {
-                        Log.e("jingo", "暂停 ${taskBean.status}")
                    }
                }
            } else {
@@ -61,7 +58,6 @@ class TaskListAdapter(
    private val uploadBtnClick = View.OnClickListener() {
        if (it.tag != null) {
            val taskBean = data[it.tag as Int]
-            Log.e("jingo", "开始上传 ${taskBean.syncStatus}")
            if (taskBean.hadLinkDvoList.isNotEmpty()) {
                when (taskBean.syncStatus) {
                    FileUploadStatus.NONE, FileUploadStatus.UPLOADING, FileUploadStatus.ERROR, FileUploadStatus.WAITING -> {