From caf233c762da9f12dc93517d870f7fbef34d36f7 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 25 May 2023 11:49:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[3.2.0][Fix]=E8=A7=A3=E5=86=B3=E8=AE=A2?= =?UTF-8?q?=E9=98=85SN=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt index 61f84531fe..da11f48e08 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt +++ b/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) } From a4546741750fa6d31f7f79d2e46faccc6d568339 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 25 May 2023 12:13:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[charter]=20[3.2.0]=20[=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E4=B8=8D=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/CharterPassengerModel.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index ace1d003fa..6cbb266c46 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -119,6 +119,8 @@ object CharterPassengerModel { private var subscribeCountDown: Disposable?=null var switchLine5minWait: Disposable?=null + private var newCheckSite:SiteInfoResponse.SiteInfo? = null + fun init() { initListeners() queryLoginStatus() @@ -647,6 +649,9 @@ object CharterPassengerModel { /** * 结束启动路距计算 + * ① 订单结束 + * ② 选择站点司机端同意后 + * ③ 到站成功后 */ private fun endCalculateDistanceLoop() { BusPassengerModelLoopManager.removeLoopFunction(TAGDISTANCE) @@ -659,6 +664,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 +980,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() // 停止路距计算 From 8cabd8d8add96be212815d24de3353ca878da7da Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 25 May 2023 12:19:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[charter]=20[3.2.0]=20[=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/CharterPassengerModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 6cbb266c46..a5c439b28e 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/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 = ArrayList() + @Volatile + private var mRoutePoints: MutableList = ArrayList() private var orderStatus: OrderStatusEnum = OrderStatusEnum.NoOrderUnuse