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

Conflicts: app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
2023-07-21 15:30:20 +08:00
parent 2bb7203539 c83ed1b97e
commit 6c386505d6
22 changed files with 1518 additions and 306 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
@@ -257,6 +257,7 @@ class EvaluationResultViewModel @Inject constructor(
                        if (classType2 != null) {
                            classType = classType2
                        }
+                        classCode = bean.renderEntity.code.toString()
                    }
                    //如果右侧栏没数据，给个默认值
                    if (liveDataQsRecordBean.value!!.classType.isEmpty()) {
@@ -343,11 +344,12 @@ class EvaluationResultViewModel @Inject constructor(
    /**
     * 查询问题类型列表
     */
-    fun getProblemTypeList(classType: String) {
+    fun getProblemTypeList(scProblemTypeBean: ScProblemTypeBean) {
        viewModelScope.launch(Dispatchers.IO) {
-            getProblemList(classType)
+            getProblemList(scProblemTypeBean.classType)
        }
-        classTypeTemp = classType
+        classTypeTemp = scProblemTypeBean.classType
+        classCodeTemp = scProblemTypeBean.elementCode
    }

    /**
@@ -464,7 +466,7 @@ class EvaluationResultViewModel @Inject constructor(
                    mapController.markerHandle.addMarker(
                        GeoPoint(
                            p.latitude, p.longitude
-                        ), TAG
+                        ), TAG, "", null
                    )

                    //获取linkid
@@ -484,163 +486,163 @@ class EvaluationResultViewModel @Inject constructor(
                    liveDataQsRecordBean.value?.attachmentBeanList = it.attachmentBeanList
                    // 显示语音数据到界面
                    getChatMsgEntityList()
-                }
+        }
            } else {
                liveDataToastMessage.postValue("数据读取失败")
-            }
-        }
    }
+}
+}

-    /**
-     * 查询问题类型列表
-     */
+/**
+ * 查询问题类型列表
+ */
    private suspend fun getChatMsgEntityList() {
-        val chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
-        liveDataQsRecordBean.value?.attachmentBeanList?.forEach {
-            //1 录音
-            if (it.type == 1) {
-                val chatMsgEntity = ChatMsgEntity()
-                chatMsgEntity.name = it.name
-                chatMsgEntity.voiceUri = Constant.USER_DATA_ATTACHEMNT_PATH
-                chatMsgEntityList.add(chatMsgEntity)
-            }
-        }
-        listDataChatMsgEntityList.postValue(chatMsgEntityList)
-    }
-
-    fun addChatMsgEntity(filePath: String) {
-
-        if (filePath.isNotEmpty()) {
-            var chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
-            if (listDataChatMsgEntityList.value?.isEmpty() == false) {
-                chatMsgEntityList = listDataChatMsgEntityList.value!!
-            }
+    val chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
+    liveDataQsRecordBean.value?.attachmentBeanList?.forEach {
+        //1 录音
+        if (it.type == 1) {
            val chatMsgEntity = ChatMsgEntity()
-            chatMsgEntity.name = filePath.replace(Constant.USER_DATA_ATTACHEMNT_PATH, "").toString()
+            chatMsgEntity.name = it.name
            chatMsgEntity.voiceUri = Constant.USER_DATA_ATTACHEMNT_PATH
            chatMsgEntityList.add(chatMsgEntity)
-
-
-            var attachmentList: RealmList<AttachmentBean> = RealmList()
-
-            //赋值处理
-            if (liveDataQsRecordBean.value?.attachmentBeanList?.isEmpty() == false) {
-                attachmentList = liveDataQsRecordBean.value?.attachmentBeanList!!
-            }
-
-            val attachmentBean = AttachmentBean()
-            attachmentBean.name = chatMsgEntity.name!!
-            attachmentBean.type = 1
-            attachmentList.add(attachmentBean)
-            liveDataQsRecordBean.value?.attachmentBeanList = attachmentList
-
-            listDataChatMsgEntityList.postValue(chatMsgEntityList)
        }
    }
+    listDataChatMsgEntityList.postValue(chatMsgEntityList)
+}

-    fun startSoundMetter(activity: Activity, v: View) {
+fun addChatMsgEntity(filePath: String) {

-        if (mSpeakMode == null) {
-            mSpeakMode = SpeakMode(activity)
+    if (filePath.isNotEmpty()) {
+        var chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
+        if (listDataChatMsgEntityList.value?.isEmpty() == false) {
+            chatMsgEntityList = listDataChatMsgEntityList.value!!
+        }
+        val chatMsgEntity = ChatMsgEntity()
+        chatMsgEntity.name = filePath.replace(Constant.USER_DATA_ATTACHEMNT_PATH, "").toString()
+        chatMsgEntity.voiceUri = Constant.USER_DATA_ATTACHEMNT_PATH
+        chatMsgEntityList.add(chatMsgEntity)
+
+
+        var attachmentList: RealmList<AttachmentBean> = RealmList()
+
+        //赋值处理
+        if (liveDataQsRecordBean.value?.attachmentBeanList?.isEmpty() == false) {
+            attachmentList = liveDataQsRecordBean.value?.attachmentBeanList!!
        }

-        //语音识别动画
-        if (pop == null) {
-            pop = PopupWindow()
-            pop!!.width = ViewGroup.LayoutParams.MATCH_PARENT
-            pop!!.height = ViewGroup.LayoutParams.WRAP_CONTENT
-            pop!!.setBackgroundDrawable(BitmapDrawable())
-            val view =
-                View.inflate(activity as Context, R.layout.cv_card_voice_rcd_hint_window, null)
-            pop!!.contentView = view
-            volume = view.findViewById(R.id.volume)
-        }
+        val attachmentBean = AttachmentBean()
+        attachmentBean.name = chatMsgEntity.name!!
+        attachmentBean.type = 1
+        attachmentList.add(attachmentBean)
+        liveDataQsRecordBean.value?.attachmentBeanList = attachmentList

-        pop!!.update()
+        listDataChatMsgEntityList.postValue(chatMsgEntityList)
+    }
+}

-        Constant.IS_VIDEO_SPEED = true
-        //录音动画
-        if (pop != null) {
-            pop!!.showAtLocation(v, Gravity.CENTER, 0, 0)
-        }
-        volume!!.setBackgroundResource(R.drawable.pop_voice_img)
-        val animation = volume!!.background as AnimationDrawable
-        animation.start()
+fun startSoundMetter(activity: Activity, v: View) {

-        val name: String = DateTimeUtil.getTimeSSS().toString() + ".m4a"
-        if (mSoundMeter == null) {
-            mSoundMeter = SoundMeter()
-        }
-        mSoundMeter!!.setmListener(object : SoundMeter.OnSoundMeterListener {
-            @RequiresApi(Build.VERSION_CODES.Q)
-            override fun onSuccess(filePath: String?) {
-                if (!TextUtils.isEmpty(filePath) && File(filePath).exists()) {
-                    if (File(filePath) == null || File(filePath).length() < 1600) {
-                        ToastUtils.showLong("语音时间太短，无效！")
-                        mSpeakMode!!.speakText("语音时间太短，无效")
-                        stopSoundMeter()
-                        return
-                    }
+    if (mSpeakMode == null) {
+        mSpeakMode = SpeakMode(activity)
+    }
+
+    //语音识别动画
+    if (pop == null) {
+        pop = PopupWindow()
+        pop!!.width = ViewGroup.LayoutParams.MATCH_PARENT
+        pop!!.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        pop!!.setBackgroundDrawable(BitmapDrawable())
+        val view =
+            View.inflate(activity as Context, R.layout.cv_card_voice_rcd_hint_window, null)
+        pop!!.contentView = view
+        volume = view.findViewById(R.id.volume)
+    }
+
+    pop!!.update()
+
+    Constant.IS_VIDEO_SPEED = true
+    //录音动画
+    if (pop != null) {
+        pop!!.showAtLocation(v, Gravity.CENTER, 0, 0)
+    }
+    volume!!.setBackgroundResource(R.drawable.pop_voice_img)
+    val animation = volume!!.background as AnimationDrawable
+    animation.start()
+
+    val name: String = DateTimeUtil.getTimeSSS().toString() + ".m4a"
+    if (mSoundMeter == null) {
+        mSoundMeter = SoundMeter()
+    }
+    mSoundMeter!!.setmListener(object : SoundMeter.OnSoundMeterListener {
+        @RequiresApi(Build.VERSION_CODES.Q)
+        override fun onSuccess(filePath: String?) {
+            if (!TextUtils.isEmpty(filePath) && File(filePath).exists()) {
+                if (File(filePath) == null || File(filePath).length() < 1600) {
+                    ToastUtils.showLong("语音时间太短，无效！")
+                    mSpeakMode!!.speakText("语音时间太短，无效")
+                    stopSoundMeter()
+                    return
                }
-
-                mSpeakMode!!.speakText("结束录音")
-
-                addChatMsgEntity(filePath!!)
            }

-            @RequiresApi(api = Build.VERSION_CODES.Q)
-            override fun onfaild(message: String?) {
-                ToastUtils.showLong("录制失败！")
-                mSpeakMode!!.speakText("录制失败")
-                stopSoundMeter()
-            }
-        })
+            mSpeakMode!!.speakText("结束录音")

-        mSoundMeter!!.start(Constant.USER_DATA_ATTACHEMNT_PATH + name)
-        ToastUtils.showLong("开始录音")
-        mSpeakMode!!.speakText("开始录音")
-    }
-
-    //停止语音录制
-    @RequiresApi(api = Build.VERSION_CODES.Q)
-    fun stopSoundMeter() {
-        //先重置标识，防止按钮抬起时触发语音结束
-        Constant.IS_VIDEO_SPEED = false
-        if (mSoundMeter != null && mSoundMeter!!.isStartSound) {
-            mSoundMeter!!.stop()
+            addChatMsgEntity(filePath!!)
        }
-        pop?.let {
-            if (it.isShowing) {
-                it.dismiss()
-            }
+
+        @RequiresApi(api = Build.VERSION_CODES.Q)
+        override fun onfaild(message: String?) {
+            ToastUtils.showLong("录制失败！")
+            mSpeakMode!!.speakText("录制失败")
+            stopSoundMeter()
+        }
+    })
+
+    mSoundMeter!!.start(Constant.USER_DATA_ATTACHEMNT_PATH + name)
+    ToastUtils.showLong("开始录音")
+    mSpeakMode!!.speakText("开始录音")
+}
+
+//停止语音录制
+@RequiresApi(api = Build.VERSION_CODES.Q)
+fun stopSoundMeter() {
+    //先重置标识，防止按钮抬起时触发语音结束
+    Constant.IS_VIDEO_SPEED = false
+    if (mSoundMeter != null && mSoundMeter!!.isStartSound) {
+        mSoundMeter!!.stop()
+    }
+    pop?.let {
+        if (it.isShowing) {
+            it.dismiss()
        }
    }
+}


-    fun savePhoto(bitmap: Bitmap) {
-        viewModelScope.launch(Dispatchers.IO) {
-            // 创建一个名为 "MyApp" 的文件夹
-            val myAppDir = File(Constant.USER_DATA_ATTACHEMNT_PATH)
+fun savePhoto(bitmap: Bitmap) {
+    viewModelScope.launch(Dispatchers.IO) {
+        // 创建一个名为 "MyApp" 的文件夹
+        val myAppDir = File(Constant.USER_DATA_ATTACHEMNT_PATH)
            if (!myAppDir.exists()) myAppDir.mkdirs() // 确保文件夹已创建

-            // 创建一个名为 fileName 的文件
-            val file = File(myAppDir, "${UUID.randomUUID()}.png")
-            file.createNewFile() // 创建文件
+        // 创建一个名为 fileName 的文件
+        val file = File(myAppDir, "${UUID.randomUUID()}.png")
+        file.createNewFile() // 创建文件

-            // 将 Bitmap 压缩为 JPEG 格式，并将其写入文件中
-            val out = FileOutputStream(file)
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
-            out.flush()
-            out.close()
-            var picList = mutableListOf<String>()
-            if (liveDataPictureList.value == null) {
-                picList.add(file.absolutePath)
-            } else {
-                picList.addAll(liveDataPictureList.value!!)
-                picList.add(file.absolutePath)
-            }
-            liveDataPictureList.postValue(picList)
+        // 将 Bitmap 压缩为 JPEG 格式，并将其写入文件中
+        val out = FileOutputStream(file)
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
+        out.flush()
+        out.close()
+        var picList = mutableListOf<String>()
+        if (liveDataPictureList.value == null) {
+            picList.add(file.absolutePath)
+        } else {
+            picList.addAll(liveDataPictureList.value!!)
+            picList.add(file.absolutePath)
        }
+        liveDataPictureList.postValue(picList)
+    }

    }

@@ -658,5 +660,5 @@ class EvaluationResultViewModel @Inject constructor(
                }
            }
        }
-    }
+}
 }
--- 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
@@ -7,7 +7,7 @@ import com.navinfo.omqs.databinding.TextItemSelectBinding
 import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter
 import com.navinfo.omqs.ui.other.BaseViewHolder

-class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) :
+class LeftAdapter(private var itemListener: ((Int, ScProblemTypeBean) -> Unit?)? = null) :
    BaseRecyclerViewAdapter<ScProblemTypeBean>() {
    private var selectTitle = ""

@@ -28,7 +28,7 @@ class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) :
                selectTitle = title.classType
                notifyDataSetChanged()
            }
-            itemListener?.invoke(position, title.classType)
+            itemListener?.invoke(position, title)
        }
    }

--- 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
@@ -17,6 +17,7 @@ import com.github.k1rakishou.fsaf.callback.FSAFActivityCallbacks
 import com.github.k1rakishou.fsaf.callback.FileChooserCallback
 import com.navinfo.collect.library.data.entity.TaskBean
 import com.navinfo.collect.library.map.NIMapController
+import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentPersonalCenterBinding
 import com.navinfo.omqs.db.ImportOMDBHelper
@@ -114,12 +115,18 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                        }
                    })
                }
+                R.id.personal_center_menu_open_auto_location -> {
+                    Constant.AUTO_LOCATION = true
+                }
+                R.id.personal_center_menu_close_auto_location -> {
+                    Constant.AUTO_LOCATION = false
+                }
                R.id.personal_center_menu_test -> {
                    viewModel.readRealmData()
-                    //108.91056000267433 34.29635901721207
+                    //108.90107116103331 34.29568928574205
                    // 定位到指定位置
                    niMapController.mMapView.vtmMap.animator()
-                        .animateTo(GeoPoint( 34.29635901721207, 108.91056000267433))
+                        .animateTo(GeoPoint( 34.29568928574205, 108.90107116103331))
                }
 //                R.id.personal_center_menu_task_list -> {
 //                    findNavController().navigate(R.id.TaskManagerFragment)