增加语音相关业务

app/build.gradle

@@ -46,8 +46,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '11'

app/src/main/java/com/navinfo/omqs/bean/Attachment.kt

@@ -1,43 +0,0 @@
-package com.navinfo.omqs.bean
-
-import java.io.Serializable
-import java.util.*
-
-class Attachment(filename: String, type: Int) : Serializable,
-    Cloneable {
-    //内容
-    var filename: String = ""
-
-    //标识 默认照片0    录音1
-    var type: Int
-
-    override fun toString(): String {
-        return "TipsAttachment{" +
-                "filename='" + filename + '\'' +
-                ", type=" + type +
-                '}'
-    }
-
-    override fun equals(o: Any?): Boolean {
-        if (this === o) return true
-        if (o == null || javaClass != o.javaClass) return false
-        val that = o as Attachment
-        return type == that.type &&
-                filename == that.filename
-    }
-
-    override fun hashCode(): Int {
-        return Objects.hash(filename, type)
-    }
-
-    @kotlin.Throws(CloneNotSupportedException::class)
-    public override fun clone(): Any {
-        return super.clone()
-    }
-
-    init {
-        this.filename = filename
-        this.type = type
-    }
-}
-

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

@@ -141,13 +141,13 @@ class MainActivity : BaseActivity() {
     }
 
     fun voiceOnTouchStart(){
-        binding!!.viewModel!!.startSoundMetter(this,mapController.locationLayerHandler.getCurrentNiLocation(),binding.mainActivityVoice)
+        viewModel!!.startSoundMetter(this,binding.mainActivityVoice)
     }
 
     @RequiresApi(Build.VERSION_CODES.Q)
     fun voiceOnTouchStop(){
         if(Constant.IS_VIDEO_SPEED){
-            binding!!.viewModel!!.stopSoundMeter()
+            viewModel!!.stopSoundMeter()
         }
     }
 

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

@@ -6,7 +6,6 @@ import android.content.DialogInterface
 import android.graphics.drawable.AnimationDrawable
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
-import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
@@ -16,16 +15,15 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.PopupWindow
 import androidx.annotation.RequiresApi
-import androidx.annotation.RequiresApi
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 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.NiLocationListener
 import com.navinfo.collect.library.map.handler.OnQsRecordItemClickListener
 import com.navinfo.collect.library.utils.GeometryTools
 import com.navinfo.collect.library.utils.GeometryToolsKt
@@ -38,10 +36,9 @@ import com.navinfo.omqs.util.DateTimeUtil
 import com.navinfo.omqs.util.SoundMeter
 import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ActivityContext
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.realm.RealmSet
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.oscim.core.GeoPoint
 import org.videolan.libvlc.LibVlcUtil
