Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323

2023-03-30 18:02:15 +08:00
parent dec5d11208 fad8d4327c
commit e545d80418
9 changed files with 49 additions and 45 deletions
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -492,6 +492,7 @@ object CharterPassengerModel {
            // 车辆空闲 订单结束已经还车
            // 结束车态轮训
            endCarStatusLoop()
+            this.carTypeChageListener?.setCarChangeListener(0)
            setOrderStatus(OrderStatusEnum.NoOrderUnuse)
        }
    }
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -52,7 +52,7 @@ class BusPassengerPresenter(view: MainFragment?) :
        CharterPassengerModel.setStatusChangeListener(TAG,this)
        CallerTelematicListenerManager.addListener(TAG, msgReceived)
        OCHPlanningStopSideStatusManager.addListener(TAG,this)
-        setCarChangeListener(R.raw.aiqinghao)
+        setCarChangeListener(R.raw.m1)
        //BusPassengerModel.setMoGoAutopilotPlanningListener(this)

    }
@@ -214,7 +214,7 @@ class BusPassengerPresenter(view: MainFragment?) :
                mView?.setCarModle(R.raw.pengyouhao)
            }
            else -> {
-                mView?.setCarModle(R.raw.aiqinghao)
+                mView?.setCarModle(R.raw.m1)
            }
        }
    }
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -52,7 +52,6 @@ class MainFragment :
    }

    override fun initViews() {
-        setCarModle(R.raw.m1)
        cb_bp_video_player.onClick {
            openSettingPage(M1ContainFragment.VIDEOTAB)
        }
--- a/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d
+++ b/OCH/mogo-och-charter-passenger/src/m1/res/raw/m1.nt3d
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
@@ -10,60 +10,66 @@ import java.util.ArrayList

 object VoiceManager {

-    fun arrivedStation(siteNameCN: String) {
+    fun arrivedStation(siteNameCN: String?) {
        arrivedStation(siteNameCN,"")
    }
-    fun arrivedStation(siteNameCN: String,siteNameKR: String) {
+    fun arrivedStation(siteNameCN: String?,siteNameKR: String?) {
        arrivedStation(siteNameCN,siteNameKR,null)
    }

-    fun arrivedStation(siteNameCN: String, siteNameKR: String,callBack: IMogoTTSCallback?=null) {
+    fun arrivedStation(siteNameCN: String?, siteNameKR: String?,callBack: IMogoTTSCallback?=null) {
        val contenxt = AbsMogoApplication.getApp()
        val list: MutableList<LangTtsEntity> = ArrayList()
-        val chineseTTS = LangTtsEntity(
-            contenxt.getString(R.string.arrived_station_zh, siteNameCN),
-            LanguageType.CHINESE
-        )
-        val engTTS = LangTtsEntity(
-            contenxt.getString(R.string.arrived_station_en, siteNameCN),
-            LanguageType.CHINESE
-        )
-        val koreanTTS = LangTtsEntity(
-            contenxt.getString(R.string.arrived_station_ko, siteNameKR.ifEmpty { siteNameCN }),
-            LanguageType.KOREAN
-        )
-        list.add(chineseTTS)
-        list.add(engTTS)
-        list.add(koreanTTS)
+        siteNameCN?.let {
+            val chineseTTS = LangTtsEntity(
+                contenxt.getString(R.string.arrived_station_zh, it),
+                LanguageType.CHINESE
+            )
+            val engTTS = LangTtsEntity(
+                contenxt.getString(R.string.arrived_station_en, it),
+                LanguageType.CHINESE
+            )
+            val koreanTTS = LangTtsEntity(
+                contenxt.getString(R.string.arrived_station_ko, siteNameKR?:it),
+                LanguageType.KOREAN
+            )
+            list.add(chineseTTS)
+            list.add(engTTS)
+            list.add(koreanTTS)
+        }
+
        VoiceNotice.showNotice(list, AIAssist.LEVEL1,callBack)
    }

-    fun leaveStation(siteNameCN: String){
+    fun leaveStation(siteNameCN: String?){
        leaveStation(siteNameCN,"")
    }

-    fun leaveStation(siteNameCN: String,siteNameKR: String){
+    fun leaveStation(siteNameCN: String?,siteNameKR: String?){
        leaveStation(siteNameCN,siteNameKR,null)
    }

-    fun leaveStation(siteNameCN: String, siteNameKR: String,callBack: IMogoTTSCallback?=null) {
-        val contenxt = AbsMogoApplication.getApp()
+    fun leaveStation(siteNameCN: String?, siteNameKR: String?,callBack: IMogoTTSCallback?=null) {
        val list: MutableList<LangTtsEntity> = ArrayList()
-        val chineseTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_zh, siteNameCN),
-            LanguageType.CHINESE
-        )
-        val engTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_en, siteNameCN),
-            LanguageType.CHINESE
-        )
-        val koreanTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_ko, siteNameKR.ifEmpty { siteNameCN }),
-            LanguageType.KOREAN
-        )
-        list.add(chineseTTS)
-        list.add(engTTS)
-        list.add(koreanTTS)
+        val contenxt = AbsMogoApplication.getApp()
+        siteNameCN?.let {
+            val chineseTTS = LangTtsEntity(
+                contenxt.getString(R.string.leave_station_zh, it),
+                LanguageType.CHINESE
+            )
+            val engTTS = LangTtsEntity(
+                contenxt.getString(R.string.leave_station_en, it),
+                LanguageType.CHINESE
+            )
+            list.add(chineseTTS)
+            list.add(engTTS)
+
+            val koreanTTS = LangTtsEntity(
+                contenxt.getString(R.string.leave_station_ko, siteNameKR ?: it),
+                LanguageType.KOREAN
+            )
+            list.add(koreanTTS)
+        }
        VoiceNotice.showNotice(list, AIAssist.LEVEL1,callBack)
    }

--- a/OCH/mogo-och-common-module/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-common-module/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@

    <string name="arrived_station_en">We are arriving at %1$s</string>
    <string name="arrived_station_ko">%1$s 역에 도착했습니다</string>
-    <string name="arrived_station_zh">已到达%1$s站</string>
+    <string name="arrived_station_zh">已到达%1$s</string>

    <string name="leave_station_zh">车辆起步，请扶稳坐好，前方到站 %1$s</string>
    <string name="leave_station_en">The next station is %1$s</string>
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -99,9 +99,7 @@ object ConfigStartUp {
        } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
        } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
-        } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)){
-            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+            HdMapBuildConfig.currentCarVrIconRes = R.raw.m1
        }


--- a/core/mogo-core-res/src/main/res/raw/m1.nt3d
+++ b/core/mogo-core-res/src/main/res/raw/m1.nt3d
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.6.4
 MOGO_TELEMATIC_VERSION=1.4.6.4
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.10.0.9
+MAP_SDK_VERSION=2.11.0.12
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7