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

2023-05-04 18:03:44 +08:00 · 2023-05-04 18:03:44 +08:00 · b31f301ae6
commit b31f301ae6
parent dfbdc1500f 53bb2f3ca6
15 changed files with 144 additions and 63 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -5,6 +5,7 @@ plugins {
    id 'com.google.dagger.hilt.android'
    id 'realm-android'
    id 'kotlin-parcelize' // 序列化
+    id 'androidx.navigation.safeargs.kotlin'//Safe Args传递数据
 }
 android {
    namespace 'com.navinfo.omqs'
@ -109,6 +110,8 @@ dependencies {

    // 读取spatialite文件
    implementation 'com.github.sevar83:android-spatialite:2.0.1'
+    //fragment 传递数据
+    implementation "androidx.navigation:navigation-ui-ktx:2.5.3"
 }
 //允许引用生成的代码
 kapt {
--- a/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt
@ -0,0 +1,15 @@
+package com.navinfo.omqs.bean
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class SignBean(
+    //图标ID
+    val iconId: Int,
+    val distance: Int = 0,
+    val iconText: String = "",
+    val elementId: String = "",
+    val linkId: String,
+    val geometry: String,
+) : Parcelable
--- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
@ -20,7 +20,6 @@ import org.oscim.core.MercatorProjection
 import javax.inject.Inject
 import kotlin.streams.toList

-@RequiresApi(Build.VERSION_CODES.N)
 class RealmOperateHelper() {
    @Inject
    lateinit var niMapController: NIMapController
@ -32,6 +31,7 @@ class RealmOperateHelper() {
     * @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL
     * @param sort 是否需要排序
     * */
+    @RequiresApi(Build.VERSION_CODES.N)
    suspend fun queryLink(
        point: Point,
        buffer: Double = DEFAULT_BUFFER,
@ -102,6 +102,7 @@ class RealmOperateHelper() {
     * @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL
     * @param sort 是否需要排序
     * */
+    @RequiresApi(Build.VERSION_CODES.N)
    suspend fun queryElement(
        point: Point,
        buffer: Double = DEFAULT_BUFFER,
@ -154,12 +155,13 @@ class RealmOperateHelper() {
    suspend fun queryLinkByLinkPid(linkPid: String): MutableList<RenderEntity> {
        val result = mutableListOf<RenderEntity>()
        withContext(Dispatchers.IO) {
-            val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java)
+            val realm = Realm.getDefaultInstance()
+            val realmList = realm.where(RenderEntity::class.java)
                .notEqualTo("table", "OMDB_RD_LINK")
                .and()
                .equalTo("properties['${LinkTable.linkPid}']", linkPid)
                .findAll()
-            result.addAll(realmList)
+            result.addAll(realm.copyFromRealm(realmList))
        }
        return result
    }
--- 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
@ -11,9 +11,7 @@ import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.blankj.utilcode.util.ToastUtils
 import com.navinfo.collect.library.map.NIMapController
-import com.navinfo.collect.library.map.handler.NiLocationListener
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityMainBinding
@ -38,7 +36,25 @@ class MainActivity : BaseActivity() {
    @Inject
    lateinit var offlineMapDownloadManager: OfflineMapDownloadManager

-    private val signAdapter by lazy { SignAdapter() }
+    private val rightController by lazy {
+        findNavController(R.id.main_activity_right_fragment)
+    }
+
+    private val signAdapter by lazy {
+        SignAdapter { position, signBean ->
+//            val directions =
+//                EmptyFragmentDirections.emptyFragmentToEvaluationResultFragment(
+//                )
+//            rightController.navigate(directions)
+            rightController.currentDestination?.let {
+                if (it.id == R.id.EmptyFragment) {
+                    val bundle = Bundle()
+                    bundle.putParcelable("SignBean", signBean)
+                    rightController.navigate(R.id.EvaluationResultFragment, bundle)
+                }
+            }
+        }
+    }

    override fun onCreate(savedInstanceState: Bundle?) {
        WindowCompat.setDecorFitsSystemWindows(window, false)
@ -141,13 +157,13 @@ class MainActivity : BaseActivity() {
    }

    fun voiceOnTouchStart() {
-        viewModel!!.startSoundMetter(this,binding.mainActivityVoice)
+        viewModel.startSoundMetter(this, binding.mainActivityVoice)
    }

    @RequiresApi(Build.VERSION_CODES.Q)
    fun voiceOnTouchStop() {
        if (Constant.IS_VIDEO_SPEED) {
-            viewModel!!.stopSoundMeter()
+            viewModel.stopSoundMeter()
        }
    }

--- 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
@ -21,7 +21,6 @@ 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.RenderEntity
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.OnQsRecordItemClickListener
@ -29,6 +28,7 @@ import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.ui.dialog.CommonDialog
 import com.navinfo.omqs.ui.manager.TakePhotoManager
@ -157,6 +157,9 @@ class MainViewModel @Inject constructor(
                                        iconId = R.drawable.icon_speed_limit,
                                        iconText = element.name,
                                        distance = distance.toInt(),
+                                        elementId = element.id,
+                                        linkId = linkId,
+                                        geometry = element.geometry
                                    )
                                )
                            }
@ -182,6 +185,9 @@ class MainViewModel @Inject constructor(

    override fun onCleared() {
        super.onCleared()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            mapController.lineHandler.removeLine()
+        }
    }

    //点击相机按钮
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
@ -3,11 +3,13 @@ package com.navinfo.omqs.ui.activity.map
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.AdapterSignBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder

-class SignAdapter : BaseRecyclerViewAdapter<SignBean>() {
+class SignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = null) :
+    BaseRecyclerViewAdapter<SignBean>() {
    override fun getItemViewRes(position: Int): Int {
        return R.layout.adapter_sign
    }
@ -23,5 +25,8 @@ class SignAdapter : BaseRecyclerViewAdapter<SignBean>() {
        val item = data[position]
        bd.signMainIcon.background = holder.viewBinding.root.context.getDrawable(item.iconId)
        bd.signMainIcon.text = item.iconText
+        bd.root.setOnClickListener {
+            itemListener?.invoke(position, item)
+        }
    }
 }
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignBean.kt
@ -1,8 +0,0 @@
-package com.navinfo.omqs.ui.activity.map
-
-data class SignBean(
-    //图标ID
-    val iconId: Int,
-    val distance: Int = 0,
-    val iconText: String = ""
-)
--- 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
@ -13,6 +13,7 @@ import androidx.navigation.NavOptions
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.databinding.FragmentEvaluationResultBinding
 import com.navinfo.omqs.ui.fragment.BaseFragment
 import com.navinfo.omqs.ui.other.shareViewModels
@ -24,6 +25,7 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
    private lateinit var binding: FragmentEvaluationResultBinding
    private val viewModel by shareViewModels<EvaluationResultViewModel>("QsRecode")

+    //    private val args:EmptyFragmentArgs by navArgs()
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
    ): View {
@ -98,17 +100,23 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
        /**
         * 读取元数据
         */
-        if (arguments != null) {
-            val id = requireArguments().getString("QsId")
-            //语音路径
-            val filePath = requireArguments().getString("filePath")
-            if (id != null) {
-                viewModel.initData(id)
-            } else {
-                viewModel.initNewData(filePath!!)
+//        val id = args.qsId
+        var id: String = ""
+        var signBean: SignBean? = null
+        var filePath: String = ""
+        arguments?.let {
+            id = it.getString("QsId", "")
+            filePath = it.getString("filePath", "")
+            try {
+                signBean = it.getParcelable("SignBean")
+            } catch (e: java.lang.Exception) {
            }
+        }
+
+        if (id == null || id.isEmpty()) {
+            viewModel.initNewData(signBean, filePath)
        } else {
-            viewModel.initNewData("")
+            viewModel.initData(id)
        }
 //        //监听大分类数据变化
 //        viewModel.liveDataClassTypeList.observe(viewLifecycleOwner) {
--- 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
@ -26,6 +26,7 @@ import com.navinfo.collect.library.data.entity.QsRecordBean
 import com.navinfo.collect.library.data.entity.RenderEntity.Companion.LinkTable
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.utils.GeometryTools
+import com.navinfo.omqs.bean.SignBean
 import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ChatMsgEntity
@ -108,7 +109,7 @@ class EvaluationResultViewModel @Inject constructor(
        super.onCleared()
        Log.e("jingo", "EvaluationResultViewModel 销毁了 ${hashCode()}")
        mapController.markerHandle.removeMarker(markerTitle)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
            mapController.lineHandler.removeLine()
        }
    }
@ -117,12 +118,13 @@ class EvaluationResultViewModel @Inject constructor(
    /**
     * 查询数据库，获取问题分类
     */
-    fun initNewData(filePath: String) {
+    fun initNewData(bean: SignBean?,filePath: String) {
        viewModelScope.launch(Dispatchers.IO) {
            getClassTypeList()
            getProblemLinkList()
        }
        val geoPoint = mapController.locationLayerHandler.getCurrentGeoPoint()
+        if (bean == null) {
            geoPoint?.let {
                liveDataQsRecordBean.value!!.geometry = GeometryTools.createGeometry(it).toText()
                mapController.markerHandle.addMarker(geoPoint, markerTitle)
@ -130,12 +132,30 @@ class EvaluationResultViewModel @Inject constructor(
                    captureLink(geoPoint.longitude, geoPoint.latitude)
                }
            }
+        } else {
+            liveDataQsRecordBean.value?.run {
+                elementId = bean.elementId
+                linkId = bean.linkId
+                if (linkId.isNotEmpty()) {
+                    viewModelScope.launch {
+                        val link = realmOperateHelper.queryLink(linkId)
+                        link?.let { l ->
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                mapController.lineHandler.showLine(l.geometry)
+                            }
+                        }
+                    }
+                }
+            }
+            val point = GeometryTools.createGeoPoint(bean.geometry)
+            mapController.markerHandle.addMarker(point, markerTitle)
+        }

        addChatMsgEntity(filePath)
    }

    /**
-     * 捕捉到路
+     * 捕捉道路
     */
    private suspend fun captureLink(longitude: Double, latitude: Double) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@ -364,7 +384,7 @@ class EvaluationResultViewModel @Inject constructor(

    fun addChatMsgEntity(filePath: String) {

-        if(filePath!=null){
+        if(filePath.isNotEmpty()){
            var chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
            if(listDataChatMsgEntityList.value?.isEmpty() == false){
                chatMsgEntityList = listDataChatMsgEntityList.value!!
--- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt
@ -1,7 +1,9 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult

+import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.TextItemSelectBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
@ -21,6 +23,7 @@ class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) :
        return BaseViewHolder(viewBinding)
    }

+    @RequiresApi(Build.VERSION_CODES.M)
    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
        val bd = holder.viewBinding as TextItemSelectBinding
        val title = data[position]
--- 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
@ -50,7 +50,7 @@ class QsRecordListFragment : BaseFragment(){
        binding.qsRecyclerview.addItemDecoration(itemDecoration)
        viewModel.getList(requireContext())
        // itemClick
-        adapter!!.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
+        adapter.setOnKotlinItemClickListener(object : QsRecordListAdapter.IKotlinItemClickListener {
            override fun onItemClickListener(position: Int) {
                viewModel.onItemClickListener(activity as MainActivity,position)
                findNavController().popBackStack()
--- a/app/src/main/res/layout/fragment_evaluation_result.xml
+++ b/app/src/main/res/layout/fragment_evaluation_result.xml
@ -81,7 +81,7 @@
                    android:layout_height="wrap_content"
                    android:layout_marginTop="5dp"
                    android:background="@drawable/fm_card_map_down_status_bg"
-                    android:onClick="@{fragment.onClick}"
+                    android:onClick="@{fragment::onClick}"
                    android:text="@{viewModel.liveDataQsRecordBean.phenomenon}" />

                <TextView
@ -90,7 +90,7 @@
                    android:layout_height="wrap_content"
                    android:layout_marginTop="5dp"
                    android:background="@drawable/fm_card_map_down_status_bg"
-                    android:onClick="@{fragment.onClick}"
+                    android:onClick="@{fragment::onClick}"
                    android:text="@{viewModel.liveDataQsRecordBean.problemLink}" />

                <TextView
@ -99,7 +99,7 @@
                    android:layout_height="wrap_content"
                    android:layout_marginTop="5dp"
                    android:background="@drawable/fm_card_map_down_status_bg"
-                    android:onClick="@{fragment.onClick}"
+                    android:onClick="@{fragment::onClick}"
                    android:text="@{viewModel.liveDataQsRecordBean.cause}" />

                <TextView
--- a/app/src/main/res/navigation/right_fragment_nav_graph.xml
+++ b/app/src/main/res/navigation/right_fragment_nav_graph.xml
@ -9,16 +9,25 @@
        android:id="@+id/EmptyFragment"
        android:name="com.navinfo.omqs.ui.fragment.empty.EmptyFragment"
        android:label="空页面"
-        tools:layout="@layout/fragment_empty"></fragment>
+        tools:layout="@layout/fragment_empty">
+<!--        <action-->
+<!--            android:id="@+id/EmptyFragment_to_EvaluationResultFragment"-->
+<!--            app:destination="@id/EvaluationResultFragment" />-->
+<!--        <argument-->
+<!--            android:name="QsId"-->
+<!--            app:argType="string"-->
+<!--            app:nullable="true" />-->
+<!--        <argument-->
+<!--            android:name="SignBean"-->
+<!--            app:argType="com.navinfo.omqs.ui.activity.map.SignBean"-->
+<!--            />-->
+    </fragment>

    <fragment
        android:id="@+id/EvaluationResultFragment"
        android:name="com.navinfo.omqs.ui.fragment.evaluationresult.EvaluationResultFragment"
        android:label="评测页面"
        tools:layout="@layout/fragment_evaluation_result">
-        <argument
-            android:name="QsId"
-            app:argType="string"
-            app:nullable="true" />
+
    </fragment>
 </navigation>
--- a/build.gradle
+++ b/build.gradle
@ -4,6 +4,7 @@
 buildscript {
    dependencies {
        classpath "io.realm:realm-gradle-plugin:10.11.1"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
    }
 }
 plugins {
@ -11,4 +12,5 @@ plugins {
    id 'com.android.library' version '7.3.1' apply false
    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
    id 'com.google.dagger.hilt.android' version '2.44' apply false
+
 }
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt
@ -26,7 +26,7 @@ import org.oscim.layers.vector.VectorLayer
 import org.oscim.layers.vector.geometries.Style
 import org.oscim.map.Map

-@RequiresApi(Build.VERSION_CODES.N)
+@RequiresApi(Build.VERSION_CODES.M)
 class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler(context, mapView),
    Map.UpdateListener {