Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1

2023-01-16 13:56:36 +08:00
parent 10fb855aee 8438d5307d
commit 9d976aa413
6 changed files with 53 additions and 50 deletions
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
@@ -198,7 +198,6 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
                mView.showOrHideServingOrderFragment(true,true);
            });
            TaxiPassengerModel.getInstance().startOrStopReadyToAutopilotLoop(false);
-            CallerSmpManager.startQueryV2XEvents();//全览模式的V2X事件轮询开始
        }
        // 30 用户到达上车点 并通过了手机号后四位验证
        // 40 服务中
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/TaxiPassengerServingOrderPresenter.java
@@ -12,6 +12,7 @@ import com.amap.api.maps.model.LatLng;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -99,6 +100,7 @@ public class TaxiPassengerServingOrderPresenter extends Presenter<TaxiPassengerS
                    TaxiPassengerModel.getInstance().queryOrderRouteList();
                }
                TaxiPassengerModel.getInstance().updateAutopilotControlParameters();
+                CallerSmpManager.startQueryV2XEvents();//全览模式的V2X事件轮询开始
                CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "OnTheWayToEnd");
            }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -942,58 +942,60 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
        playTts: Boolean,
        expireTime: Long
    ) {
-        val playTTS =
-            playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
-        activity?.let {
-            val warningContent = alertContent
-                ?: EventTypeEnumNew.getWarningContent(v2xType)
+        ThreadUtils.runOnUiThread {
+            val playTTS =
+                playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
+            activity?.let {
+                val warningContent = alertContent
+                    ?: EventTypeEnumNew.getWarningContent(v2xType)

 //            Log.d("liyz", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent")
-            //占道施工预警
-            if (v2xType.equals("10006") || v2xType.equals("100061")) {
-                val currentTime = System.currentTimeMillis() / 1000
-                val oldTime =
-                    context?.let { it -> SharedPrefsMgr.getInstance(it).getLong("roadwork", 0) }
-                if (currentTime - oldTime!! > 60) { //超过一分钟，才会继续播报重复提醒
-                    context?.let { it ->
-                        SharedPrefsMgr.getInstance(it)
-                            .putLong("roadwork", System.currentTimeMillis() / 1000)
+                //占道施工预警
+                if (v2xType == "10006" || v2xType == "100061") {
+                    val currentTime = System.currentTimeMillis() / 1000
+                    val oldTime =
+                        context?.let { it -> SharedPrefsMgr.getInstance(it).getLong("roadwork", 0) }
+                    if (currentTime - oldTime!! > 60) { //超过一分钟，才会继续播报重复提醒
+                        context?.let { it ->
+                            SharedPrefsMgr.getInstance(it)
+                                .putLong("roadwork", System.currentTimeMillis() / 1000)
+                        }
+                        CallerAutoPilotManager.sendTripInfo(5, "", "", "", false)
                    }
-                    CallerAutoPilotManager.sendTripInfo(5, "", "", "", false)
                }
-            }
-            if (warningContent.isEmpty()) {
-                CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!")
-                return
-            }
-            listener?.onShow()
-            CallerLogger.d(
-                "$M_HMI$TAG",
-                "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
-            )
-            lastShowV2XJob?.safeCancel()
-            lifecycleScope.launch {
-                delay(expireTime)
-            }.also { itx ->
-                lastShowV2XJob = itx
-            }.invokeOnCompletion { _ ->
-                listener?.onDismiss()
-                showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-            }
-
-            if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
-                val last = lastSpeakJob.get()
-                Log.d("CODE", "---- 0 ------: last: $last")
-                if (last != null && !last.isCompleted)  {
-                    Log.d("CODE", "---- 1 ------")
-                    return
+                if (warningContent.isEmpty()) {
+                    CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!")
+                    return@runOnUiThread
                }
-                lifecycleScope.launch(Dispatchers.Default) {
-                    Log.d("CODE", "---- 2 ------")
-                    speak(it, ttsContent)
-                    Log.d("CODE", "---- 3 ------")
+                listener?.onShow()
+                CallerLogger.d(
+                    "$M_HMI$TAG",
+                    "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
+                )
+                lastShowV2XJob?.safeCancel()
+                lifecycleScope.launch {
+                    delay(expireTime)
                }.also { itx ->
-                    lastSpeakJob.set(itx)
+                    lastShowV2XJob = itx
+                }.invokeOnCompletion { _ ->
+                    listener?.onDismiss()
+                    showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                }
+
+                if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
+                    val last = lastSpeakJob.get()
+                    Log.d("CODE", "---- 0 ------: last: $last")
+                    if (last != null && !last.isCompleted)  {
+                        Log.d("CODE", "---- 1 ------")
+                        return@runOnUiThread
+                    }
+                    lifecycleScope.launch(Dispatchers.Default) {
+                        Log.d("CODE", "---- 2 ------")
+                        speak(it, ttsContent)
+                        Log.d("CODE", "---- 3 ------")
+                    }.also { itx ->
+                        lastSpeakJob.set(itx)
+                    }
                }
            }
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -1148,7 +1148,7 @@ class DebugSettingView @JvmOverloads constructor(
         */
        tbObuWeaknessTraffic.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
        tbObuWeaknessTraffic.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) { //默认开启
+            if (isChecked) { //默认开启
                CallerHmiManager.setObuWeaknessTraffic(true)
            } else {
                CallerHmiManager.setObuWeaknessTraffic(false)
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
@@ -91,7 +91,7 @@ object HmiBuildConfig {
     */
    @JvmField
    @Volatile
-    var isShowCloudWeaknessTrafficView = true
+    var isShowCloudWeaknessTrafficView = false

    /**
     * 是否展示obu的限速
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.27
 MOGO_TELEMATIC_VERSION=1.4.3.27
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.9.0.14_test_03
+MAP_SDK_VERSION=2.9.0.14_test_05
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7