[Taxi无人化] refactor: 司机DebugView增加 网络变化/自驾状态/域控连接/VRMode 的日志打印;
This commit is contained in:
@@ -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<TrajectoryListRespBean.Result> = 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<Long>, 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 }
|
||||
|
||||
Reference in New Issue
Block a user