From ce175275130dc2b893b9b98634920a4fdce2c472 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Thu, 7 Sep 2023 14:52:32 +0800 Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20refactor:?= =?UTF-8?q?=20=E5=8F=B8=E6=9C=BADebugView=E5=A2=9E=E5=8A=A0=20=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=8F=98=E5=8C=96/=E8=87=AA=E9=A9=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81/=E5=9F=9F=E6=8E=A7=E8=BF=9E=E6=8E=A5/VRMode=20?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/task/TaxiTaskModel.kt | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 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 9190377910..116254780a 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 @@ -103,10 +103,10 @@ object TaxiTaskModel { var loginService: LoginService? = null - //Model->Presenter：自动驾驶状态相关 + //Model->Presenter/ViewModel：自动驾驶状态相关 private var mADASStatusCallback: ITaxiADASStatusCallback? = null - //Model->Presenter/ViewModel：VR mode等 + //Model->Presenter/ViewModel：VR mode变化等 private var mControllerStatusCallback: ITaxiControllerStatusCallback? = null //Model->Presenter/ViewModel：订单变更 @@ -122,13 +122,13 @@ object TaxiTaskModel { //当前任务和订单 private var mCurrentTaskWithOrder: QueryCurrentTaskRespBean.Result? = null - //开始车辆到标定站点的特殊任务 + //开始时车辆人工驾驶到标定站点的特殊任务 private var mDriveToNearestStationTask: StartServiceRespBean.Result? = null //运营单(接驾任务和送驾任务的轨迹集合) private var mTaskTrajectoryList: MutableList = mutableListOf() - //当前在跑的任务的轨迹信息 + //当前任务的轨迹信息 private var mCurrentTaskTrajectory: TrajectoryListRespBean.Result? = null @Volatile @@ -247,7 +247,9 @@ object TaxiTaskModel { object : IMoGoAutopilotStatusListener { override fun onAutopilotDockerInfo(dockerVersion: String) {} override fun onAutopilotRouteLineId(lineId: Long) {} - override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) {} + override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) { + DebugView.printInfoMsg("[域控连接状态变化] status=$status, reason=${if (TextUtils.isEmpty(reason)) "" else reason}") + } override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) { TaxiTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo) } @@ -255,6 +257,7 @@ object TaxiTaskModel { override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {} override fun onAutopilotStatusResponse(state: Int) { if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { + DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_RUNNING，meaning=自动驾驶中") mADASStatusCallback?.onAutopilotRunning() if ((QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder))) { TaxiAnalyticsManager.getInstance().triggerStartAutopilotEvent( @@ -277,6 +280,7 @@ object TaxiTaskModel { } } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { + DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_ENABLE，meaning=可自动驾驶，人工干预状态") if ((FunctionBuildConfig.isDemoMode && checkCurrentTaskCondition() && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd( @@ -291,6 +295,7 @@ object TaxiTaskModel { } mADASStatusCallback?.onAutopilotEnable() } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { + DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_DISABLE，meaning=不可自动驾驶") if ((FunctionBuildConfig.isDemoMode && checkCurrentTaskCondition() && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd( @@ -307,6 +312,7 @@ object TaxiTaskModel { mADASStatusCallback!!.onAutopilotDisable() } } else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING) { + DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_PARALLEL_DRIVING，meaning=平行驾驶中") if (FunctionBuildConfig.isDemoMode) { if ((checkCurrentTaskCondition() && (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd( @@ -360,6 +366,7 @@ object TaxiTaskModel { // VR mode变更回调 if (StatusDescriptor.VR_MODE == descriptor) { mControllerStatusCallback?.onVRModeChanged(isTrue) + DebugView.printInfoMsg("[VRMode变化] isVRMode=$isTrue") } } @@ -461,6 +468,9 @@ object TaxiTaskModel { if ((ConnectivityManager.CONNECTIVITY_ACTION == intentStr)) { if (NetworkUtils.isConnected(mContext)) { loginService?.queryLoginStatusByNet() + DebugView.printInfoMsg("[网络状态变化] isConnected=true") + } else { + DebugView.printErrorMsg("[网络状态变化] isConnected=false") } } } @@ -656,6 +666,7 @@ object TaxiTaskModel { private fun queryCurrentTaskOnce() { if (!LoginStatusManager.isLogin()) { d(TAG, "queryCurrentTaskOnce: 当前未登陆，跳过本次查询") + DebugView.printInfoMsg("[查询TaskWithOrder信息] 当前未登陆，跳过本次查询") return } @@ -686,7 +697,8 @@ object TaxiTaskModel { //本地根据订单 orderNo 去查询下(乘客取消订单) if (mCurrentTaskWithOrder != null && mCurrentTaskWithOrder?.order != null - && result != null && result.order == null + && result != null + && result.order == null ) { d( TAG, @@ -719,7 +731,6 @@ object TaxiTaskModel { // 任务为空 if (result.endSite == null && result.order == null) { d(TAG, "queryCurrentTaskOnce: 任务为空") -// mCurrentTaskWithOrder = null if (mDriveToNearestStationTask == null) { mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value @@ -929,12 +940,6 @@ object TaxiTaskModel { "isCarServingStatus = ${TaxiCarServingStatusManager.isCarServingStatus()}" ) DebugView.printInfoMsg("[PrepareNextTask] 请求success") - if (data?.data == null) return - //去下载轨迹, 下发给工控机下载 -// queryTaskTrajectoryByLineIds( -// Array(1) { data.data!!.lineId }, -// data.data!!.lineId -// ) } override fun onFail(code: Int, msg: String?) { @@ -981,7 +986,7 @@ object TaxiTaskModel { * 查询当前任务的轨迹 */ fun queryTaskTrajectoryByLineIds(planningLineIds: Array, currentTaskLineId: Long) { - DebugView.printInfoMsg("[查询轨迹信息] 准备发送请求") + DebugView.printInfoMsg("[查询轨迹信息] 准备发送请求，currentTaskLineId=$currentTaskLineId, planningLineIds=$planningLineIds") TaxiTaskWithOrderServiceManager.queryTrajectoryByLindIds( mContext, planningLineIds, @@ -991,7 +996,7 @@ object TaxiTaskModel { TAG, "queryTaskTrajectoryByLineIds onSuccess: ${GsonUtil.jsonFromObject(data?.data)}" ) - DebugView.printInfoMsg("[查询轨迹信息] 请求success") + DebugView.printInfoMsg("[查询轨迹信息] 请求success, currentTaskLineId=$currentTaskLineId, planningLineIds=$planningLineIds") data?.data?.also { mTaskTrajectoryList.addAll(it) mCurrentTaskTrajectory = it.first { currentTaskLineId == it.lineId }