From e02988c4bd53ab9aa9f8c4674f52557cc738a2c2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 27 May 2025 18:07:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[8.0.0]PNC=E6=9B=B4=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/aiview/PNCActionsViewModel.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt index b906723e24..b18738866b 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt @@ -173,10 +173,10 @@ class PNCActionsViewModel: ViewModel(), IMoGoAutopilotPlanningActionsListener { "车辆待环境安全后出站，耐心等几秒，安全比赶路更重要～" } "车辆向左变道"->{ - "确认环境安全，车辆正在规划平稳向左/向右变道，同时持续监测周边交通参与者动向，放心交给我们吧！" + "确认环境安全，车辆正在规划平稳向左变道，同时持续监测周边交通参与者动向，放心交给我们吧！" } "车辆向右变道"->{ - "确认环境安全，车辆正在规划平稳向左/向右变道，同时持续监测周边交通参与者动向，放心交给我们吧！" + "确认环境安全，车辆正在规划平稳向右变道，同时持续监测周边交通参与者动向，放心交给我们吧！" } "车辆完成变道"->{ "变道完成啦，继续前进！小智持续守护您的行程。" @@ -194,22 +194,22 @@ class PNCActionsViewModel: ViewModel(), IMoGoAutopilotPlanningActionsListener { "车辆正在路口等红灯，可以安心放空望望窗外～小智一直在您身边哦！" } "车辆正在变道避让前方道路施工"->{ - "车辆正在提前规划向左/右变道避让前方道路施工，稳稳的很安心～您已体验到车路云一体化协同应用场景，是当之无愧的先锋体验官！" + "车辆正在提前规划变道避让前方道路施工，稳稳的很安心～您已体验到车路云一体化协同应用场景，是当之无愧的先锋体验官！" } "车辆正在绕行避让前方道路施工"->{ - "车辆正在提前规划向左/右绕行避让前方道路施工，稳稳的很安心～您已体验到车路云一体化协同应用场景，是当之无愧的先锋体验官！" + "车辆正在提前规划绕行避让前方道路施工，稳稳的很安心～您已体验到车路云一体化协同应用场景，是当之无愧的先锋体验官！" } "车辆正在变道避让前方道路事故"->{ - "车辆正在提前规划向左/右变道避让前方道路事故，放心看我表现吧！您已体验到车路云一体化协同应用场景，小智为您欢呼！" + "车辆正在提前规划变道避让前方道路事故，放心看我表现吧！您已体验到车路云一体化协同应用场景，小智为您欢呼！" } "车辆正在绕行避让前方道路事故"->{ - "车辆正在提前规划向左/右绕行避让前方道路事故，放心看我表现吧！您已体验到车路云一体化协同应用场景，小智为您欢呼！" + "车辆正在提前规划绕行避让前方道路事故，放心看我表现吧！您已体验到车路云一体化协同应用场景，小智为您欢呼！" } "车辆正在跟车通行"->{ "车辆正在跟随前车通行，舒适度MAX～您已体验到车路云一体化协同应用场景，超越全国99%的乘客！" } "车辆正在绕行前方车龙"->{ - "车辆正在提前规划向左/右变道避让路口车龙，舒适度MAX～。您已体验到车路云一体化协同应用场景，超越全国99%的乘客！" + "车辆正在提前规划变道避让路口车龙，舒适度MAX～。您已体验到车路云一体化协同应用场景，超越全国99%的乘客！" } "车辆正在使用云端轨迹通行"->{ "前方智慧路口内有障碍物，车辆正在使用云端规划轨迹通行。您已体验到车路云一体化协同应用场景，超越全国99%的乘客！" From 3764d9d4964e6d4dfece2d506d41c30b3ebe67dc Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 27 May 2025 18:32:20 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[8.0.0]=20[fix]=20[=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E5=BD=92=E4=BD=8D=E8=83=8C=E6=99=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml index f8f987224e..7009998be1 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_overmap.xml @@ -57,6 +57,7 @@ android:id="@+id/aciv_only_center_bg" android:src="@drawable/taxi_p_only_center_bg" app:layout_constraintEnd_toEndOf="parent" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@+id/ovbv_bottom_icons" android:layout_marginEnd="@dimen/dp_46" android:layout_marginBottom="@dimen/dp_46" From 4662ed654eca0dce6d8e9cc185ff13b6ceeb23a6 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 27 May 2025 19:02:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[8.0.0]=E5=8E=BB=E6=8E=89Taxi=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/aiview/adapter/AIMessageViewHolder.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt index 61283e46aa..ee03645972 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt @@ -23,7 +23,6 @@ import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.notice.AutoExplorationEntity import com.mogo.eagle.core.data.v2x.RoadV2NEventType import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager -import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerNDERoadAdapter import com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationAdapter import com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventLivePlayView import com.mogo.eagle.core.function.view.MapRoamView @@ -214,10 +213,6 @@ class RoadV2NEventViewHolder(binding: View) : MessageViewHolder(binding){ tvV2XHintContent.text = item.title tvV2XTimeStr.text = "更新时间：${DateTimeUtils.getTimeText(item.timeStamp, DateTimeUtils.HH_mm_ss)}" - if (item.isNeedTTS && !TextUtils.isEmpty(item.tts)) { - AIAssist.getInstance(itemView.context) - .speakTTSVoiceWithLevel(item.tts, AIAssist.NEW_LEVEL_2) - } when (item.eventType) { RoadV2NEventType.TEXT -> { containerImageAndLiveVideo.visibility = View.GONE From 1c1bf8764d463b3e11c9e662d95ee5943e4a1db2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 28 May 2025 17:57:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[8.0.0]=E5=8E=BB=E6=8E=89Taxi=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=85=AC=E4=BA=A4=E7=AB=99=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt index f027c7ab97..b850341ea7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt @@ -54,11 +54,11 @@ class RoadV2NEventViewModel: ViewModel(), IRoadV2NEventWindowListener { val event = AIMessage.RoadV2NEvent( dataBean.eventId, dataBean.hintStr, - dataBean.ttsStr, + "", dataBean.eventType, dataBean.timestamp, dataBean.iconResId, - dataBean.isNeedTTS, + false, dataBean.contentImageUrl, dataBean.cameraIp, dataBean.lon, From 15857ba77733c0abb5d490883002bf4cc04c6f71 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 28 May 2025 19:23:43 +0800 Subject: [PATCH 5/9] [8.0.0] [fix] [UiThreadHandler -> BizLoopManager] --- .../passenger/presenter/BaseTaxiPassengerPresenter.kt | 7 ++++--- .../unmanned/passenger/ui/aiview/PNCActionsViewModel.kt | 6 ++++-- .../och/unmanned/passenger/ui/arrived/RightRearCamView.kt | 2 +- .../com/mogo/och/unmanned/passenger/ui/bar/RightBarView.kt | 3 ++- .../ui/checkstartautopilot/ChekAndStartAutopilotView.kt | 4 ++-- .../startautopilot/StartAutopilotViewModel.kt | 3 ++- .../unmanned/passenger/ui/evaluate/EvaluateViewModel.kt | 3 ++- .../unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt | 7 ++++--- .../com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt | 3 ++- .../mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt | 4 ++-- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt index 18d228798a..494f9c1068 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -15,6 +15,7 @@ import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.data.taxi.BaseOrderBean import com.mogo.och.data.taxi.TaxiOrderStatusEnum import com.mogo.och.unmanned.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean @@ -181,7 +182,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } fun setItineraryVisibility() { - UiThreadHandler.post { + BizLoopManager.runInMainThread { when (TaxiPassengerModel.curOrderStatus) { TaxiOrderStatusEnum.None, TaxiOrderStatusEnum.OnTheWayToStart, @@ -200,10 +201,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } override fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) { - UiThreadHandler.post({ + BizLoopManager.runInMainThread({ OchChainLogManager.writeChainLog("到达目的地计算距离和时间","距离：${mileage} 时间：${duration}") mView?.showDuringAndDistance(mileage*1000,duration) - },UiThreadHandler.MODE.QUEUE) + }) } companion object { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt index b18738866b..c3875ae4f7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt @@ -6,7 +6,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsL import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage import mogo.telematics.pad.MessagePad @@ -25,7 +27,7 @@ class PNCActionsViewModel: ViewModel(), IMoGoAutopilotPlanningActionsListener { override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { try { - UiThreadHandler.post { + BizLoopManager.runInMainThread { if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { var actions: String? = null planningActionMsg.actionMsg?.let { @@ -160,7 +162,7 @@ class PNCActionsViewModel: ViewModel(), IMoGoAutopilotPlanningActionsListener { private fun getActionDesc(action: String): String{ return when(action){ "车辆进站"->{ - "前方即将到达${TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName}，" + + "前方即将到达${TaxiPassengerModel.currentOCHOrder?.orderEndSite?.siteName}，" + "车辆正在规划减速并进站停靠，请安心等待车辆停稳再下车哦～" } "车辆等待进站"->{ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt index 0c585731f5..92de36ee0a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt @@ -127,7 +127,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, val preTime = System.currentTimeMillis() BitmapFactory.decodeByteArray(data, 0, data.size, mBitmapOptions) d(SceneConstant.M_TAXI_P + TAG, "decode时间：${System.currentTimeMillis()-preTime}") - UiThreadHandler.post(this) + UiThreadHandler.post(this,UiThreadHandler.MODE.QUEUE) } catch (e: Exception) { e.printStackTrace() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bar/RightBarView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bar/RightBarView.kt index 2640cd19a7..10aece16a5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bar/RightBarView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bar/RightBarView.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.common.module.manager.audition.MusicData import com.mogo.och.common.module.manager.audition.PlayState +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.unmanned.passenger.ui.music.playing.MusicPlayingViewModel import com.mogo.och.unmanned.taxi.passenger.R @@ -196,7 +197,7 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { } override fun updateState(oldData: MusicData?, musicData: MusicData) { - UiThreadHandler.post { + BizLoopManager.runInMainThread { if (musicData.state == PlayState.Playing) { if(!ck_music.isChecked){ Glide.with(context) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 40e660bce7..c122a1ed1d 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -174,7 +174,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, }else { UiThreadHandler.postDelayed({ startAnimal() - }, 2000) + }, 2000,UiThreadHandler.MODE.QUEUE) } } else -> {} @@ -227,7 +227,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, } } }) - aniStartAutopilotSuccessAni.start()},350) + aniStartAutopilotSuccessAni.start()},350,UiThreadHandler.MODE.QUEUE) } }) animatorSetCompat.start() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt index 7a133d96ef..6f3231e9ed 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt @@ -13,6 +13,7 @@ import com.mogo.och.bridge.device.TaxiDoorStateManager import com.mogo.och.bridge.device.callback.DoorStateCallback import com.mogo.och.bridge.device.data.DoorPosition import com.mogo.och.bridge.device.data.DoorState +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.unmanned.passenger.model.AutopilotManager @@ -105,7 +106,7 @@ class StartAutopilotViewModel : ViewModel(), override fun hasOpenDoor(have: Boolean) { CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "车门是否开着：${have}") doorOpenState = have - UiThreadHandler.post { + BizLoopManager.runInMainThread { viewCallback?.canStartAutopilot(!doorOpenState) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateViewModel.kt index 7aa2d43370..a053ae87ec 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateViewModel.kt @@ -6,6 +6,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.unmanned.taxi.utils.order.OrderModel class EvaluateViewModel : ViewModel(), IDistanceListener { @@ -25,7 +26,7 @@ class EvaluateViewModel : ViewModel(), IDistanceListener { com.mogo.och.unmanned.taxi.utils.order.OrderModel.orderBean?.orderNo?.let { val string = SharedPrefsMgr.getInstance().getString(orderShowEvaluate) if (StringUtils.isEmpty(string) || !string.equals(it)) { - UiThreadHandler.post { + BizLoopManager.runInMainThread { this.viewCallback?.showEvaluate(true) } SharedPrefsMgr.getInstance().putString(orderShowEvaluate, it) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt index 73cd9519b5..c59a8b7988 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/OrderInfoViewModel.kt @@ -3,6 +3,7 @@ package com.mogo.och.unmanned.passenger.ui.orderinfo import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.unmanned.taxi.passenger.R @@ -70,7 +71,7 @@ class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, val time = ceil(tempTimeInSecond / 60f).toInt() val arriveTime = DateTimeUtil.getAfterSecondTime(tempTimeInSecond.toInt()) - UiThreadHandler.post { + BizLoopManager.runInMainThread { viewCallback?.setDistanceInfo( dis!!,disUnit,time.toString(),surplusTimeUnit,arriveTime,stationDistance-meters.toInt(),stationDistance) } @@ -78,7 +79,7 @@ class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) { TaxiPassengerModel.currentOCHOrder?.orderEndSite?.let { - UiThreadHandler.post { + BizLoopManager.runInMainThread { viewCallback?.setEndStation(it.siteName) } } @@ -87,7 +88,7 @@ class OrderInfoViewModel: ViewModel(), IOCHTaxiPassengerOrderStatusCallback, } else ->{ - UiThreadHandler.post { + BizLoopManager.runInMainThread { viewCallback?.setDistanceInfo( "--", disUnit, "--", surplusTimeUnit, "--", 0, 100 ) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt index beaa25c9fc..37aec98da1 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/speed/SpeedView.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_speed.view.actv_speed_value import kotlin.math.abs @@ -48,7 +49,7 @@ class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { mogoLocation?.let { - UiThreadHandler.post { + BizLoopManager.runInMainThread { val speedKM = (abs(it.gnssSpeed) * 3.6f).toInt() actv_speed_value.text = speedKM.toString() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt index 64532dcaab..c30791465c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/video/InfoVideoView.kt @@ -16,8 +16,8 @@ import com.mogo.eagle.core.function.main.MainMoGoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.audiofocus.AudioFocusManager +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager import com.mogo.och.common.module.wigets.media.IMediaDataSourceListener import com.mogo.och.common.module.wigets.media.MediaDataSourceManager @@ -135,7 +135,7 @@ internal class InfoVideoView @JvmOverloads constructor( private fun updateMediaListDataAndView(newList: MutableList) { mediaList.clear() mediaList.addAll(newList) - UiThreadHandler.post { + BizLoopManager.runInMainThread { updateData() infoVideoPlaylist.adapter?.notifyDataSetChanged() } From a223be4cc97c72f306a6a7b002d8fd4538a419aa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 28 May 2025 19:23:57 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[8.0.0]=20[fix]=20[=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=A8=E7=94=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerBaseFragment.kt | 162 ++++++++---------- 1 file changed, 70 insertions(+), 92 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index d3b0147ab5..e24e9a4ea3 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -18,6 +18,7 @@ import com.mogo.map.listener.IMogoMapListener import com.mogo.mgintelligent.speech.iflytek.WakeUpManager import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.constant.OchCommonConst +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice @@ -266,7 +267,7 @@ class TaxiPassengerBaseFragment : override fun showOrHideCheckAndStartAutopilotView(status:Int){ - UiThreadHandler.post { + BizLoopManager.runInMainThread{ arrivedView.visibility = View.GONE when (status) { 0 -> { @@ -364,9 +365,6 @@ class TaxiPassengerBaseFragment : val allAnimator = mutableListOf() allAnimator.addAll(aniStatusBar(isShow)) allAnimator.addAll(aniBottomBar(isShow)) - - //allAnimator.addAll(aniSpeedSettingRow(isShow,speedView)) - allAnimator.addAll(aniOrderInfo(isShow)) animatorSet.playTogether(allAnimator) animatorSet.start() @@ -375,108 +373,88 @@ class TaxiPassengerBaseFragment : @SuppressLint("ObjectAnimatorBinding") fun aniStatusBar(show:Boolean):List{ val statusBar = mutableListOf() - val translationYStart: Float - val translationYEnd: Float - val alphaStart: Float - val alphaEnd: Float +// val translationYStart: Float +// val translationYEnd: Float +// val alphaStart: Float +// val alphaEnd: Float +// if(show){ +// translationYStart = -statusBarView!!.height.toFloat() +// translationYEnd = 0f +// alphaStart = 0.3f +// alphaEnd = 1f +// }else{ +// translationYStart = 0f +// translationYEnd = -statusBarView!!.height.toFloat() +// alphaStart = 1f +// alphaEnd = 0.3f +// } +// statusBar.add(ObjectAnimator.ofFloat(statusBarView, "translationY", translationYStart, translationYEnd).apply { +// duration = 1000 +// }) +// //ofFloatMove.duration = 1000 +// statusBar.add( ObjectAnimator.ofFloat(statusBarView, "alpha", alphaStart, alphaEnd).apply { +// duration = 1000 +// }) if(show){ - translationYStart = -statusBarView!!.height.toFloat() - translationYEnd = 0f - alphaStart = 0.3f - alphaEnd = 1f + statusBarView?.visibility = View.VISIBLE }else{ - translationYStart = 0f - translationYEnd = -statusBarView!!.height.toFloat() - alphaStart = 1f - alphaEnd = 0.3f + statusBarView?.visibility = View.GONE } - statusBar.add(ObjectAnimator.ofFloat(statusBarView, "translationY", translationYStart, translationYEnd).apply { - duration = 1000 - }) - //ofFloatMove.duration = 1000 - statusBar.add( ObjectAnimator.ofFloat(statusBarView, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 - }) return statusBar } private fun aniBottomBar(show:Boolean):List{ val statusBar = mutableListOf() - val translationYStart: Float - val translationYEnd: Float - val alphaStart: Float - val alphaEnd: Float - if(show){ - translationYStart = bottom!!.height.toFloat() - translationYEnd = 0f - alphaStart = 0.3f - alphaEnd = 1f - }else{ - translationYStart = 0f - translationYEnd = bottom!!.height.toFloat() - alphaStart = 1f - alphaEnd = 0.3f - } - - statusBar.add(ObjectAnimator.ofFloat(bottom, "translationY", translationYStart, translationYEnd).apply { - duration = 1000 - }) - statusBar.add(ObjectAnimator.ofFloat(bottom, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 - }) +// val translationYStart: Float +// val translationYEnd: Float +// val alphaStart: Float +// val alphaEnd: Float +// if(show){ +// translationYStart = bottom!!.height.toFloat() +// translationYEnd = 0f +// alphaStart = 0.3f +// alphaEnd = 1f +// }else{ +// translationYStart = 0f +// translationYEnd = bottom!!.height.toFloat() +// alphaStart = 1f +// alphaEnd = 0.3f +// } +// +// statusBar.add(ObjectAnimator.ofFloat(bottom, "translationY", translationYStart, translationYEnd).apply { +// duration = 1000 +// }) +// statusBar.add(ObjectAnimator.ofFloat(bottom, "alpha", alphaStart, alphaEnd).apply { +// duration = 1000 +// }) return statusBar } - private fun aniSpeedSettingRow(show:Boolean,view:View):List{ - val statusBar = mutableListOf() - val translationYStart: Float - val translationYEnd: Float - val alphaStart: Float - val alphaEnd: Float - if(show){ - translationYStart = -view.height.toFloat() - translationYEnd = 0f - alphaStart = 0.0f - alphaEnd = 1f - }else{ - translationYStart = 0f - translationYEnd = -view.height.toFloat() - alphaStart = 1f - alphaEnd = 0.0f - } - statusBar.add(ObjectAnimator.ofFloat(view, "translationY", translationYStart, translationYEnd).apply { - duration = 1000 - }) - statusBar.add(ObjectAnimator.ofFloat(view, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 - }) - return statusBar - } private fun aniOrderInfo(show:Boolean):List{ val statusBar = mutableListOf() - val translationYStart: Float - val translationYEnd: Float - val alphaStart: Float - val alphaEnd: Float - if(show){ - translationYStart = itinerary.height.toFloat()/5 - translationYEnd = 0f - alphaStart = 0.0f - alphaEnd = 1f - }else{ - translationYStart = 0f - translationYEnd = itinerary.height.toFloat()/5 - alphaStart = 1f - alphaEnd = 0.0f - } - - statusBar.add(ObjectAnimator.ofFloat(itinerary, "translationY", translationYStart, translationYEnd).apply { - duration = 1000 - }) - statusBar.add(ObjectAnimator.ofFloat(itinerary, "alpha", alphaStart, alphaEnd).apply { - duration = 1000 - }) +// val translationYStart: Float +// val translationYEnd: Float +// val alphaStart: Float +// val alphaEnd: Float +// if(show){ +// translationYStart = itinerary.height.toFloat()/5 +// translationYEnd = 0f +// alphaStart = 0.0f +// alphaEnd = 1f +// }else{ +// translationYStart = 0f +// translationYEnd = itinerary.height.toFloat()/5 +// alphaStart = 1f +// alphaEnd = 0.0f +// } +// +// statusBar.add(ObjectAnimator.ofFloat(itinerary, "translationY", translationYStart, translationYEnd).apply { +// duration = 1000 +// }) +// statusBar.add(ObjectAnimator.ofFloat(itinerary, "alpha", alphaStart, alphaEnd).apply { +// duration = 1000 +// }) return statusBar } From 59481a1b3be478643f8c7104cc480d664a0200c0 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 29 May 2025 14:44:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[8.0.0]=E6=9A=82=E6=97=B6=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?Taxi=E4=B9=98=E5=AE=A2=E5=B1=8FPNC=E5=86=B3=E7=AD=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/unmanned/passenger/ui/aiview/AiView.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt index 4e2ca32a06..50d8d9a1a6 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt @@ -47,7 +47,7 @@ class AiView @JvmOverloads constructor( private var viewModel:AIViewModel?=null - private var pncActionsModel:PNCActionsViewModel ?= null +// private var pncActionsModel:PNCActionsViewModel ?= null private var roadV2NEventModel:RoadV2NEventViewModel ?= null private var roadCrossRoamModel:RoadCrossRoamViewModel ?= null private var automaticExplorationModel:AutomaticExplorationViewModel ?= null @@ -225,10 +225,10 @@ class AiView @JvmOverloads constructor( ViewModelProvider(it).get(AIViewModel::class.java) } viewModel?.setViewCallback(this) - pncActionsModel = findViewTreeViewModelStoreOwner()?.let { - ViewModelProvider(it)[PNCActionsViewModel::class.java] - } - pncActionsModel?.init() +// pncActionsModel = findViewTreeViewModelStoreOwner()?.let { +// ViewModelProvider(it)[PNCActionsViewModel::class.java] +// } +// pncActionsModel?.init() roadV2NEventModel = findViewTreeViewModelStoreOwner()?.let{ ViewModelProvider(it)[RoadV2NEventViewModel::class.java] } From 7c9c4f0d4e933b12846b68cb781b7709d00b8ffe Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 29 May 2025 17:48:31 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[8.0.0]=20[fix]=20[music=20=E4=B8=BB?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/unmanned/passenger/ui/music/MusicModel.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt index b4defcd75a..653f695aca 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt @@ -7,6 +7,7 @@ import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.audition.MusicData +import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.CallerBase import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.data.taxi.BaseOrderBean @@ -69,14 +70,18 @@ object MusicModel : CallerBase(), OrderListener, I orderInfo?.let { cancelStopMusicDisposable() SharedPrefsMgr.getInstance().putString(startMusicWithOrderKey, it.orderNo) - checkMusic(AuditionManager.musicList.first(),true) + BizLoopManager.runInMainThread{ + checkMusic(AuditionManager.musicList.first(),true) + } } } else { orderInfo?.let { if (it.orderNo != string) { cancelStopMusicDisposable() SharedPrefsMgr.getInstance().putString(startMusicWithOrderKey, it.orderNo) - checkMusic(AuditionManager.musicList.first(),true) + BizLoopManager.runInMainThread { + checkMusic(AuditionManager.musicList.first(), true) + } } } } From 485d5bf3bb7da6cf476bf63a2b9878929599aa1a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 29 May 2025 17:51:12 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[8.0.0]=20[fix]=20[=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/unmanned/passenger/ui/arrived/RightRearCamView.kt | 2 +- .../ui/checkstartautopilot/ChekAndStartAutopilotView.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt index 92de36ee0a..0c585731f5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/arrived/RightRearCamView.kt @@ -127,7 +127,7 @@ class RightRearCamView : ConstraintLayout , IMoGoBackCameraVideoListener, val preTime = System.currentTimeMillis() BitmapFactory.decodeByteArray(data, 0, data.size, mBitmapOptions) d(SceneConstant.M_TAXI_P + TAG, "decode时间：${System.currentTimeMillis()-preTime}") - UiThreadHandler.post(this,UiThreadHandler.MODE.QUEUE) + UiThreadHandler.post(this) } catch (e: Exception) { e.printStackTrace() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index c122a1ed1d..40e660bce7 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -174,7 +174,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, }else { UiThreadHandler.postDelayed({ startAnimal() - }, 2000,UiThreadHandler.MODE.QUEUE) + }, 2000) } } else -> {} @@ -227,7 +227,7 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, } } }) - aniStartAutopilotSuccessAni.start()},350,UiThreadHandler.MODE.QUEUE) + aniStartAutopilotSuccessAni.start()},350) } }) animatorSetCompat.start()