[dev_arch_opt_3.0][merge]合并2.13.2分支代码

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -3,12 +3,12 @@ package com.mogo.eagle.core.function.hmi.ui
 import android.content.Context
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.*
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
@@ -86,12 +86,9 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import com.zhjt.service_biz.BizConfig
 import kotlinx.android.synthetic.main.fragment_hmi.*
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.*
 import record_cache.RecordPanelOuterClass
-
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * @author xiaoyuzhou
@@ -116,8 +113,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     // todo 需要统一数据源 限速 View代理
     private var mViewLimitingVelocity: IViewLimitingVelocity? = null
 
-    private var lastSpeakJob: Job? = null
-
+    private val lastSpeakJob by lazy { AtomicReference<Job>() }
     private var lastShowV2XJob: Job? = null
 
     private var showingV2XTip: IReminder? = null
@@ -482,10 +478,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                 "$M_HMI$TAG",
                 "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
             )
-
             lastShowV2XJob?.safeCancel()
-            lastSpeakJob?.safeCancel()
-
             lifecycleScope.launch {
                 delay(expireTime)
             }.also { itx ->
@@ -496,10 +489,18 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             }
 
             if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
-                lifecycleScope.launch {
+                val last = lastSpeakJob.get()
+                Log.d("CODE", "---- 0 ------: last: $last")
+                if (last != null && !last.isCompleted)  {
+                    Log.d("CODE", "---- 1 ------")
+                    return
+                }
+                lifecycleScope.launch(Dispatchers.Default) {
+                    Log.d("CODE", "---- 2 ------")
                     speak(it, ttsContent)
+                    Log.d("CODE", "---- 3 ------")
                 }.also { itx ->
-                    lastSpeakJob = itx
+                    lastSpeakJob.set(itx)
                 }
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -82,7 +82,9 @@ import mogo_msg.MogoReportMsg
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.abs
-
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
 
 /**
  * @author xiaoyuzhou
@@ -1734,18 +1736,20 @@ internal class DebugSettingView @JvmOverloads constructor(
      * OBU状态回调
      */
     override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) {
-        tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
+        lifecycleOwner.lifecycleScope.launch {
+            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
 
-        AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
-        AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
+            AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
+            AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
 
-        if (obuStatusInfo.obuStatus) {
-            obuConnectStatus = true
-        }
-        //OBU断开连接，提示异常
-        if (obuConnectStatus && !obuStatusInfo.obuStatus) {
-            obuConnectStatus = false
-            toastMsg("OBU连接状态异常")
+            if (obuStatusInfo.obuStatus) {
+                obuConnectStatus = true
+            }
+            //OBU断开连接，提示异常
+            if (obuConnectStatus && !obuStatusInfo.obuStatus) {
+                obuConnectStatus = false
+                toastMsg("OBU连接状态异常")
+            }
         }
     }