Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -92,7 +92,8 @@ object CharterPassengerModel {
     private var locusInfo: LocusResponse.LocusInfo? = null
 
     // 轨迹点、底盘透传的
-    private val mRoutePoints: MutableList<MogoLocation> = ArrayList()
+    @Volatile
+    private var mRoutePoints: MutableList<MogoLocation> = ArrayList()
 
     private var orderStatus: OrderStatusEnum = OrderStatusEnum.NoOrderUnuse
 
@@ -119,6 +120,8 @@ object CharterPassengerModel {
     private var subscribeCountDown: Disposable?=null
     var switchLine5minWait: Disposable?=null
 
+    private var newCheckSite:SiteInfoResponse.SiteInfo? = null
+
     fun init() {
         initListeners()
         queryLoginStatus()
@@ -647,6 +650,9 @@ object CharterPassengerModel {
 
     /**
      * 结束启动路距计算
+     * ① 订单结束
+     * ② 选择站点司机端同意后
+     * ③ 到站成功后
      */
     private fun endCalculateDistanceLoop() {
         BusPassengerModelLoopManager.removeLoopFunction(TAGDISTANCE)
@@ -659,6 +665,11 @@ object CharterPassengerModel {
         //mLocation gcj坐标
         mLocationGCJ02?.let {
             orderInfo?.let { order ->
+                newCheckSite?.let {
+                    if(it.siteId!=order.siteId){
+                        return
+                    }
+                }
                 // 启动轨迹计算
                 var lastSumLength = 0f
                 val orderLonLat =
@@ -970,11 +981,12 @@ object CharterPassengerModel {
     private fun isSuccess(requestSuccessSign: String) =
         broadcastList[requestSuccessSign] == null || broadcastList[requestSuccessSign] == false
 
-    fun cleanbroadcastListInfo(){
+    fun cleanbroadcastListInfo(checkSite: SiteInfoResponse.SiteInfo?) {
         switchLine5minWait = RxUtils.createSubscribe(5 * 60 * 1000) {
             CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "5分钟倒计时可以选择线路了")
         }
         broadcastList.clear()
+        newCheckSite = checkSite
         // 到站结束自驾
         CallerAutoPilotControlManager.cancelAutoPilot()
         // 停止路距计算

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt

@@ -6,9 +6,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
 import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.zhjt.mogo_core_function_devatools.trace.TraceManager
 
 class TtsManager : IMoGoCloudListener {
 
@@ -22,7 +20,7 @@ class TtsManager : IMoGoCloudListener {
     }
 
     fun initTts(context: Context) {
-        CallerCloudListenerManager.addListener(TraceManager.TAG, this)
+        CallerCloudListenerManager.addListener(TAG, this)
         AIAssist.getInstance(context)
     }