@@ -68,16 +65,12 @@ class MainViewModel @Inject constructor(
     //看板数据
     val liveDataSignList = MutableLiveData<List<SignBean>>()
 
-
-    //    private var niLocationList: MutableList<NiLocation> = ArrayList<NiLocation>()
     var testPoint = GeoPoint(0, 0)
     //语音窗体
     private var pop: PopupWindow? = null
 
     private var mSpeakMode: SpeakMode? = null
 
-    private var niLocationList: MutableList<NiLocation> = ArrayList<NiLocation>()
-
     //录音图标
     var volume: ImageView? = null
     var mSoundMeter: SoundMeter? = null
@@ -128,11 +121,12 @@ class MainViewModel @Inject constructor(
                 }
                 Log.e("jingo", "定位点插入 ${Thread.currentThread().name}")
                 traceDataBase.niLocationDao.insert(location)
+                mapController.mMapView.vtmMap.updateMap(true)
             }
         }
         //用于定位点捕捉道路
         viewModelScope.launch(Dispatchers.Default) {
-            mapController.locationLayerHandler.niLocationFlow.collect { location ->
+            mapController.locationLayerHandler.niLocationFlow.collectLatest { location ->
                 Log.e("jingo", "定位点绑定道路 ${Thread.currentThread().name}")
                 location.longitude = testPoint.longitude
                 location.latitude = testPoint.latitude
@@ -228,57 +222,82 @@ class MainViewModel @Inject constructor(
         })
     }
 
+    fun startSoundMetter(context: Context, v: View) {
 
-//    fun startSaveTraceThread(context: Context) {
+        if(mSpeakMode==null){
-//        Thread(Runnable {
+            mSpeakMode = SpeakMode(context as Activity?)
-//            try {
+        }
-//                while (true) {
+
-//
+        //语音识别动画
-//                    if (niLocationList != null && niLocationList.size > 0) {
+        if (pop == null) {
-//
+            pop = PopupWindow()
-//                        var niLocation = niLocationList[0]
+            pop!!.width = ViewGroup.LayoutParams.MATCH_PARENT
-//                        val geometry = GeometryTools.createGeometry(
+            pop!!.height = ViewGroup.LayoutParams.WRAP_CONTENT
-//                            GeoPoint(
+            pop!!.setBackgroundDrawable(BitmapDrawable())
-//                                niLocation.latitude,
+            val view = View.inflate(context, R.layout.cv_card_voice_rcd_hint_window, null)
-//                                niLocation.longitude
+            pop!!.contentView = view
-//                            )
+            volume = view.findViewById(R.id.volume)
-//                        )
+        }
-//                        val tileX = RealmSet<Int>()
+
-//                        GeometryToolsKt.getTileXByGeometry(geometry.toString(), tileX)
+        pop!!.update()
-//                        val tileY = RealmSet<Int>()
+
-//                        GeometryToolsKt.getTileYByGeometry(geometry.toString(), tileY)
+        Constant.IS_VIDEO_SPEED = true
-//
+        //录音动画
-//                        //遍历存储tile对应的x与y的值
+        //录音动画
-//                        tileX.forEach { x ->
+        if (pop != null) {
-//                            tileY.forEach { y ->
+            pop!!.showAtLocation(v, Gravity.CENTER, 0, 0)
-//                                niLocation.tilex = x
+        }
-//                                niLocation.tiley = y
+        volume!!.setBackgroundResource(R.drawable.pop_voice_img)
-//                            }
+        val animation = volume!!.background as AnimationDrawable
-//                        }
+        animation.start()
-//
+
-//                        TraceDataBase.getDatabase(
+        val name: String = DateTimeUtil.getTimeSSS().toString() + ".m4a"
-//                            context,
+        if (mSoundMeter == null) {
-//                            Constant.USER_DATA_PATH + "/trace.sqlite"
+            mSoundMeter = SoundMeter()
-//                        ).niLocationDao.insert(niLocation)
+        }
-//                        niLocationList.remove(niLocation)
+        mSoundMeter!!.setmListener(object : SoundMeter.OnSoundMeterListener {
-//
+            @RequiresApi(Build.VERSION_CODES.Q)
-//                        Log.e("qj", "saveTrace==${niLocationList.size}")
+            override fun onSuccess(filePath: String?) {
-//                    }
+                if (!TextUtils.isEmpty(filePath) && File(filePath).exists()) {
-//                    Thread.sleep(30)
+                    if (File(filePath) == null || File(filePath).length() < 1600) {
-//                }
+                        ToastUtils.showLong("语音时间太短，无效！")
-//            } catch (e: InterruptedException) {
+                        mSpeakMode!!.speakText("语音时间太短，无效")
-//                e.printStackTrace()
+                        stopSoundMeter()
-//                Log.e("qj", "异常==${e.message}")
+                        return
-//            }
+                    }
-//        }).start()
+                }
-//    }
+                mSpeakMode!!.speakText("结束录音")
+                //获取右侧fragment容器
+                val naviController = (context as Activity).findNavController(R.id.main_activity_right_fragment)
+                val bundle = Bundle()
+                bundle.putString("filePath", filePath)
+                naviController.navigate(R.id.EvaluationResultFragment, bundle)
+            }
+
+            @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()
+        }
+        if (pop != null && pop!!.isShowing) pop!!.dismiss()
+    }
 
-//    //增加轨迹存储
-//    fun addSaveTrace(niLocation: NiLocation) {
-//        if (niLocation != null && niLocationList != null) {
-//            niLocationList.add(niLocation)
-//        }
-//    }
 
     /**
      * 处理页面调转
@@ -314,6 +333,5 @@ class MainViewModel @Inject constructor(
                 }
             }
         }
-
     }
 }

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

@@ -23,6 +23,5 @@ class SignAdapter : BaseRecyclerViewAdapter<SignBean>() {
         val item = data[position]
         bd.signMainIcon.background = holder.viewBinding.root.context.getDrawable(item.iconId)
         bd.signMainIcon.text = item.iconText
-
     }
 }

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt

@@ -1,13 +1,18 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult
 
+import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import androidx.databinding.DataBindingUtil
 import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.navinfo.omqs.Constant
 import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.FragmentEvaluationResultBinding
 import com.navinfo.omqs.ui.fragment.BaseFragment
@@ -66,18 +71,40 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
                 else -> true
             }
         }
+
+
+        binding.evaluationVoice.setOnTouchListener(object : View.OnTouchListener {
+            @RequiresApi(Build.VERSION_CODES.Q)
+            override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+                Log.e("qj",event?.action.toString())
+                when (event?.action) {
+                    MotionEvent.ACTION_DOWN ->{
+                        voiceOnTouchStart()//Do Something
+                        Log.e("qj","voiceOnTouchStart")
+                    }
+                    MotionEvent.ACTION_UP ->{
+                        voiceOnTouchStop()//Do Something
+                        Log.e("qj","voiceOnTouchStop")
+                    }
+                }
+                return v?.onTouchEvent(event) ?: true
+            }
+        })
+
         /**
          * 读取元数据
          */
         if (arguments != null) {
             val id = requireArguments().getString("QsId")
+            //语音路径
+            val filePath = requireArguments().getString("filePath")
             if (id != null) {
                 viewModel.initData(id)
             } else {
-                viewModel.initNewData()
+                viewModel.initNewData(filePath!!)
             }
         } else {
-            viewModel.initNewData()
+            viewModel.initNewData("")
         }
 
 //        //监听大分类数据变化
@@ -240,4 +267,16 @@ class EvaluationResultFragment : BaseFragment(), View.OnClickListener {
             }
         }
     }
