From 5a15eb21eb2ebab3750c60dfc17eff769ee9dc5b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 30 Mar 2023 14:37:00 +0800
Subject: [PATCH] =?UTF-8?q?[3.0.0]=20[=E9=9F=A9=E8=AF=ADnull=E3=80=81?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E7=AB=99]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceManager.kt
---
 .../och/common/module/voice/VoiceManager.kt   | 90 +++++++++++--------
 .../src/main/res/values/strings.xml           |  2 +-
 2 files changed, 54 insertions(+), 38 deletions(-)

diff --git 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
index 69675d2061..6566ebb133 100644
--- 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,50 +10,66 @@ import java.util.ArrayList
 
 object VoiceManager {
 
-    fun arrivedStation(siteName: String) {
-        arrivedStation(siteName,null)
+    fun arrivedStation(siteNameCN: String?) {
+        arrivedStation(siteNameCN,"")
     }
-    fun arrivedStation(siteName: String,callBack: IMogoTTSCallback?=null) {
+    fun arrivedStation(siteNameCN: String?,siteNameKR: String?) {
+        arrivedStation(siteNameCN,siteNameKR,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, siteName),
-            LanguageType.CHINESE
-        )
-        val engTTS = LangTtsEntity(
-            contenxt.getString(R.string.arrived_station_en, siteName),
-            LanguageType.CHINESE
-        )
-        val koreanTTS = LangTtsEntity(
-            contenxt.getString(R.string.arrived_station_ko, siteName),
-            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(siteName: String){
-        leaveStation(siteName,null)
+
+    fun leaveStation(siteNameCN: String?){
+        leaveStation(siteNameCN,"")
     }
-    fun leaveStation(siteName: String,callBack: IMogoTTSCallback?=null) {
-        val contenxt = AbsMogoApplication.getApp()
+
+    fun leaveStation(siteNameCN: String?,siteNameKR: String?){
+        leaveStation(siteNameCN,siteNameKR,null)
+    }
+
+    fun leaveStation(siteNameCN: String?, siteNameKR: String?,callBack: IMogoTTSCallback?=null) {
         val list: MutableList<LangTtsEntity> = ArrayList()
-        val chineseTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_zh, siteName),
-            LanguageType.CHINESE
-        )
-        val engTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_en, siteName),
-            LanguageType.CHINESE
-        )
-        val koreanTTS = LangTtsEntity(
-            contenxt.getString(R.string.leave_station_ko, siteName),
-            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)
     }
 
diff --git a/OCH/mogo-och-common-module/src/main/res/values/strings.xml b/OCH/mogo-och-common-module/src/main/res/values/strings.xml
index 9ca9718279..a018b9286c 100644
--- 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>