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/activity/map/SignAdapter.kt app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
2023-05-04 14:18:10 +08:00
parent ebbb9b99b2 ebfdd778b9
commit eace5d2521
55 changed files with 1284 additions and 72 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/CheckPermissionsActivity.java
@@ -37,6 +37,7 @@ public class CheckPermissionsActivity extends BaseActivity {
 			Manifest.permission.ACCESS_FINE_LOCATION,
 			Manifest.permission.WRITE_EXTERNAL_STORAGE,
 			Manifest.permission.READ_EXTERNAL_STORAGE,
+			Manifest.permission.RECORD_AUDIO
 	};

 	private static final int PERMISSON_REQUESTCODE = 0;
@@ -51,6 +52,7 @@ public class CheckPermissionsActivity extends BaseActivity {
 					Manifest.permission.ACCESS_FINE_LOCATION,
 					Manifest.permission.WRITE_EXTERNAL_STORAGE,
 					Manifest.permission.READ_EXTERNAL_STORAGE,
+					Manifest.permission.RECORD_AUDIO,
 					BACKGROUND_LOCATION_PERMISSION
 			};
 		}
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
@@ -156,12 +156,17 @@ class LoginViewModel @Inject constructor(
     * 创建用户目录
     */
    private fun createUserFolder(context: Context, userId: String) {
+        Constant.IS_VIDEO_SPEED = false
        Constant.USER_ID = userId
        Constant.VERSION_ID = userId
        Constant.USER_DATA_PATH = Constant.DATA_PATH + Constant.USER_ID + "/" + Constant.VERSION_ID
+        Constant.USER_DATA_ATTACHEMNT_PATH = Constant.USER_DATA_PATH + "/attachment/"
        // 在SD卡创建用户目录，解压资源等
        val userFolder = File(Constant.USER_DATA_PATH)
        if (!userFolder.exists()) userFolder.mkdirs()
+        //创建附件目录
+        val userAttachmentFolder = File(Constant.USER_DATA_ATTACHEMNT_PATH)
+        if (!userAttachmentFolder.exists()) userAttachmentFolder.mkdirs()
        // 初始化Realm
        Realm.init(context.applicationContext)
        val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))
--- 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
@@ -1,6 +1,9 @@
 package com.navinfo.omqs.ui.activity.map

 import android.os.Bundle
+import android.util.Log
+import android.view.MotionEvent
+import android.view.View
 import androidx.activity.viewModels
 import androidx.core.view.WindowCompat
 import androidx.databinding.DataBindingUtil
@@ -70,6 +73,26 @@ class MainActivity : BaseActivity() {
        //给xml传递viewModel对象
        binding.viewModel = viewModel

+        binding.mainActivityVoice.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
+            }
+        })
+
        viewModel.liveDataQsRecordIdList.observe(this) {
            //处理页面跳转
            viewModel.navigation(this, it)
@@ -127,7 +150,19 @@ class MainActivity : BaseActivity() {
     * 点击录音按钮
     */
    fun voiceOnclick() {
-        rightController.navigate(R.id.EvaluationResultFragment)
+/*        val naviController = findNavController(R.id.main_activity_right_fragment)
+        naviController.navigate(R.id.EvaluationResultFragment)*/
+    }
+
+    fun voiceOnTouchStart(){
+        viewModel!!.startSoundMetter(this,binding.mainActivityVoice)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.Q)
+    fun voiceOnTouchStop(){
+        if(Constant.IS_VIDEO_SPEED){
+            viewModel!!.stopSoundMeter()
+        }
    }

 //    override fun onBackPressed() {
--- 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
@@ -1,14 +1,25 @@
 package com.navinfo.omqs.ui.activity.map

+import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
+import android.graphics.drawable.AnimationDrawable
+import android.graphics.drawable.BitmapDrawable
 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.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.RenderEntity
 import com.navinfo.collect.library.map.NIMapController
@@ -20,12 +31,18 @@ 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
+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.RealmSet
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.oscim.core.GeoPoint
 import org.videolan.libvlc.LibVlcUtil
+import java.io.File
+import java.util.*
 import javax.inject.Inject

 /**
@@ -47,9 +64,15 @@ 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
+
+    //录音图标
+    var volume: ImageView? = null
+    var mSoundMeter: SoundMeter? = null

    init {
        mapController.markerHandle.setOnQsRecordItemClickListener(object :
@@ -97,11 +120,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
@@ -148,6 +172,7 @@ class MainViewModel @Inject constructor(

        //显示轨迹图层
        mapController.layerManagerHandler.showNiLocationLayer()
+
    }

    /**
@@ -169,8 +194,6 @@ class MainViewModel @Inject constructor(

        Log.e("qj", LibVlcUtil.hasCompatibleCPU(context).toString())

-        //ToastUtils.showShort("点击了相机")
-
        if (mCameraDialog == null) {
            mCameraDialog = CommonDialog(
                context,
@@ -204,57 +227,82 @@ class MainViewModel @Inject constructor(
        })
    }

+    fun startSoundMetter(context: Context, v: View) {

-//    fun startSaveTraceThread(context: Context) {
-//        Thread(Runnable {
-//            try {
-//                while (true) {
-//
-//                    if (niLocationList != null && niLocationList.size > 0) {
-//
-//                        var niLocation = niLocationList[0]
-//                        val geometry = GeometryTools.createGeometry(
-//                            GeoPoint(
-//                                niLocation.latitude,
-//                                niLocation.longitude
-//                            )
-//                        )
-//                        val tileX = RealmSet<Int>()
-//                        GeometryToolsKt.getTileXByGeometry(geometry.toString(), tileX)
-//                        val tileY = RealmSet<Int>()
-//                        GeometryToolsKt.getTileYByGeometry(geometry.toString(), tileY)
-//
-//                        //遍历存储tile对应的x与y的值
-//                        tileX.forEach { x ->
-//                            tileY.forEach { y ->
-//                                niLocation.tilex = x
-//                                niLocation.tiley = y
-//                            }
-//                        }
-//
-//                        TraceDataBase.getDatabase(
-//                            context,
-//                            Constant.USER_DATA_PATH + "/trace.sqlite"
-//                        ).niLocationDao.insert(niLocation)
-//                        niLocationList.remove(niLocation)
-//
-//                        Log.e("qj", "saveTrace==${niLocationList.size}")
-//                    }
-//                    Thread.sleep(30)
-//                }
-//            } catch (e: InterruptedException) {
-//                e.printStackTrace()
-//                Log.e("qj", "异常==${e.message}")
-//            }
-//        }).start()
-//    }
+        if(mSpeakMode==null){
+            mSpeakMode = SpeakMode(context as 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(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("结束录音")
+                //获取右侧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)
-//        }
-//    }

    /**
     * 处理页面调转
@@ -290,6 +338,5 @@ class MainViewModel @Inject constructor(
                }
            }
        }
-
    }
 }