From 72a27c6e78850dcaade9be8b04d567a8ae2835a8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 25 Sep 2024 11:17:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[6.6.1]=20[fix]=20[=E4=BF=AE=E5=A4=8D=20ses?= =?UTF-8?q?sion=20=E8=B6=85=E6=97=B6=E6=9C=AA=E6=B8=85=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/OchAutoPilotManager.kt | 40 +++++++++++----- .../autopilot/OchAutopilotAnalytics.kt | 48 +++++++++++-------- .../autopilot/bean/SessionWithTime.kt | 3 ++ 3 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt index 0cfb8c4f7f..3aa3f95b19 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt @@ -14,19 +14,22 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager +import com.mogo.och.common.module.manager.autopilot.autopilot.bean.SessionWithTime import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.zhjt.mogo.adas.common.MessageType import com.zhjt.mogo.adas.data.bean.ReceivedAck import com.zhjt.mogo.adas.data.bean.ReceivedAck.Status import fsm.Fsm2024 import java.util.concurrent.atomic.AtomicLong +import java.util.concurrent.atomic.AtomicReference object OchAutoPilotManager : IMoGoReceiveReceivedAckListener, IMoGoFsm2024Listener { const val TAG = "OchAutoPilotManager" - private val globalSessionId = AtomicLong(-1) + private val globalSessionId = AtomicReference() private val fsmBackSessionId = AtomicLong(-1L) init { @@ -51,18 +54,27 @@ object OchAutoPilotManager : IMoGoReceiveReceivedAckListener, IMoGoFsm2024Listen * 启动自驾中禁止再次启动自驾 */ @JvmStatic - fun canStartAutopilotBySessionId():Boolean{ - return (globalSessionId.get()==-1L).apply { - if(!this) { + fun canStartAutopilotBySessionId(): Boolean { + val sessionInfo = globalSessionId.get() + val currentTimeMillis = System.currentTimeMillis() + if(sessionInfo==null){ + return true + }else{ + if(currentTimeMillis-sessionInfo.setTime>=OchAutopilotAnalytics.LOOP_PERIOD_16S){ + clearGlobalSessionId("检测session 自带的时间 ${currentTimeMillis}_${sessionInfo.setTime}_${sessionInfo.sessionId}") + return true + }else{ ToastUtils.showLong("自驾启动中，请勿重复点击") OchAutopilotAnalytics.triggerCanStartAutopilotBySessionId(globalSessionId.get()) + return false } } } @JvmStatic fun canStartAutopilotBySessionIdInner():Boolean{ - return (globalSessionId.get()==-1L) + OchChainLogManager.writeChainLogAutopilot("自驾流程","清理SessiongId") + return (globalSessionId.get()==null) } @JvmStatic @@ -88,14 +100,15 @@ object OchAutoPilotManager : IMoGoReceiveReceivedAckListener, IMoGoFsm2024Listen return true } - fun clearGlobalSessionId(){ - globalSessionId.set(-1) + fun clearGlobalSessionId(log:String){ + OchChainLogManager.writeChainLogAutopilot("自驾流程","清理SessiongId${globalSessionId}_${fsmBackSessionId}_${log}") + globalSessionId.set(null) } @JvmStatic fun startAutoPilot(controlParameters: AutopilotControlParameters?): Long { val sessionId = CallerAutoPilotControlManager.startAutoPilot(controlParameters) - globalSessionId.set(sessionId) + globalSessionId.set(SessionWithTime(sessionId,System.currentTimeMillis())) fsmBackSessionId.set(-1L) OchAutopilotAnalytics.triggerStartAutopilotParameters(controlParameters, sessionId) return sessionId @@ -120,9 +133,14 @@ object OchAutoPilotManager : IMoGoReceiveReceivedAckListener, IMoGoFsm2024Listen * 启动自驾失败切 FSM返回的Session和启动SessionId 不同 */ fun checkStartSessionAndFailSessionId(){ - if(globalSessionId.get() != fsmBackSessionId.get()){ - OchAutopilotAnalytics.triggerStartAutopilotFailCheckSessionDiff(globalSessionId.get(), - fsmBackSessionId.get()) + val sessionInfo = globalSessionId.get() + if(sessionInfo!=null) { + if (sessionInfo.sessionId != fsmBackSessionId.get()) { + OchAutopilotAnalytics.triggerStartAutopilotFailCheckSessionDiff( + sessionInfo, + fsmBackSessionId.get() + ) + } } } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt index e1a4591ad8..8e18aedf1b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt @@ -11,8 +11,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager +import com.mogo.och.common.module.manager.autopilot.autopilot.bean.SessionWithTime import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.RxUtils +import io.reactivex.disposables.Disposable object OchAutopilotAnalytics { @@ -49,6 +52,7 @@ object OchAutopilotAnalytics { private const val EVENT_PARAM_VEHICLE_START_AUTOPILOT_CMD_SESSION_ID_FSM_RETURN = "cmd_session_id_fsm_return" private val LOOP_PERIOD_15S = 15 * 1000L + val LOOP_PERIOD_16S = 16 * 1000L private var mStartAutopilotKey: String? = null @@ -94,34 +98,36 @@ object OchAutopilotAnalytics { /** * 等待底盘返回的间隙 重复启动自驾 */ - fun triggerCanStartAutopilotBySessionId(globalSessionId : Long){ + fun triggerCanStartAutopilotBySessionId(globalSessionId : SessionWithTime){ val map = hashMapOf() map[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP - OchChainLogManager.writeChainLog("启动自驾Session判断","已有globalSessionId:${globalSessionId}", eventID = EVENT_KEY_VEHICLE_START_AUTOPILOT_CMD_SESSION_DUPLICATED, patch = map) + OchChainLogManager.writeChainLog("启动自驾Session判断","已有globalSessionId:${globalSessionId.sessionId}_创建时间：${globalSessionId.setTime}", eventID = EVENT_KEY_VEHICLE_START_AUTOPILOT_CMD_SESSION_DUPLICATED, patch = map) } /** * 启动失败后 对比两个session是否相同 */ - fun triggerStartAutopilotFailCheckSessionDiff(globalSessionId: Long, fsmBackSessionId: Long){ + fun triggerStartAutopilotFailCheckSessionDiff(globalSessionId: SessionWithTime, fsmBackSessionId: Long){ val map = hashMapOf() map[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP - map[EVENT_PARAM_VEHICLE_START_AUTOPILOT_CMD_SESSION_ID_START] = globalSessionId + map[EVENT_PARAM_VEHICLE_START_AUTOPILOT_CMD_SESSION_ID_START] = "${globalSessionId.sessionId}_${globalSessionId.setTime}" map[EVENT_PARAM_VEHICLE_START_AUTOPILOT_CMD_SESSION_ID_FSM_RETURN] = fsmBackSessionId OchChainLogManager.writeChainLog("启动自驾失败且SessionId不同","globalSessionId:${globalSessionId}——————fsmBackSessionId:${fsmBackSessionId}", eventID = EVENT_KEY_VEHICLE_START_AUTOPILOT_CMD_SESSION_DIFF, patch = map) } - - private val timeOutRunnable = Runnable { - // 15s内未开启，上报失败埋点 - triggerStartAutopilotFailureEvent("", "15s后app等待超时", System.currentTimeMillis()) - } + private var timeOutDisposable: Disposable?=null /** * 底盘明确告知启动自驾失败 */ fun triggerStartAutopilotFailureEventByAdas(failCode: String, failMsg: String, startFailDate: Long) { - BizLoopManager.removeCallback(timeOutRunnable) + OchChainLogManager.writeChainLogAutopilot("自驾流程","启动自驾失败回调${failCode}_${failMsg}") + if(OchAutoPilotManager.canStartAutopilotBySessionIdInner()){ + CallerLogger.e(SceneConstant.M_OCHCOMMON + "triggerStartAutopilotFailureEvent canStartAutopilotBySessionIdInner == false") + OchChainLogManager.writeChainLogAutopilot("自驾流程","异常情况 启动自驾失败回调${failCode}_${failMsg}_sessiong为空") + return + } + RxUtils.disposeSubscribe(timeOutDisposable) // 判断Session 是否相同 OchAutoPilotManager.checkStartSessionAndFailSessionId() triggerStartAutopilotFailureEvent(failCode, failMsg, startFailDate) @@ -132,12 +138,10 @@ object OchAutopilotAnalytics { } private fun triggerStartAutopilotFailureEvent(failCode: String, failMsg: String, startFailDate: Long) { - if(OchAutoPilotManager.canStartAutopilotBySessionIdInner()){ - CallerLogger.e(SceneConstant.M_OCHCOMMON + "triggerStartAutopilotFailureEvent canStartAutopilotBySessionIdInner == false") + OchAutoPilotManager.clearGlobalSessionId("$failMsg _ ${failCode}") + if (mStartAutopilotParams.isEmpty()) { return } - OchAutoPilotManager.clearGlobalSessionId() - if (mStartAutopilotParams.isEmpty()) return CallerLogger.e(SceneConstant.M_OCHCOMMON + "triggerStartAutopilotFailureEvent", failMsg) if (CallerAutoPilotStatusListenerManager.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { mStartAutopilotParams[EVENT_PARAM_START_FAILURE_CODE] = failCode @@ -170,15 +174,19 @@ object OchAutopilotAnalytics { triggerDate: Long, source:Int = 0 ) { + OchChainLogManager.writeChainLogAutopilot("自驾流程","send:${send}_${restart}_${startName}_${endName}_${lineId}_${orderId}_${source}_${triggerDate}") mStartAutopilotKey = if (restart) getEventKeyRestartService() else getEventKeyStartService() if (send) { if(OchAutoPilotManager.canStartAutopilotBySessionIdInner()){ CallerLogger.e(SceneConstant.M_OCHCOMMON + "triggerStartAutopilotEvent canStartAutopilotBySessionIdInner == false") + OchChainLogManager.writeChainLogAutopilot("自驾流程","异常情况 启动自驾成功_sessiong为空") + return + } + OchAutoPilotManager.clearGlobalSessionId("启动自驾成功") + RxUtils.disposeSubscribe(timeOutDisposable) + if (mStartAutopilotParams.isEmpty()) { return } - OchAutoPilotManager.clearGlobalSessionId() - BizLoopManager.removeCallback(timeOutRunnable) - if (mStartAutopilotParams.isEmpty()) return // 开启成功，上报埋点 mStartAutopilotParams[EVENT_PARAM_START_FAILURE_CODE] = "" mStartAutopilotParams[EVENT_PARAM_START_FAILURE_MSG] = "" @@ -198,8 +206,10 @@ object OchAutopilotAnalytics { mStartAutopilotParams[EVENT_PARAM_END_NAME] = endName mStartAutopilotParams[EVENT_PARAM_LINE_ID] = lineId mStartAutopilotParams[EVENT_PARAM_ORDER_NUMBER] = orderId?:"" - BizLoopManager.removeCallback(timeOutRunnable) - BizLoopManager.postDelayed(timeOutRunnable,LOOP_PERIOD_15S) + RxUtils.disposeSubscribe(timeOutDisposable) + timeOutDisposable = RxUtils.createSubscribe(LOOP_PERIOD_15S) { + triggerStartAutopilotFailureEvent("", "15s后app等待超时", System.currentTimeMillis()) + } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt new file mode 100644 index 0000000000..7a3e97167f --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt @@ -0,0 +1,3 @@ +package com.mogo.och.common.module.manager.autopilot.autopilot.bean + +data class SessionWithTime(val sessionId:Long,val setTime:Long) From 4ae9ea79e96fca405f24c24456af1bc511e25738 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Wed, 25 Sep 2024 14:14:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[6.6.1]=20[Fix]=201=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7Ai=20SDK=E5=88=B01.4.7.41=20-=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20const=20val=20READ=5FTIMEOUT=20=3D=2010000L=20const?= =?UTF-8?q?=20val=20WRITE=5FTIMEOUT=20=3D=2010000L=20-=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7retrofit=E7=89=88=E6=9C=AC=E5=88=B02.6.4=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0OkHttp=E7=BA=BF=E7=A8=8B=E6=B1=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c6bc8a5c1e..c269ad894a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,21 +64,21 @@ bytex.ASM_API=ASM7 LOGLIB_VERSION=1.10.18 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.38 +MOGO_NETWORK_VERSION=1.4.7.41 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.38 +MOGO_PASSPORT_VERSION=1.4.7.41 # 长链接 -MOGO_SOCKET_VERSION=1.4.7.38 +MOGO_SOCKET_VERSION=1.4.7.41 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.38 +MOGO_REALTIME_VERSION=1.4.7.41 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.38 +MOGO_LIVE_VERSION=1.4.7.41 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.38 +MOGO_TRAFFICLIVE_VERSION=1.4.7.41 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.38 +MOGO_LOCATION_VERSION=1.4.7.41 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.38 +MOGO_TELEMATIC_VERSION=1.4.7.41 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.0.6 From eb8f3fac2b901017e2600ed9aab7a2b5e3bb07f2 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Wed, 25 Sep 2024 15:43:39 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[6.6.1]=20[Fix]=201=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7Ai=20SDK=E5=88=B01.4.7.42=20-=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20const=20val=20READ=5FTIMEOUT=20=3D=2010000L=20const?= =?UTF-8?q?=20val=20WRITE=5FTIMEOUT=20=3D=2010000L=20-=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7retrofit=E7=89=88=E6=9C=AC=E5=88=B02.6.4=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0OkHttp=E7=BA=BF=E7=A8=8B=E6=B1=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c269ad894a..c4f3054837 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,21 +64,21 @@ bytex.ASM_API=ASM7 LOGLIB_VERSION=1.10.18 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.41 +MOGO_NETWORK_VERSION=1.4.7.42 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.41 +MOGO_PASSPORT_VERSION=1.4.7.42 # 长链接 -MOGO_SOCKET_VERSION=1.4.7.41 +MOGO_SOCKET_VERSION=1.4.7.42 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.41 +MOGO_REALTIME_VERSION=1.4.7.42 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.41 +MOGO_LIVE_VERSION=1.4.7.42 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.41 +MOGO_TRAFFICLIVE_VERSION=1.4.7.42 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.41 +MOGO_LOCATION_VERSION=1.4.7.42 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.41 +MOGO_TELEMATIC_VERSION=1.4.7.42 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.0.6 From 889f3a7724ffb97093d09c27e8ead707240ae458 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Wed, 25 Sep 2024 15:49:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[6.6.1]=20[Fix]=201=E3=80=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index c4f3054837..3c3272f49c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -90,8 +90,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=6006000 -versionName=6.6.0 +versionCode=6006001 +versionName=6.6.1 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 @@ -149,7 +149,7 @@ MATRIX_VERSION=2.0.8 # 公交模式司机端版本号 -DRIVER_VERSION=6.6.0 +DRIVER_VERSION=6.6.1 # 公交模式乘客端端版本号 -PASSENGER_VERSION=5.6.0 +PASSENGER_VERSION=5.6.1 From 2e2365c9e806be08f7cd031b25f649c08ffd484d Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 26 Sep 2024 20:04:15 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[6.6.1]IndexOutOfBoundsException=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workorder/adapter/TakeOverListAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt index 887ea182e8..46b76449c1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt @@ -47,7 +47,7 @@ class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter Date: Thu, 26 Sep 2024 20:21:51 +0800 Subject: [PATCH 6/9] [6.6.1]java.lang.reflect.GenericSignatureFormatError catch --- .../core/MogoTrafficLightManager.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt index ccb92729d1..992862e93d 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt @@ -23,6 +23,7 @@ import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandl import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT import com.mogo.eagle.function.biz.v2x.trafficlight.network.TrafficLightNetWorkModel import com.zhidaoauto.map.data.road.RoadCross +import java.lang.Exception class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener, IMoGoMapRoadListener { @@ -70,15 +71,17 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener, } // CallerLogger.i("$M_BIZ$TAG", "红绿灯路口请求 : $stopLineDis") mLocation?.let { it -> - trafficLightNetWorkModel.requestRoadID( - it.latitude, it.longitude, it.heading, - { - mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD) - roadIDResult = it - }, - { - //CallerLogger.w(M_V2X + TAG, "request road id error : $it") - }) + try { + trafficLightNetWorkModel.requestRoadID( + it.latitude, it.longitude, it.heading, + { + mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD) + roadIDResult = it + }, + { + //CallerLogger.w(M_V2X + TAG, "request road id error : $it") + }) + }catch (_: Exception){} } }, { //stop loop search road id From bdfdacb3cecfd3cf8e69bda2aff27d5969227662 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 18 Sep 2024 11:26:01 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[6.6.2][=E8=A7=86=E8=A7=92=E5=8F=98?= =?UTF-8?q?=E6=8D=A2]=20=E4=BC=98=E5=8C=96=E8=A7=86=E8=A7=92=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/angle/scenes/CrossRoad.kt | 5 +++-- .../mogo/eagle/core/function/angle/scenes/Default.kt | 12 +++++++++--- .../eagle/core/function/angle/scenes/LongSight.kt | 10 ++++++++++ .../eagle/core/function/angle/scenes/RoadEvent.kt | 8 ++++++++ .../mogo/eagle/core/function/angle/scenes/Roma.kt | 10 ++++++++++ .../mogo/eagle/core/function/api/map/angle/Scenes.kt | 4 ++-- 6 files changed, 42 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt index e74451a697..af3b7f4fd7 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt @@ -24,7 +24,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON } override fun isCanTouch(): Boolean { - return false + return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) } override fun isCanSwitch(): Boolean { @@ -38,7 +38,8 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON override fun getScreenToOriginDis(): ScreenToOriginDis { if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { return NONE + } else { + return DOWN } - return DOWN } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt index 524e5fb898..cd5d3c443a 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.angle.scenes import android.util.Log import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode @@ -15,9 +16,7 @@ import java.util.concurrent.TimeUnit class Default(val delayTime: Long = 0, val unit: TimeUnit = TimeUnit.SECONDS, val forceClosePrev: Boolean = false): Scene(delayTime, unit) { override fun getVisualAngleMode(): VisualAngleMode { - Log.d("Default", "---- 1 --------------") - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - Log.d("Default", "---- 2 --------------") + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { return VisualAngleMode.MAP_STYLE_VR_ERHAI_B2 } return CallerMapUIServiceManager.getMapUIController()?.getVrAngleDefaultMode() ?: MODE_MEDIUM_SIGHT @@ -26,4 +25,11 @@ class Default(val delayTime: Long = 0, val unit: TimeUnit = TimeUnit.SECONDS, va override fun toString(): String { return "Default(delay=${getDelay()}, unit=$unit, angle=${getVisualAngleMode()}, priority=${getPriority()}, closePrevious=$forceClosePrev)" } + + override fun getScreenToOriginDis(): ScreenToOriginDis { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + return ScreenToOriginDis.NONE + } + return ScreenToOriginDis.DEFAULT + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt index 3189dcd1e7..14a8a81126 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt @@ -1,6 +1,9 @@ package com.mogo.eagle.core.function.angle.scenes +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT import java.util.concurrent.TimeUnit @@ -14,4 +17,11 @@ class LongSight(private val delayTime: Long = 0, private val unit: TimeUnit = Ti override fun toString(): String { return "LongSight(delayTime=${delayTime}, priority=${getPriority()}, displayThreshold: ${getDisplayThreshold()}, priority=${getPriority()})" } + + override fun getScreenToOriginDis(): ScreenToOriginDis { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + return ScreenToOriginDis.NONE + } + return ScreenToOriginDis.DEFAULT + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt index b2b97f9b79..2a91f20d6b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.angle.scenes import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode @@ -24,4 +25,11 @@ class RoadEvent(delayTime: Long, unit: TimeUnit): Scene(delayTime, unit) { override fun toString(): String { return "RoadEvent(mode: ${getVisualAngleMode()}, priority=${getPriority()}, displayThreshold: ${getDisplayThreshold()}," } + + override fun getScreenToOriginDis(): ScreenToOriginDis { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + return ScreenToOriginDis.NONE + } + return ScreenToOriginDis.DEFAULT + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt index 640d5bf2eb..67b8ede09e 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt @@ -1,6 +1,9 @@ package com.mogo.eagle.core.function.angle.scenes +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ROMA import java.util.concurrent.TimeUnit @@ -25,4 +28,11 @@ class Roma(val delayTime: Long = 2, val unit: TimeUnit = TimeUnit.SECONDS): Scen override fun getPriority(): Int { return 1 } + + override fun getScreenToOriginDis(): ScreenToOriginDis { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + return ScreenToOriginDis.NONE + } + return ScreenToOriginDis.DEFAULT + } } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt index 7398ca28a4..53e38d5dac 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.api.map.angle -import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DEFAULT +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.NONE import com.mogo.map.uicontroller.* import java.util.concurrent.TimeUnit @@ -58,6 +58,6 @@ abstract class Scene(private val delay: Long, private val unit: TimeUnit = TimeU * 3. [ScreenToOriginDis.UP]: 偏上 * 4. [ScreenToOriginDis.DOWN]: 偏下 */ - open fun getScreenToOriginDis(): ScreenToOriginDis = DEFAULT + open fun getScreenToOriginDis(): ScreenToOriginDis = NONE } From 52b72a8b53b60a39ce4c14e4a4dcc25e2b1ab2c8 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Sun, 29 Sep 2024 12:09:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[6.6.1]=20[Update]=201=E3=80=81=E5=9B=A0?= =?UTF-8?q?=E4=B8=BAjenkins=E7=9A=84=E7=89=88=E6=9C=AC=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=BC=E8=87=B4=E5=8E=9F=E6=9D=A5=E7=9A=84?= =?UTF-8?q?660=E7=89=88=E6=9C=AC=E5=8F=B7=E5=B7=B2=E7=BB=8F=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E661=E7=94=9F=E6=88=90=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E4=BA=86=EF=BC=8C=E6=89=80=E4=BB=A5=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=B76.6.2=E6=9D=A5?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c3272f49c..7a05cf35f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -149,7 +149,7 @@ MATRIX_VERSION=2.0.8 # 公交模式司机端版本号 -DRIVER_VERSION=6.6.1 +DRIVER_VERSION=6.6.2 # 公交模式乘客端端版本号 -PASSENGER_VERSION=5.6.1 +PASSENGER_VERSION=5.6.2 From ae96ca32309790fcb0d2d2879018e277e6dd4d63 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Sun, 29 Sep 2024 13:19:51 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[6.6.1]=20[Update]=201=E3=80=81=E5=9B=A0?= =?UTF-8?q?=E4=B8=BAjenkins=E7=9A=84=E7=89=88=E6=9C=AC=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=BC=E8=87=B4=E5=8E=9F=E6=9D=A5=E7=9A=84?= =?UTF-8?q?660=E7=89=88=E6=9C=AC=E5=8F=B7=E5=B7=B2=E7=BB=8F=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E661=E7=94=9F=E6=88=90=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E4=BA=86=EF=BC=8C=E6=89=80=E4=BB=A5=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=B76.6.3=E6=9D=A5?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a05cf35f6..a156c104ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -149,7 +149,7 @@ MATRIX_VERSION=2.0.8 # 公交模式司机端版本号 -DRIVER_VERSION=6.6.2 +DRIVER_VERSION=6.6.3 # 公交模式乘客端端版本号 -PASSENGER_VERSION=5.6.2 +PASSENGER_VERSION=5.6.3