+
+    fun voiceOnTouchStart(){
+        viewModel!!.startSoundMetter(requireActivity(),binding.evaluationVoice)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    fun voiceOnTouchStop(){
+        if(Constant.IS_VIDEO_SPEED){
+            viewModel!!.stopSoundMeter()
+        }
+    }
+
 }

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt

@@ -1,26 +1,47 @@
 package com.navinfo.omqs.ui.fragment.evaluationresult
 
+import android.app.Activity
+import android.content.Context
+import android.graphics.drawable.AnimationDrawable
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
 import android.os.Build
+import android.os.Bundle
+import android.text.TextUtils
 import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.PopupWindow
 import androidx.annotation.RequiresApi
+import androidx.core.util.rangeTo
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.findNavController
+import com.blankj.utilcode.util.ToastUtils
+import com.navinfo.collect.library.data.entity.AttachmentBean
 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.Constant
-import com.navinfo.omqs.bean.Attachment
+import com.navinfo.omqs.R
 import com.navinfo.omqs.bean.ChatMsgEntity
 import com.navinfo.omqs.db.RealmOperateHelper
 import com.navinfo.omqs.db.RoomAppDatabase
+import com.navinfo.omqs.util.DateTimeUtil
+import com.navinfo.omqs.util.SoundMeter
+import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.Realm
+import io.realm.RealmList
 import io.realm.kotlin.where
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.oscim.core.GeoPoint
+import java.io.File
 import java.util.*
 import javax.inject.Inject
 
