Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开始的行将被忽略，而空的提交说明将终止提交。

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt

@@ -23,8 +23,16 @@ object BusPassengerServiceManager {
         MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl())
             .create(PassengerServiceApi::class.java)
 
+    /**
+     * 获取Bus司机端的sn
+     * @return
+     */
+    val draiverSn: String
+        get() = CallerTelematicManager.getServerToken()
+
+
     private fun beforeNet():Boolean{
-        if (CallerTelematicManager.getServerToken().isBlank()) {
+        if (draiverSn.isBlank()) {
             ToastUtils.showShort("已断开司机屏连接、请联系安全员")
             return true
         }
@@ -87,7 +95,7 @@ object BusPassengerServiceManager {
         if(beforeNet()){
             return
         }
-        val endOrderRequest = EndOrderRequest(CallerTelematicManager.getServerToken(),orderNo)
+        val endOrderRequest = EndOrderRequest(draiverSn,orderNo)
         mBusPassengerServiceApi.endOrder(request = endOrderRequest).transformTry()
             .subscribe(OchCommonSubscribeImpl(context, callback, "serviceEnd"))
     }
@@ -96,7 +104,7 @@ object BusPassengerServiceManager {
         if(beforeNet()){
             return
         }
-        val request = ArriveDestRequest(CallerTelematicManager.getServerToken(),lindId)
+        val request = ArriveDestRequest(draiverSn,lindId)
         mBusPassengerServiceApi.arriveDest(request = request).transformTry()
             .subscribe(OchCommonSubscribeImpl(context, callback, "arriveDest"))
     }

OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt

@@ -20,7 +20,7 @@ internal interface PassengerServiceApi {
     fun queryDriverOperationStatus(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<M1DriverLoginStatusResponse>
 
     /**
@@ -30,7 +30,7 @@ internal interface PassengerServiceApi {
     fun queryOrderInfo(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<OrderInfoResponse>
 
     /**
@@ -40,7 +40,7 @@ internal interface PassengerServiceApi {
     fun queryLineList(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<LineInfoListResponse>
 
     /**
@@ -50,7 +50,7 @@ internal interface PassengerServiceApi {
     fun queryLineSiteList(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken(),
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
         @Query("lineId") lineId: String?
     ): Observable<SiteInfoResponse>
 
@@ -62,7 +62,7 @@ internal interface PassengerServiceApi {
     fun queryBusinessStatus(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<BusinessStatusResponse>
 
     /**
@@ -93,7 +93,7 @@ internal interface PassengerServiceApi {
     fun queryLocusByLineId(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken(),
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
         @Query("lineId") lineId: String?
     ): Observable<LocusResponse>
 
@@ -105,6 +105,6 @@ internal interface PassengerServiceApi {
     fun queryBusinessTime(
         @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
         @Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
-        @Query("sn") sn: String = CallerTelematicManager.getServerToken()
+        @Query("sn") sn: String = BusPassengerServiceManager.draiverSn
     ): Observable<BusinessTimeResponse>
 }

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt

@@ -51,9 +51,7 @@ object VoiceNotice {
 
     @JvmStatic
     fun showNotice(listTTS: MutableList<LangTtsEntity>, level: Int) {
-        UiThreadHandler.post {
-            AIAssist.getInstance(AbsMogoApplication.getApp())
-                .speakMultiLangTTSWithLevel(MultiLangTtsEntity(listTTS), level, null)
-        }
+        AIAssist.getInstance(AbsMogoApplication.getApp())
+            .speakMultiLangTTSWithLevel(MultiLangTtsEntity(listTTS), level, null)
     }
 }