From 0e086b5c3d0951c5209cd6078a2193371c006171 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 27 Sep 2023 10:47:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[6.1.0]=20mogo=20taxi=E6=A8=A1=E5=9D=97,?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=9D=97=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?INVISIBLE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 28c22f948a..4cc7601535 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -561,7 +561,7 @@ public abstract class BaseTaxiTabFragment Date: Wed, 27 Sep 2023 14:09:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[6.1.0]=20=E6=9B=B4=E6=96=B0=E5=88=B0?= =?UTF-8?q?=E7=AB=99=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/task/TaxiTaskModel.kt | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 753b29ef78..d6d6f7453f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -31,7 +31,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.* import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage @@ -119,7 +118,7 @@ object TaxiTaskModel { private var mPrepareTaskDelayRunnable: Runnable? = null - private var mIsArrivedSiteTag = false //到站标志位,防止围栏触发多次调用到站接口 + private var mIsArrivedSiteStartTag = false //到站接口请求标志位,防止围栏触发多次调用到站接口, true 接口请求, false : 接口请求完成 fun addTaskWithOrderListener(tag: String, listener: ITaxiTaskWithOrderCallback) { if (mTaxiTaskWithOrderCallbackMap.containsKey(tag)) { @@ -557,12 +556,12 @@ object TaxiTaskModel { siteId: Long, isArriveAtEndSite: Boolean, isArrivedNearestStation: Boolean = false ) { - if (mIsArrivedSiteTag) { + if (mIsArrivedSiteStartTag) { DebugView.printInfoMsg("arriveSite接口正在调用中") - i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteTag") + i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteStartTag") return } - mIsArrivedSiteTag = true + mIsArrivedSiteStartTag = true DebugView.printInfoMsg("[上报ArriveSite] siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite") i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite") TaxiTaskWithOrderServiceManager.arriveSite( @@ -570,8 +569,10 @@ object TaxiTaskModel { siteId, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { - mIsArrivedSiteTag = false - if (data == null || data.code != 0) return + if (data == null || data.code != 0) { + mIsArrivedSiteStartTag = false + return + } DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite") d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data)) mDriveToNearestStationTask = null @@ -587,7 +588,7 @@ object TaxiTaskModel { override fun onError() { super.onError() - mIsArrivedSiteTag = false + mIsArrivedSiteStartTag = false if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试 ToastUtils.showShort("网络出现异常,请稍后重试") DebugView.printErrorMsg("[上报ArriveSite] 网络出现异常,请稍后重试") @@ -598,7 +599,7 @@ object TaxiTaskModel { } override fun onFail(code: Int, msg: String?) { - mIsArrivedSiteTag = false + mIsArrivedSiteStartTag = false DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg") d(TAG, "code=$code msg=$msg") ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg") @@ -718,6 +719,7 @@ object TaxiTaskModel { //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务 if (result.currentStatus == TaskStatusEnum.CompleteTask.code ) { + mIsArrivedSiteStartTag = false //任务完成说明到站, 更新到站标识位, 不再到站接口请求成功更新 mADASStatusCallback?.updateAutopilotStatus() mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value From fa2043c97ab244fecfaaa48c500b695d94dcb43e Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 27 Sep 2023 14:54:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[6.1.0][Fix]AD=E8=AF=B7=E6=B1=82=E7=9A=84?= =?UTF-8?q?=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6=E5=8F=AF=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/ParallelDriveView.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt index 28272c135c..84742609d3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt @@ -99,6 +99,10 @@ class ParallelDriveView @JvmOverloads constructor( ToastUtils.showShort("请求已取消！") checkAvailableAndUpdateUI() } + AD_REQUESTING -> { + Log.d(TAG, "Click-自动驾驶正在请求平行驾驶") + ToastUtils.showShort("自动驾驶正在请求平行驾驶") + } UNAVAILABLE -> { Log.d(TAG, "Click-请P档驻车并松开油门刹车后请求") ToastUtils.showShort("请P档驻车并松开油门刹车后请求") @@ -251,7 +255,7 @@ class ParallelDriveView @JvmOverloads constructor( AD_REQUESTING -> { stopSyncAnimation() - rootLayout.isEnabled = false + rootLayout.isEnabled = true statusIconOuter.visibility = GONE rootLayout.alpha = 1f statusIcon.background = From e624e914648f88c32ae9d2ee019f50595058535f Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 27 Sep 2023 16:51:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[6.1.0][Opt]=E4=BC=98=E5=8C=96=E4=B8=8BQUIC?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8C=89=E9=92=AE=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/view_debug_setting.xml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 041a3b4f91..dd886db100 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -290,18 +290,6 @@ android:textOn="关闭obu预警融合" android:textSize="@dimen/dp_24" /> - - + From 9a2feb631a9e64a3207245ca1fd16230fdd52fa4 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 27 Sep 2023 19:19:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[6.1.0]=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E7=81=AFAI=E4=BA=91=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E8=87=AA=E8=BD=A6=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E9=97=AA=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/v2x/TrafficLightDispatcher.kt | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 902302fec5..9f5cc29ffa 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -66,6 +66,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight //obu数据 @Volatile private var hasObuLightStatus: Boolean = false + + //是否有自车感知红绿灯数据 + @Volatile + private var hasAutopilotPerception: Boolean = false + //红绿灯定时器，超时未更新隐藏红绿灯 @Volatile private var lightCountDownTimer: CountDownTimer? = null @@ -90,7 +95,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight ) if (!hasObuLightStatus) { if (!hasAiLightStatus) { - trafficLights?.let { it -> + trafficLights?.let { var light: TrafficLight? = null if (it.hasStraight()) { light = it.straight @@ -106,9 +111,13 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight "onAutopilotPerceptionTrafficLight light = $light " ) if (light == null) { + hasAutopilotPerception = false //隐藏红绿灯显示 hide("感知light为null隐藏", DataSourceType.TELEMATIC) } else { + if(!hasAutopilotPerception){ + hasAutopilotPerception = true + } onTrafficLightPlusSource(light.convert(), 0, DataSourceType.TELEMATIC) } } @@ -128,6 +137,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight } if (!hasObuLightStatus) { hasAiLightStatus = true + hasAutopilotPerception = false CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", "onTrafficLightStatus trafficLightResult = $trafficLightResult " @@ -156,7 +166,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理 if (!hasObuLightStatus) { CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) - hide("云端离开路口隐藏", DataSourceType.AICLOUD) +// hide("云端离开路口隐藏", DataSourceType.AICLOUD) } } } @@ -165,15 +175,15 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight * 红绿灯接口请求失败 */ override fun onTrafficRequestError() { - hasAiLightStatus = false CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", "onTrafficRequestError hasObuLightStatus = $hasObuLightStatus ------> " ) - CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) - if (!hasObuLightStatus) { - hide("云端红绿灯接口请求失败隐藏", DataSourceType.AICLOUD) - } + CallerTrafficLightListenerManager.resetTrafficLightStatus(hasAiLightStatus) + hasAiLightStatus = false +// if (!hasObuLightStatus) { +// hide("云端红绿灯接口请求失败隐藏", DataSourceType.AICLOUD) +// } } /** @@ -186,14 +196,14 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight } /** - * 是否重置红绿灯数据,需要确保，在obu的红绿灯显示的时候，不执行。否则会闪屏 + * 是否重置红绿灯数据,需要确保，在obu的红绿灯显示或自车感知红绿灯显示的时候，不执行。否则会闪屏 */ override fun resetTrafficLight(isReset: Boolean) { CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", "resetTrafficLight ------> isReset = $isReset ---hasObuLightStatus = $hasObuLightStatus" ) - if (!hasObuLightStatus) { + if (!hasObuLightStatus && !hasAutopilotPerception) { if (isReset) { hide("云端重置红绿灯数据", DataSourceType.AICLOUD) } @@ -228,6 +238,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight super.onTrafficLightPlusSource(light, remain, lightSource) if (lightSource == DataSourceType.OBU) { hasObuLightStatus = true + hasAutopilotPerception = false } CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", From 328ca7a1197ffc0abdc4c2fef6256cfd9a73cff9 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 27 Sep 2023 19:36:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[6.1.0]=E8=B0=83=E6=95=B4=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E7=81=AF=E6=95=B0=E6=8D=AE=E5=88=86=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/datacenter/v2x/TrafficLightDispatcher.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 9f5cc29ffa..e0c8f7057e 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -136,8 +136,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight ) } if (!hasObuLightStatus) { - hasAiLightStatus = true - hasAutopilotPerception = false CallerLogger.d( "${SceneConstant.M_D_C}${TAG}", "onTrafficLightStatus trafficLightResult = $trafficLightResult " @@ -304,6 +302,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight "updateTrafficLight ----- currentTrafficLight = $currentTrafficLight" ) currentTrafficLight?.let { + hasAiLightStatus = true + hasAutopilotPerception = false val remain = if (it.time() > 99) { 99 } else { From 977de6be3b5b72b62374c57c95b6bc1bb6673560 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 27 Sep 2023 19:36:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[6.1.0]=201=E3=80=81=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=9A=90=E8=97=8F=202=E3=80=81=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8D=95=E5=88=B0=E8=BE=BE=E7=AB=99=E7=82=B9?= =?UTF-8?q?,=20=E6=9A=82=E5=81=9C=E6=8E=A5=E5=8D=95->=20=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=8E=A5=E5=8D=95=20=E5=89=8D=E5=BE=80=E6=A0=87=E5=AE=9A?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=88=B0=E7=AB=99=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 4 +++- .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index b9c0a1276a..1f7b1cf37a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -493,7 +493,9 @@ class TaxiCurrentTaskFragment : BaseFragment(), } private fun updateOrderUI(order: OrderDetail) { - cancelOrder.visibility = View.VISIBLE + cancelOrder.visibility = if (order.orderStatus + == TaxiOrderStatusEnum.ArriveAtEnd.code + ) View.GONE else View.VISIBLE orderPhoneAndNum.visibility = View.VISIBLE taskClickBtn.visibility = View.VISIBLE taskTypeTv.visibility = View.VISIBLE diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index d6d6f7453f..c1d5857c2f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -730,6 +730,7 @@ object TaxiTaskModel { //达到终点后查询全程里程和用时 if (QueryCurrentTaskRespBean.isOrderArriveAtEnd(result)) { d(TAG, "queryCurrentTaskOnce ArriveAtEnd") + mIsArrivedSiteStartTag = false mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderArriveAtEnd(result.order!!.orderNo)