@@ -57,10 +78,18 @@ class EvaluationResultViewModel @Inject constructor(
 
     var listDataChatMsgEntityList = MutableLiveData<MutableList<ChatMsgEntity>>()
 
-    var listDataAttachmentList = MutableLiveData<MutableList<Attachment>>()
-
     var oldBean: QsRecordBean? = null
 
+    //语音窗体
+    private var pop: PopupWindow? = null
+
+    private var mSpeakMode: SpeakMode? = null
+
+    //录音图标
+    var volume: ImageView? = null
+
+    var mSoundMeter: SoundMeter? = null
+
     init {
         liveDataQsRecordBean.value = QsRecordBean(id = UUID.randomUUID().toString())
         Log.e("jingo", "EvaluationResultViewModel 创建了 ${hashCode()}")
@@ -88,7 +117,7 @@ class EvaluationResultViewModel @Inject constructor(
     /**
      * 查询数据库，获取问题分类
      */
-    fun initNewData() {
+    fun initNewData(filePath: String) {
         viewModelScope.launch(Dispatchers.IO) {
             getClassTypeList()
             getProblemLinkList()
@@ -101,6 +130,8 @@ class EvaluationResultViewModel @Inject constructor(
                 captureLink(geoPoint.longitude, geoPoint.latitude)
             }
         }
+
+        addChatMsgEntity(filePath)
     }
 
     /**
@@ -317,15 +348,119 @@ class EvaluationResultViewModel @Inject constructor(
     @RequiresApi(Build.VERSION_CODES.N)
     fun getChatMsgEntityList() {
         val chatMsgEntityList: MutableList<ChatMsgEntity> = ArrayList()
-        liveDataQsRecordBean.value!!.attachments.forEach{
+        liveDataQsRecordBean.value?.attachmentBeanList?.forEach {
             //1 录音
-            if(it.type==1){
+            if (it.type == 1) {
                 val chatMsgEntity = ChatMsgEntity()
-                chatMsgEntity.name = it.filename
+                chatMsgEntity.name = it.name
                 chatMsgEntity.voiceUri = Constant.USER_DATA_ATTACHEMNT_PATH
                 chatMsgEntityList.add(chatMsgEntity)
             }
         }
         listDataChatMsgEntityList.postValue(chatMsgEntityList)
     }
+
+    fun addChatMsgEntity(filePath: String) {
+
+        if(filePath!=null){
+            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!!
+            }
+
+            val attachmentBean = AttachmentBean()
+            attachmentBean.name = chatMsgEntity.name!!
+            attachmentBean.type = 1
+            attachmentList.add(attachmentBean)
+            liveDataQsRecordBean.value?.attachmentBeanList = attachmentList
+
+            listDataChatMsgEntityList.postValue(chatMsgEntityList)
+        }
+    }
+
+    fun startSoundMetter(activity: Activity, v: View) {
+
+        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()
+            }
+        })
+
+        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()
+        }
+        if (pop != null && pop!!.isShowing) pop!!.dismiss()
+    }
 }

app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/SoundtListAdapter.kt

@@ -67,14 +67,14 @@ class SoundtListAdapter(
         holder.viewBinding.tvTime.isSelected = entity.isDelete
         holder.viewBinding.rlSoundContent.isSelected = entity.isDelete
         holder.viewBinding.ivSoundAnim.setBackgroundResource(R.drawable.icon_sound_03)
-        if (itemClick != null) {
+/*        if (itemClick != null) {
             holder.viewBinding.rlSoundContent.setOnClickListener {
                 itemClick!!.onItemClick(it.findViewById<View>(R.id.rl_sound_content), position)
             }
-        }
+        }*/
         //mixWidth
         if (!TextUtils.isEmpty(entity.name)) {
-            if (entity.name.indexOf(".pcm") > 0) {
+/*            if (entity.name.indexOf(".pcm") > 0) {
                 val file: File = File(entity.voiceUri + entity.name)
                 if (file != null) {
                     val time = (file.length() / 16000).toInt()
@@ -89,15 +89,15 @@ class SoundtListAdapter(
             } else {
                 try {
                     md = MediaPlayer()
-                    md.reset()
+                    md!!.reset()
-                    md.setDataSource(entity.getVoiceUri() + entity.getName())
+                    md!!.setDataSource(entity.voiceUri+entity.name)
-                    md.prepare()
+                    md!!.prepare()
                 } catch (e: Exception) {
                     // TODO Auto-generated catch block
                     e.printStackTrace()
                 }
                 var time =
-                    if (entity.getVoiceTimeLong() == null) md!!.duration.toString() + "" else entity.getVoiceTimeLong()
+                    if (entity.voiceTimeLong == null) md!!.duration.toString() + "" else entity.voiceTimeLong
                         .toString() + ""
                 if (!TextUtils.isEmpty(time)) {
                     val i = md!!.duration / 1000
@@ -107,18 +107,14 @@ class SoundtListAdapter(
                     layoutParams.width = 115 + i * 10
                     layoutParams.width =
                         if (layoutParams.width > layoutParams.width) maxWidth else layoutParams.width
-                    holder.viewBinding.rlSoundContent.setLayoutParams(layoutParams)
+                    holder.viewBinding.rlSoundContent.layoutParams = layoutParams
                 }
                 holder.viewBinding.tvTime.text = time
                 md!!.release()
+            }*/
         }
     }
 
-
-    override fun getItemViewRes(position: Int): Int {
-        return R.layout.adapter_sound_list
-    }
-
     /**
      * 播放某段录音
      *
@@ -143,18 +139,18 @@ class SoundtListAdapter(
      * @param name 录音名称
      * @Description
      */
-    private fun playMusic(name: String, imageV: ImageView) {
+    fun playMusic(name: String, imageV: ImageView) {
         imageV.setBackgroundResource(R.drawable.sound_anim)
         animaV = imageV.background as AnimationDrawable
         animaV!!.start()
-        if (name.indexOf(".pcm") > 0) {
+/*        if (name.index(".pcm") > 0) {
             audioTrackPlay(name, imageV)
         } else {
             mediaPlayer(name, imageV)
-        }
+        }*/
     }
 
-    private fun mediaPlayer(name: String, imageV: ImageView) {
+    fun mediaPlayer(name: String, imageV: ImageView) {
         try {
             if (mMediaPlayer.isPlaying) {
                 mMediaPlayer.stop()
@@ -173,7 +169,7 @@ class SoundtListAdapter(
         }
     }
 
-    private fun audioTrackPlay(name: String, imageV: ImageView) {
+    fun audioTrackPlay(name: String, imageV: ImageView) {
         var dis: DataInputStream? = null
         try {
             //从音频文件中读取声音
@@ -236,6 +232,10 @@ class SoundtListAdapter(
     interface OnItemClickListner {
         fun onItemClick(view: View?, postion: Int)
     }
+
+    override fun getItemViewRes(position: Int): Int {
+        return R.layout.adapter_sound_list
+    }
 }
 
 

app/src/main/res/layout/adapter_sound_list.xml

@@ -21,13 +21,13 @@
         android:orientation="horizontal"
         android:padding="5dp">
 
+
         <TextView
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="6dp"
-            android:layout_toRightOf="@id/tv_chatcontent"
             android:gravity="left|center"
             android:lineSpacingExtra="2dp"
             android:text=""

app/src/main/res/layout/cv_card_chatting_item_msg_text_left.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="2dp"
-    android:paddingBottom="2dp"
-     >
-
-    <LinearLayout
-        android:id="@+id/rl_sound_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:minWidth="50dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:background="@drawable/bg_select_sound_xml" >
-
-        <TextView
-            android:layout_marginLeft="10dp"
-            android:id="@+id/tv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="6dp"
-            android:layout_toRightOf="@id/tv_chatcontent"
-            android:gravity="left|center"
-            android:lineSpacingExtra="2dp"
-            android:text=""
-            android:textColor="@color/font_blue_reg"
-            android:textSize="15sp" />
-        <ImageView
-            android:id="@+id/iv_sound_anim"
-            android:background="@drawable/sound_anim"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/fragment_evaluation_result.xml

@@ -138,23 +138,25 @@
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
 
-        <ImageView
+        <ImageButton
             android:id="@+id/evaluation_camera"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="10dp"
+            android:background="@drawable/btn_bg_default"
             android:src="@drawable/baseline_camera_alt_24"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/evaluation_voice" />
 
-        <ImageView
+        <ImageButton
             android:id="@+id/evaluation_voice"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="5dp"
+            android:padding="10dp"
             android:src="@drawable/baseline_keyboard_voice_24"
+            android:background="@drawable/btn_bg_default"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toRightOf="@id/evaluation_camera"

collect-library/build.gradle

@@ -38,8 +38,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     sourceSets {

collect-library/src/main/java/com/navinfo/collect/library/data/entity/AttachmentBean.kt

@@ -0,0 +1,15 @@
+package com.navinfo.collect.library.data.entity
+
+import io.realm.RealmObject
+
+open class AttachmentBean @JvmOverloads constructor(
+    /**
+     * 文件名称
+     */
+    var name: String = "",
+    /**
+     * 默认0  照片 录音1
+     */
+    var type: Int = 0
+
+) : RealmObject()

collect-library/src/main/java/com/navinfo/collect/library/data/entity/QsRecordBean.kt

@@ -1,12 +1,11 @@
 package com.navinfo.collect.library.data.entity
 
 import com.navinfo.collect.library.utils.GeometryToolsKt
-import com.navinfo.omqs.bean.Attachment
+import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.RealmSet
 import io.realm.annotations.PrimaryKey
 
-
 /**
  * @author zhjch
  * @version V1.0
@@ -78,6 +77,8 @@ open class QsRecordBean @JvmOverloads constructor(
      * 问题记录提交状态   0 未提交；1 已提交；
      */
     var t_status: Int = 0,
+
+    var attachmentBeanList: RealmList<AttachmentBean> = RealmList<AttachmentBean>(),
     /**
      * 显示坐标
      */
@@ -87,8 +88,6 @@ open class QsRecordBean @JvmOverloads constructor(
      */
     var guideGeometry: String = "",
 
-    var attachments:RealmSet<Attachment>,
-
     ) : RealmObject() {
 
     fun copy(): QsRecordBean {
@@ -107,7 +106,7 @@ open class QsRecordBean @JvmOverloads constructor(
             confirmUserId = confirmUserId,
             t_lifecycle = t_lifecycle,
             t_status = t_status,
-            attachments = attachments,
+            attachmentBeanList = attachmentBeanList,
         )
         qs.geometry = geometry
         return qs