diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 1b1188a7c4..d447f7f67d 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -371,14 +371,9 @@ public class OrderModel { } private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { - @Override - public void brakeStatusChanged(boolean isBrakeAvailable) { - - } @Override public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { - OchAutopilotAnalytics.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage, System.currentTimeMillis()); if (mPassengerCallback != null && !FunctionBuildConfig.isDemoMode){ CallerLogger.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); mPassengerCallback.onStartAdasFailure(); diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 1d2890b276..01ddc11818 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -307,8 +307,6 @@ class DriverM1Model { startFailedCode: String, startFailedMessage: String ) { - OchAutopilotAnalytics - .triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage,System.currentTimeMillis()) if (mControllerStatusCallback != null) { d(SceneConstant.M_CHARTER_D + TAG, @@ -316,9 +314,6 @@ class DriverM1Model { mControllerStatusCallback?.onStartAdasFailure() } } - - override fun brakeStatusChanged(isBrakeAvailable: Boolean) { - } } //监听网络变化，避免启动机器时无网导致无法更新订单信息 diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt index aa81a4e6e5..4f70346da6 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/callback/OchAdasStartFailureCallback.kt @@ -7,6 +7,4 @@ package com.mogo.och.common.module.callback interface OchAdasStartFailureCallback { fun onStartAutopilotFailure(startFailedCode : String, startFailedMessage : String) - fun brakeStatusChanged(isBrakeAvailable: Boolean) - } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java index 0335b46428..126cfe1701 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java @@ -10,9 +10,12 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerParallelDrivingActionsListenerManager; +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; +import com.mogo.och.common.module.manager.autopilot.line.LineManager; import com.zhjt.mogo.adas.data.bean.AutopilotStatistics; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; @@ -123,7 +126,7 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo " onAutopilotAbility =" + unableAutopilotReasons.toString()); if (unableAutopilotReasons.toString().contains(UnableLaunchReason.SourceType.CHASSIS.name()) && unableAutopilotReasons.toString().contains(UnableLaunchReason.UnableType.CHASSIS_BRAKE.name())) { - failureCallback.brakeStatusChanged(isAutopilotAbility); + //failureCallback.brakeStatusChanged(isAutopilotAbility); } } @@ -136,6 +139,9 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo startFailedCode = statistics.failedMessage.getCode(); startFailedMessage = statistics.failedMessage.getMsg(); failureCallback.onStartAutopilotFailure(startFailedCode, startFailedMessage); + if(!AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)){ + LineManager.invokeStartAutopilotFailure(startFailedCode, startFailedMessage); + } Logger.d(TAG, String.format("statistics-startFailedCode = s%; startFailedMessage = s%", startFailedCode, startFailedMessage)); } 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..d985b04ab3 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 @@ -95,6 +95,7 @@ object OchAutoPilotManager : IMoGoReceiveReceivedAckListener, IMoGoFsm2024Listen @JvmStatic fun startAutoPilot(controlParameters: AutopilotControlParameters?): Long { val sessionId = CallerAutoPilotControlManager.startAutoPilot(controlParameters) + LineManager.isReStartAutopilot = false globalSessionId.set(sessionId) fsmBackSessionId.set(-1L) OchAutopilotAnalytics.triggerStartAutopilotParameters(controlParameters, sessionId) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt index a66f117e19..441363f1de 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.R import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation +import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.utils.CallerBase import com.zhjt.mogo.adas.data.AdasConstants @@ -25,7 +26,15 @@ object OchAutoPilotStatusListenerManager : CallerBase + private var canStartAutopilot:Boolean? by Delegates.observable(null) { _, oldValue, newValue -> + if (oldValue != newValue) { + M_LISTENERS.forEach { + val listener = it.value + listener.canStartAutopilot(newValue?:false) + } + } + } + private var _autopilotState: Int by Delegates.observable(0) { _, oldValue, newValue -> if (oldValue != newValue) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { if(oldValue==IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ @@ -38,6 +47,9 @@ object OchAutoPilotStatusListenerManager : CallerBase { + LineManager.triggerStartServiceEvent(true,1) + } + } } } \ 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..53f7f1ab18 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,6 +11,7 @@ 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.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -58,7 +59,7 @@ object OchAutopilotAnalytics { /** - * 正式把参数传给底层 + * 正式启动自驾把参数传给底层 */ fun triggerStartAutopilotParameters(controlParameters: AutopilotControlParameters?, sessionId: Long){ val params = HashMap() @@ -115,6 +116,7 @@ object OchAutopilotAnalytics { private val timeOutRunnable = Runnable { // 15s内未开启，上报失败埋点 triggerStartAutopilotFailureEvent("", "15s后app等待超时", System.currentTimeMillis()) + LineManager.invokeStartAutopilotTimeOut() } /** diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java index 2bdb1e5b9a..82b045b67e 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/ILineCallback.java @@ -6,4 +6,10 @@ public interface ILineCallback { default void drawLineSuccess(){} default void drawLineFail(){} + + default void startAutopilotSuccess(){} + + default void startAutopilotTimeOut(){} + + default void startAutopilotFailure(String startFailedCode,String startFailedMessage){} } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt index 2d36a77090..6073d7b725 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt @@ -1,18 +1,30 @@ package com.mogo.och.common.module.manager.autopilot.line +import android.text.TextUtils +import com.elegant.network.utils.GsonUtil import com.mogo.commons.env.ProjectUtils import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLonLat +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.map.CallerMapGlobalTrajectoryDrawManager import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager 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.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils 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.OchAutoPilotManager +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.startAutoPilot +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.CallerBase +import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.ContraiInfo import com.mogo.och.data.bean.LineInfo @@ -45,10 +57,15 @@ object LineManager : CallerBase() { */ var endStation: BusStationBean? = null + var isReStartAutopilot = true + /** * 设置站点信息 */ fun setStartAndEndStation(startStation: BusStationBean?, endStation: BusStationBean?) { + if(this.startStation!=startStation||this.endStation!=endStation){ + isReStartAutopilot = true + } this.startStation = startStation this.endStation = endStation if(startStation==null||endStation==null){ @@ -167,10 +184,19 @@ object LineManager : CallerBase() { } d(M_BUS + TAG, "AutopilotControlParameters is update.") CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(parameters) + val startStationLocation = MogoLocation() + startStationLocation.latitude = start.gcjLat + startStationLocation.longitude = start.gcjLon + + val endStationLocation = MogoLocation() + endStationLocation.latitude = end.gcjLat + endStationLocation.longitude = end.gcjLon + TrajectoryAndDistanceManager.setStationPoint(startStationLocation, endStationLocation, lineInfo.lineId) } } private fun clearAutopilotControlParameters(){ CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null) + TrajectoryAndDistanceManager.setStationPoint(null, null, null) } fun hasDrawnGlobalTrajectory(): Boolean { @@ -239,5 +265,116 @@ object LineManager : CallerBase() { return parameters } + // 启动自动驾驶 + fun startAutopilot() { + + /** + * 存在Session + */ + if (!OchAutoPilotManager.canStartAutopilotBySessionId()) { + return + } + + OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis()) + + //1、判断轨迹url是否可用 + if(contraiInfo==null){ + ToastUtils.showLong("无发布轨迹, 请发布后重试") + return + }else{ + + if (FunctionBuildConfig.isPassStartAutopilotCommand + && TextUtils.isEmpty(contraiInfo!!.csvFileUrl) + && TextUtils.isEmpty(contraiInfo!!.csvFileMd5) + ) { + ToastUtils.showLong("无发布轨迹, 请发布后重试") + e( + TAG, "isPassStartAutopilotCommand = " + + FunctionBuildConfig.isPassStartAutopilotCommand + + "busRoutesResult.csvFileUrl = " + LineManager.contraiInfo!!.csvFileUrl + ) + return + } + } + + //2、6个条件判断 + if (!CallerAutoPilotControlManager.isCanStartAutopilot(true, 0)) { + return + } + + // 3、距离轨迹15m计算 + val resion = OchAutoPilotManager.canStartAutoPilotByDistance(contraiInfo!!.lineId) + if (!StringUtils.isEmpty(resion)) { + ToastUtils.showShort(resion) + VoiceNotice.showNotice(resion) + return + } + //4、ssm 给出数据 + if (!OchAutoPilotManager.canStartAutoPilotSSM()) { + triggerUnableStartAPReasonEvent() + return + } + + triggerStartServiceEvent(false,0) + + val parameters = initAutopilotControlParameters() + if (null == parameters) { + e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty.") + return + } + + val sessionId = startAutoPilot(parameters) + OchAutopilotAnalytics.triggerUpdateStartAutoPilotSessionId(sessionId) + + d( + M_BUS + TAG, + "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + + "isRestart = " + LineManager.isReStartAutopilot + ) + + M_LISTENERS.forEach { + it.value.startAutopilotSuccess() + } + } + + private fun triggerUnableStartAPReasonEvent() { + getStationsWithLine { start, end, line -> + OchAutopilotAnalytics.triggerUnableStartAPReasonEvent( + start.name, end.name,line.lineId.toString() , "", + OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason + ) + } + } + + fun triggerStartServiceEvent(send: Boolean,source:Int) { + getStations { start, end -> + OchAutopilotAnalytics.triggerStartAutopilotEvent( + isReStartAutopilot, + send, + start.name, + end.name, + lineInfos!!.lineId.toInt(), + "", + System.currentTimeMillis(), + source + ) + } + } + + @JvmStatic + fun invokeStartAutopilotTimeOut(){ + M_LISTENERS.forEach { + it.value.startAutopilotTimeOut() + } + } + + @JvmStatic + fun invokeStartAutopilotFailure(startFailedCode: String, startFailedMessage: String) { + OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas(startFailedCode,startFailedMessage,System.currentTimeMillis()) + M_LISTENERS.forEach { + it.value.startAutopilotFailure(startFailedCode,startFailedMessage) + } + } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt new file mode 100644 index 0000000000..2e217b2860 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt @@ -0,0 +1,210 @@ +package com.mogo.och.common.module.wigets.autopilot + +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.animation.LinearInterpolator +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.R +import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.common.module.utils.BigFrameAnimatorContainer +import com.mogo.och.common.module.utils.ResourcesUtils +import kotlinx.android.synthetic.main.common_autopilot_view.view.aciv_autopilot_running_ani +import kotlinx.android.synthetic.main.common_autopilot_view.view.aciv_autopilot_state +import kotlinx.android.synthetic.main.common_autopilot_view.view.actv_autopilot_head +import kotlinx.android.synthetic.main.common_autopilot_view.view.actv_autopilot_state +import kotlinx.android.synthetic.main.common_autopilot_view.view.actv_pxjs_state + +class AutopilotState @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), IOchAutopilotStatusListener, + AutopilotStateModel.AutopilotStateCallback { + + private val TAG = "AutopilotState" + + private var viewModel:AutopilotStateModel?=null + + private var autopilotStateAnimator: BigFrameAnimatorContainer?=null + + private lateinit var autopilotLoadingAnimator: ObjectAnimator + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.common_autopilot_view, this, true) + autopilotStateAnimator = BigFrameAnimatorContainer(R.array.in_auto, 31, aciv_autopilot_running_ani) + autopilotLoadingAnimator = ObjectAnimator.ofFloat(aciv_autopilot_state, "rotation", 0f, 360f); + autopilotLoadingAnimator.interpolator = LinearInterpolator() + autopilotLoadingAnimator.repeatCount = -1 //无限循环 + autopilotLoadingAnimator.duration = 1000 //无限循环 + onClick { + startAutopilot() + } + } + + fun startAutopilot(){ + viewModel?.startAutopilot() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(AutopilotStateModel::class.java) + } + viewModel?.setViewCallback(this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + } + + + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun startAutopilotAnimation() { + CallerLogger.d(TAG,"播放启动自驾动画") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_enable) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_starting) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = false + + autopilotLoadingAnimator.start() + } + + override fun stopAutopilotAnimation() { + CallerLogger.d(TAG,"结束启动自驾动画") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_enable) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_starting) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = false + + autopilotLoadingAnimator.cancel() + } + + override fun inAutopilot() { + CallerLogger.d(TAG,"展示自驾中UI") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_running) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_running) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = false + + aciv_autopilot_running_ani.visibility = VISIBLE + autopilotStateAnimator?.start() + autopilotLoadingAnimator.cancel() + } + + override fun autopilotDisable() { + CallerLogger.d(TAG,"不可启动自驾") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_unenable) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_start) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + + AutopilotState@this.isEnabled = false + + aciv_autopilot_running_ani.visibility = GONE + autopilotStateAnimator?.stop() + autopilotLoadingAnimator.cancel() + } + + override fun canStartAutopilot() { + CallerLogger.d(TAG,"可以启动自驾") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_enable) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_start) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = true + + aciv_autopilot_running_ani.visibility = GONE + autopilotStateAnimator?.stop() + autopilotLoadingAnimator.cancel() + } + + override fun inRemoteDriver() { + CallerLogger.d(TAG,"展示平行驾驶中UI") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_running) + + actv_pxjs_state.visibility = VISIBLE + actv_autopilot_head.visibility = GONE + actv_autopilot_state.visibility = GONE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_start) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = false + + aciv_autopilot_running_ani.visibility = VISIBLE + autopilotStateAnimator?.start() + autopilotLoadingAnimator.cancel() + } + + override fun startAutopilotSuccess() { + + } + + override fun startAutopilotFail() { + CallerLogger.d(TAG,"启动自动驾驶失败") + aciv_autopilot_state.setImageResource(R.drawable.common_autopilot_fail) + + actv_pxjs_state.visibility = GONE + actv_autopilot_head.visibility = VISIBLE + actv_autopilot_state.visibility = VISIBLE + + actv_autopilot_head.setTextColor(ResourcesUtils.getColor(R.color.common_B3FFFFFF)) + actv_autopilot_state.setTextColor(ResourcesUtils.getColor(R.color.common_FF4E41)) + actv_autopilot_state.text = ResourcesUtils.getString(R.string.common_autopilot_fail) + actv_pxjs_state.setTextColor(ResourcesUtils.getColor(R.color.common_19FFCB)) + AutopilotState@this.isEnabled = false + + aciv_autopilot_running_ani.visibility = VISIBLE + autopilotStateAnimator?.stop() + autopilotLoadingAnimator.cancel() + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt new file mode 100644 index 0000000000..ab71834b62 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt @@ -0,0 +1,154 @@ +package com.mogo.och.common.module.wigets.autopilot + +import android.text.TextUtils +import androidx.lifecycle.ViewModel +import com.elegant.network.utils.GsonUtil +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +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.scene.SceneConstant.Companion.M_BUS +import com.mogo.eagle.core.utilcode.util.StringUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.callback.OchAdasStartFailureCallback +import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager +import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilotByDistance +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilotSSM +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.startAutoPilot +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.common.module.manager.autopilot.line.ILineCallback +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.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.voice.VoiceNotice.showNotice +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallback{ + + private val TAG = AutopilotStateModel::class.java.simpleName + + private var viewCallback:AutopilotStateCallback?=null + + private val isPalyStartAni = AtomicBoolean(false) + + + override fun onCleared() { + this.viewCallback = null + OchAutoPilotStatusListenerManager.removeListener(TAG) + LineManager.removeListener(TAG) + } + + fun setViewCallback(viewCallback:AutopilotStateCallback){ + this.viewCallback = viewCallback + OchAutoPilotStatusListenerManager.addListener(TAG,this) + LineManager.addListener(TAG,this) + } + + override fun onAutopilotStatusResponse(state: Int) { + OchChainLogManager.writeChainLog("自驾信息","自驾状态变化:${state}") + autopilotStateChange() + } + + override fun canStartAutopilot(canStart: Boolean) { + OchChainLogManager.writeChainLog("自驾信息","能否启动自驾:${canStart}") + autopilotStateChange() + } + + private fun autopilotStateChange(){ + BizLoopManager.runInMainThread{ + OchChainLogManager.writeChainLog("自驾信息","自驾状态:${OchAutoPilotStatusListenerManager.autopilotState} 能否启动自驾：${CallerAutoPilotControlManager.isCanStartAutopilot(false)}") + when (OchAutoPilotStatusListenerManager.autopilotState) { + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE-> {// 不可用 不可启动自驾 + + this.viewCallback?.autopilotDisable() + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> { + if (!CallerAutoPilotControlManager.isCanStartAutopilot(false)) {// 不可用 + this.viewCallback?.autopilotDisable() + } else {// 部分可用 + this.viewCallback?.canStartAutopilot() + } + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING-> {// 自驾中 + this.viewCallback?.stopAutopilotAnimation() + this.viewCallback?.inAutopilot() + } + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING-> {// 平行驾驶中 + this.viewCallback?.stopAutopilotAnimation() + this.viewCallback?.inRemoteDriver() + } + } + } + } + + fun startAutopilot() { + OchChainLogManager.writeChainLog("自驾信息","启动自驾") + LineManager.startAutopilot() + } + + override fun startAutopilotSuccess() { + OchChainLogManager.writeChainLog("自驾信息","启动自驾成功") + BizLoopManager.runInMainThread { + this.viewCallback?.startAutopilotAnimation() + isPalyStartAni.set(true) + } + } + + override fun startAutopilotTimeOut() { + OchChainLogManager.writeChainLog("自驾信息","启动自驾超时失败") + BizLoopManager.runInMainThread{ + this.viewCallback?.stopAutopilotAnimation() + this.viewCallback?.startAutopilotFail() + this.isPalyStartAni.set(false) + UiThreadHandler.postDelayed({ + autopilotStateChange() + },1000,UiThreadHandler.MODE.QUEUE) + } + } + + override fun startAutopilotFailure(startFailedCode: String?, startFailedMessage: String?) { + OchChainLogManager.writeChainLog("自驾信息","底盘强制失败原因：${startFailedCode}_${startFailedMessage}") + BizLoopManager.runInMainThread{ + this.viewCallback?.stopAutopilotAnimation() + this.viewCallback?.startAutopilotFail() + this.isPalyStartAni.set(false) + UiThreadHandler.postDelayed({ + autopilotStateChange() + },1000,UiThreadHandler.MODE.QUEUE) + } + } + + interface AutopilotStateCallback{ + //开始动画 + fun startAutopilotAnimation() + //结束动画 + fun stopAutopilotAnimation() + + // 进入自动驾驶 + fun inAutopilot() + // 自动驾驶不可用 + fun autopilotDisable() + // 可用启动自驾 + fun canStartAutopilot() + // 进入平行驾驶 + fun inRemoteDriver() + + // 启动自驾成功 + fun startAutopilotSuccess() + // 启动自驾失败 + fun startAutopilotFail() + } +} + diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_bg.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_bg.png new file mode 100755 index 0000000000..2cd237b10e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_bg.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_enable.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_enable.png new file mode 100755 index 0000000000..1d04f14af5 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_enable.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_fail.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_fail.png new file mode 100755 index 0000000000..40167c45bf Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_fail.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_running.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_running.png new file mode 100755 index 0000000000..05bc754234 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_running.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unenable.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unenable.png new file mode 100755 index 0000000000..109af65ef4 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/common_autopilot_unenable.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_001.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_001.png new file mode 100755 index 0000000000..98889fbce4 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_001.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_002.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_002.png new file mode 100755 index 0000000000..609ea6a202 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_002.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_003.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_003.png new file mode 100755 index 0000000000..b0716411fc Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_003.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_004.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_004.png new file mode 100755 index 0000000000..4a321163d8 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_004.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_005.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_005.png new file mode 100755 index 0000000000..5782435935 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_005.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_006.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_006.png new file mode 100755 index 0000000000..8a55b8230b Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_006.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_007.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_007.png new file mode 100755 index 0000000000..a478d82fa5 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_007.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_008.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_008.png new file mode 100755 index 0000000000..b96d386a73 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_008.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_009.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_009.png new file mode 100755 index 0000000000..07b2b5e38c Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_009.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_010.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_010.png new file mode 100755 index 0000000000..9f8da63da6 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_010.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_011.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_011.png new file mode 100755 index 0000000000..ddd08c16b1 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_011.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_012.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_012.png new file mode 100755 index 0000000000..71639236f7 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_012.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_013.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_013.png new file mode 100755 index 0000000000..141e159da7 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_013.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_014.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_014.png new file mode 100755 index 0000000000..13f3f3b831 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_014.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_015.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_015.png new file mode 100755 index 0000000000..784df02e02 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_015.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_016.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_016.png new file mode 100755 index 0000000000..3d3d558583 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_016.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_017.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_017.png new file mode 100755 index 0000000000..a6299bd0f4 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_017.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_018.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_018.png new file mode 100755 index 0000000000..0ffc421d2c Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_018.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_019.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_019.png new file mode 100755 index 0000000000..a8c76cac50 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_019.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_020.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_020.png new file mode 100755 index 0000000000..5f80f4b619 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_020.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_021.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_021.png new file mode 100755 index 0000000000..b3e43a40dc Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_021.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_022.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_022.png new file mode 100755 index 0000000000..a47e7fd97c Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_022.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_023.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_023.png new file mode 100755 index 0000000000..78dc63e9b2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_023.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_024.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_024.png new file mode 100755 index 0000000000..3308998fc2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_024.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_025.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_025.png new file mode 100755 index 0000000000..c95b63ba1e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_025.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_026.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_026.png new file mode 100755 index 0000000000..6387996f9b Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_026.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_027.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_027.png new file mode 100755 index 0000000000..957017860e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_027.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_028.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_028.png new file mode 100755 index 0000000000..a194af65e2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_028.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_029.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_029.png new file mode 100755 index 0000000000..5dab79f807 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_029.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_030.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_030.png new file mode 100755 index 0000000000..73734994aa Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_030.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_031.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_031.png new file mode 100755 index 0000000000..eaff659075 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_031.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_032.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_032.png new file mode 100755 index 0000000000..7dfbe6aff8 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_032.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_033.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_033.png new file mode 100755 index 0000000000..a7accda5e9 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_033.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_034.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_034.png new file mode 100755 index 0000000000..97362fee60 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_034.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_035.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_035.png new file mode 100755 index 0000000000..4c4b16bbb2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_035.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_036.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_036.png new file mode 100755 index 0000000000..fb761a165d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_036.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_037.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_037.png new file mode 100755 index 0000000000..b3359ee6b7 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_037.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_038.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_038.png new file mode 100755 index 0000000000..753560411d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_038.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_039.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_039.png new file mode 100755 index 0000000000..c00017ac44 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_039.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_040.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_040.png new file mode 100755 index 0000000000..aef29d8ba3 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_040.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_041.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_041.png new file mode 100755 index 0000000000..97a5fb0738 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_041.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_042.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_042.png new file mode 100755 index 0000000000..0c067b978d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_042.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_043.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_043.png new file mode 100755 index 0000000000..d7d0da6cdb Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_043.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_044.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_044.png new file mode 100755 index 0000000000..cfe1d201e2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_044.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_045.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_045.png new file mode 100755 index 0000000000..e511a058b8 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_045.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_046.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_046.png new file mode 100755 index 0000000000..9261d7a672 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_046.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_047.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_047.png new file mode 100755 index 0000000000..c75fc55eed Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_047.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_048.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_048.png new file mode 100755 index 0000000000..08d74ee551 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_048.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_049.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_049.png new file mode 100755 index 0000000000..6287203432 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_049.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_050.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_050.png new file mode 100755 index 0000000000..266e03d870 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_050.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_051.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_051.png new file mode 100755 index 0000000000..13a7951895 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_051.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_052.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_052.png new file mode 100755 index 0000000000..11dcb5e719 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_052.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_053.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_053.png new file mode 100755 index 0000000000..b99cb8d805 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_053.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_054.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_054.png new file mode 100755 index 0000000000..875aeaf7a0 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_054.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_055.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_055.png new file mode 100755 index 0000000000..8ff2693a42 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_055.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_056.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_056.png new file mode 100755 index 0000000000..5856918fae Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_056.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_057.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_057.png new file mode 100755 index 0000000000..0351471844 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_057.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_058.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_058.png new file mode 100755 index 0000000000..4e6ebbdaff Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_058.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_059.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_059.png new file mode 100755 index 0000000000..b34287ee76 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_059.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_060.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_060.png new file mode 100755 index 0000000000..d3dbd98531 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_060.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_061.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_061.png new file mode 100755 index 0000000000..257ca8c9ca Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_061.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_062.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_062.png new file mode 100755 index 0000000000..69238ad4d3 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_062.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_063.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_063.png new file mode 100755 index 0000000000..7e6fe3d7f1 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_063.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_064.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_064.png new file mode 100755 index 0000000000..7a934abdb6 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_064.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_065.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_065.png new file mode 100755 index 0000000000..8e7830a3fc Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_065.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_066.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_066.png new file mode 100755 index 0000000000..8d13ca0a98 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_066.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_067.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_067.png new file mode 100755 index 0000000000..0411724dd2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_067.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_068.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_068.png new file mode 100755 index 0000000000..3055891d08 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_068.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_069.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_069.png new file mode 100755 index 0000000000..33245f4ede Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_069.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_070.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_070.png new file mode 100755 index 0000000000..5bea580f70 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_070.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_071.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_071.png new file mode 100755 index 0000000000..0fcda60c8e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_071.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_072.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_072.png new file mode 100755 index 0000000000..735156c3c3 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_072.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_073.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_073.png new file mode 100755 index 0000000000..8a237488b6 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_073.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_074.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_074.png new file mode 100755 index 0000000000..79c9bc1d2e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_074.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_075.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_075.png new file mode 100755 index 0000000000..cf808b1baa Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_075.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_076.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_076.png new file mode 100755 index 0000000000..46a5141ef1 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_076.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_077.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_077.png new file mode 100755 index 0000000000..c08f3229ef Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_077.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_078.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_078.png new file mode 100755 index 0000000000..6c49601c62 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_078.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_079.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_079.png new file mode 100755 index 0000000000..f88d9b06c8 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_079.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_080.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_080.png new file mode 100755 index 0000000000..de3f30b19d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_080.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_081.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_081.png new file mode 100755 index 0000000000..0c99b96843 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_081.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_082.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_082.png new file mode 100755 index 0000000000..3337c9ceb5 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_082.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_083.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_083.png new file mode 100755 index 0000000000..7424a423e2 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_083.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_084.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_084.png new file mode 100755 index 0000000000..54f847b6a7 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_084.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_085.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_085.png new file mode 100755 index 0000000000..f60f523c33 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_085.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_086.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_086.png new file mode 100755 index 0000000000..9a634f4dec Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_086.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_087.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_087.png new file mode 100755 index 0000000000..d8b16c95c1 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_087.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_088.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_088.png new file mode 100755 index 0000000000..5a47769b17 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_088.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_089.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_089.png new file mode 100755 index 0000000000..aa31bd15d9 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_089.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_090.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_090.png new file mode 100755 index 0000000000..3f1e08a482 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_090.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_091.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_091.png new file mode 100755 index 0000000000..f58aa33290 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_091.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_092.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_092.png new file mode 100755 index 0000000000..d07d14321f Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_092.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_093.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_093.png new file mode 100755 index 0000000000..495375b9a7 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_093.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_094.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_094.png new file mode 100755 index 0000000000..e024c55b00 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_094.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_095.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_095.png new file mode 100755 index 0000000000..f5db2b26b8 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_095.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_096.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_096.png new file mode 100755 index 0000000000..c990a6d53d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_096.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_097.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_097.png new file mode 100755 index 0000000000..f8adefaf7d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_097.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_098.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_098.png new file mode 100755 index 0000000000..87aec9f252 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_098.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_099.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_099.png new file mode 100755 index 0000000000..d2d160fb6f Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_099.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_100.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_100.png new file mode 100755 index 0000000000..0b97dbb46f Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_100.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_101.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_101.png new file mode 100755 index 0000000000..cd80ce079a Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_101.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_102.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_102.png new file mode 100755 index 0000000000..62dfbb6c2d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_102.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_103.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_103.png new file mode 100755 index 0000000000..a5a4c62f69 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_103.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_104.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_104.png new file mode 100755 index 0000000000..77e2d723a0 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_104.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_105.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_105.png new file mode 100755 index 0000000000..bf77d30c06 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_105.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_106.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_106.png new file mode 100755 index 0000000000..69df2eff23 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_106.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_107.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_107.png new file mode 100755 index 0000000000..b2c5dd4beb Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_107.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_108.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_108.png new file mode 100755 index 0000000000..abf22e29ca Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_108.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_109.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_109.png new file mode 100755 index 0000000000..240ceec5f6 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_109.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_110.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_110.png new file mode 100755 index 0000000000..f997823b63 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_110.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_111.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_111.png new file mode 100755 index 0000000000..b5ae89f35b Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_111.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_112.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_112.png new file mode 100755 index 0000000000..f686a447ef Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_112.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_113.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_113.png new file mode 100755 index 0000000000..25cd1b44bf Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_113.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_114.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_114.png new file mode 100755 index 0000000000..790e8f6ab6 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_114.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_115.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_115.png new file mode 100755 index 0000000000..4b61789994 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_115.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_116.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_116.png new file mode 100755 index 0000000000..b3fe73b62d Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_116.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_117.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_117.png new file mode 100755 index 0000000000..aaf1773e9e Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_117.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_118.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_118.png new file mode 100755 index 0000000000..39a052d274 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_118.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_119.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_119.png new file mode 100755 index 0000000000..17a8c6c123 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_119.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_120.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_120.png new file mode 100755 index 0000000000..2af3384016 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_120.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_121.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_121.png new file mode 100755 index 0000000000..7496bb6e86 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_121.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_122.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_122.png new file mode 100755 index 0000000000..3b4268d6b3 Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_122.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_123.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_123.png new file mode 100755 index 0000000000..6468ac4cdc Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_123.png differ diff --git a/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_124.png b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_124.png new file mode 100755 index 0000000000..2be801cffe Binary files /dev/null and b/OCH/common/common/src/main/res/autopilot/drawable-nodpi/start_auto_124.png differ diff --git a/OCH/common/common/src/main/res/autopilot/values/arrays.xml b/OCH/common/common/src/main/res/autopilot/values/arrays.xml new file mode 100644 index 0000000000..6991b473c6 --- /dev/null +++ b/OCH/common/common/src/main/res/autopilot/values/arrays.xml @@ -0,0 +1,146 @@ + + + + + @drawable/start_auto_001 + @drawable/start_auto_002 + @drawable/start_auto_003 + @drawable/start_auto_004 + @drawable/start_auto_005 + @drawable/start_auto_006 + @drawable/start_auto_007 + @drawable/start_auto_008 + @drawable/start_auto_009 + + @drawable/start_auto_010 + @drawable/start_auto_011 + @drawable/start_auto_012 + @drawable/start_auto_013 + @drawable/start_auto_014 + @drawable/start_auto_015 + @drawable/start_auto_016 + @drawable/start_auto_017 + @drawable/start_auto_018 + @drawable/start_auto_019 + + @drawable/start_auto_020 + @drawable/start_auto_021 + @drawable/start_auto_022 + @drawable/start_auto_023 + @drawable/start_auto_024 + @drawable/start_auto_025 + @drawable/start_auto_026 + @drawable/start_auto_027 + @drawable/start_auto_028 + @drawable/start_auto_029 + + @drawable/start_auto_030 + @drawable/start_auto_031 + @drawable/start_auto_032 + @drawable/start_auto_033 + @drawable/start_auto_034 + @drawable/start_auto_035 + @drawable/start_auto_036 + @drawable/start_auto_037 + @drawable/start_auto_038 + @drawable/start_auto_039 + + @drawable/start_auto_040 + @drawable/start_auto_041 + @drawable/start_auto_042 + @drawable/start_auto_043 + @drawable/start_auto_044 + @drawable/start_auto_045 + @drawable/start_auto_046 + @drawable/start_auto_047 + @drawable/start_auto_048 + @drawable/start_auto_049 + + + @drawable/start_auto_050 + @drawable/start_auto_051 + @drawable/start_auto_052 + @drawable/start_auto_053 + @drawable/start_auto_054 + @drawable/start_auto_055 + @drawable/start_auto_056 + @drawable/start_auto_057 + @drawable/start_auto_058 + @drawable/start_auto_059 + + @drawable/start_auto_060 + @drawable/start_auto_061 + @drawable/start_auto_062 + @drawable/start_auto_063 + @drawable/start_auto_064 + @drawable/start_auto_065 + @drawable/start_auto_066 + @drawable/start_auto_067 + @drawable/start_auto_068 + @drawable/start_auto_069 + + @drawable/start_auto_070 + @drawable/start_auto_071 + @drawable/start_auto_072 + @drawable/start_auto_073 + @drawable/start_auto_074 + @drawable/start_auto_075 + @drawable/start_auto_076 + @drawable/start_auto_077 + @drawable/start_auto_078 + @drawable/start_auto_079 + + @drawable/start_auto_080 + @drawable/start_auto_081 + @drawable/start_auto_082 + @drawable/start_auto_083 + @drawable/start_auto_084 + @drawable/start_auto_085 + @drawable/start_auto_086 + @drawable/start_auto_087 + @drawable/start_auto_088 + @drawable/start_auto_089 + + @drawable/start_auto_090 + @drawable/start_auto_091 + @drawable/start_auto_092 + @drawable/start_auto_093 + @drawable/start_auto_094 + @drawable/start_auto_095 + @drawable/start_auto_096 + @drawable/start_auto_097 + @drawable/start_auto_098 + @drawable/start_auto_099 + + @drawable/start_auto_100 + @drawable/start_auto_101 + @drawable/start_auto_102 + @drawable/start_auto_103 + @drawable/start_auto_104 + @drawable/start_auto_105 + @drawable/start_auto_106 + @drawable/start_auto_107 + @drawable/start_auto_108 + @drawable/start_auto_109 + + @drawable/start_auto_110 + @drawable/start_auto_111 + @drawable/start_auto_112 + @drawable/start_auto_113 + @drawable/start_auto_114 + @drawable/start_auto_115 + @drawable/start_auto_116 + @drawable/start_auto_117 + @drawable/start_auto_118 + @drawable/start_auto_119 + + @drawable/start_auto_120 + @drawable/start_auto_121 + @drawable/start_auto_122 + @drawable/start_auto_123 + @drawable/start_auto_124 + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_autopilot_view.xml b/OCH/common/common/src/main/res/layout/common_autopilot_view.xml new file mode 100644 index 0000000000..04365d6b7d --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_autopilot_view.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 5917e77527..90c62765cc 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -29,4 +29,7 @@ #3B4577 #232A3F #39BA90 + #19FFCB + #FF4E41 + #B3FFFFFF \ No newline at end of file diff --git a/OCH/common/common/src/main/res/values/strings.xml b/OCH/common/common/src/main/res/values/strings.xml index 88332f80cc..825d744df0 100644 --- a/OCH/common/common/src/main/res/values/strings.xml +++ b/OCH/common/common/src/main/res/values/strings.xml @@ -1,6 +1,12 @@ + + 启动中 + 自驾中 + START + 启动失败 + 欢迎您登录 登录 获取验证码 diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index ba43b6a1ea..271d65802e 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -242,14 +242,9 @@ public class OrderModel { } private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { - @Override - public void brakeStatusChanged(boolean isBrakeAvailable) { - - } @Override public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { - OchAutopilotAnalytics.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage, System.currentTimeMillis()); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { CallerLogger.e(M_BUS + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index aef3634d09..577c44b09a 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -250,14 +250,9 @@ public class OrderModel { } private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { - @Override - public void brakeStatusChanged(boolean isBrakeAvailable) { - - } @Override public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { - OchAutopilotAnalytics.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage,System.currentTimeMillis()); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){ CallerLogger.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage ); mADASStatusCallback.onStartAdasFailure(); diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index e7e233472d..e4b1000006 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -145,15 +145,8 @@ object OrderModel { private val mAdasStartFailureListener: OchAdasStartFailureCallback = object : OchAdasStartFailureCallback { - override fun brakeStatusChanged(isBrakeAvailable: Boolean) { - } override fun onStartAutopilotFailure(startFailedCode: String, startFailedMessage: String) { - OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas( - startFailedCode, - startFailedMessage, - System.currentTimeMillis() - ) if (!FunctionBuildConfig.isDemoMode) { e(M_BUS + TAG, "mAdasStartFailureListener = $startFailedMessage") mADASStatusCallback?.onStartAdasFailure() @@ -289,7 +282,6 @@ object OrderModel { ShuttleVoiceManager.endOrderBus() // 取消自驾 CallerAutoPilotControlManager.cancelAutoPilot() - setTrajectoryStation(true) } } @@ -298,91 +290,12 @@ object OrderModel { isGoingToNextStation = true if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING ) { - startAutopilot(false) + LineManager.startAutopilot() } else { firstStartAutopilot = 0 } } - /** - * 开启自动驾驶 - * - * @param isRestart - */ - private fun startAutopilot(isRestart: Boolean) { - /** - * 存在Session - */ - if (!OchAutoPilotManager.canStartAutopilotBySessionId()) { - return - } - - OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis()) - - //1、判断轨迹url是否可用 - if(LineManager.contraiInfo==null){ - ToastUtils.showLong("无发布轨迹, 请发布后重试") - return - }else{ - if (FunctionBuildConfig.isPassStartAutopilotCommand - && TextUtils.isEmpty(LineManager.contraiInfo!!.csvFileUrl) - && TextUtils.isEmpty(LineManager.contraiInfo!!.csvFileMd5) - ) { - ToastUtils.showLong("无发布轨迹, 请发布后重试") - e( - TAG, "isPassStartAutopilotCommand = " + - FunctionBuildConfig.isPassStartAutopilotCommand - + "busRoutesResult.csvFileUrl = " + LineManager.contraiInfo!!.csvFileUrl - ) - return - } - } - - //2、6个条件判断 - if (!CallerAutoPilotControlManager.isCanStartAutopilot(true, 0)) { - return - } - - // 3、距离轨迹15m计算 - var resion = canStartAutoPilotByDistance(LineManager.contraiInfo!!.lineId) - if (TrajectoryAndDistanceManager.errorTypeNoneLineId == resion) { - setTrajectoryStation(false) - resion = canStartAutoPilotByDistance(LineManager.contraiInfo!!.lineId) - } - if (!StringUtils.isEmpty(resion)) { - ToastUtils.showShort(resion) - showNotice(resion) - return - } - //4、ssm 给出数据 - if (!canStartAutoPilotSSM()) { - triggerUnableStartAPReasonEvent() - return - } - - firstStartAutopilot++ - - triggerStartServiceEvent(isRestart, false,0) - - val parameters = LineManager.initAutopilotControlParameters() - if (null == parameters) { - e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty.") - return - } - - val sessionId = startAutoPilot(parameters) - triggerUpdateStartAutoPilotSessionId(sessionId) - - d( - M_BUS + TAG, - "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) - + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + - "isRestart = " + isRestart - ) - - mADASStatusCallback?.startOpenAutopilot() - } - @JvmStatic fun startBeautificationMode() { FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true @@ -521,16 +434,6 @@ object OrderModel { firstStartAutopilot = 0 } - /** - * 在踩刹车、控制方向盘等操作后，会停止自动驾驶，重启自动驾驶的话相当于重新设置自动驾驶目的地 - */ - @JvmStatic - fun restartAutopilot() { - d(M_BUS + TAG, "行程日志-重启自动驾驶===$isGoingToNextStation") - //只去启动自动驾驶，不再去上报离站 - startAutopilot(firstStartAutopilot >= 1) - } - @JvmStatic val isRestartAutopilot: Boolean get() = firstStartAutopilot > 1 @@ -586,51 +489,4 @@ object OrderModel { LoginStatusManager.loginOut() } } - - @JvmStatic - fun triggerStartServiceEvent(isRestart: Boolean, send: Boolean,source:Int) { - LineManager.getStations { start, end -> - OchAutopilotAnalytics.triggerStartAutopilotEvent( - isRestart, - send, - start.name, - end.name, - LineManager.lineInfos!!.lineId.toInt(), - "", - System.currentTimeMillis(), - source - ) - } - } - - private fun triggerUpdateStartAutoPilotSessionId(sessionId: Long) { - OchAutopilotAnalytics.triggerUpdateStartAutoPilotSessionId(sessionId) - } - - private fun triggerUnableStartAPReasonEvent() { - LineManager.getStationsWithLine { start, end, line -> - OchAutopilotAnalytics.triggerUnableStartAPReasonEvent( - start.name, end.name,line.lineId.toString() , "", - OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason - ) - } - } - - - private fun setTrajectoryStation(isClean:Boolean) { - if(isClean){ - TrajectoryAndDistanceManager.setStationPoint(null, null, null) - return - } - LineManager.getStationsWithLine { start, end, lineInfo -> - val startStationLocation = MogoLocation() - startStationLocation.latitude = start.gcjLat - startStationLocation.longitude = start.gcjLon - - val endStationLocation = MogoLocation() - endStationLocation.latitude = end.gcjLat - endStationLocation.longitude = end.gcjLon - TrajectoryAndDistanceManager.setStationPoint(startStationLocation, endStationLocation, lineInfo.lineId) - } - } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt index 9947ad86b6..ff8d23d9b1 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt @@ -117,7 +117,6 @@ class BusPresenter(view: ShuttleFragment?) : Presenter(view), } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - OrderModel.triggerStartServiceEvent(OrderModel.isRestartAutopilot, true,0) // 改变UI自动驾驶状态 UiThreadHandler.post({ if (mView != null) { @@ -132,14 +131,6 @@ class BusPresenter(view: ShuttleFragment?) : Presenter(view), } } - override fun onAutopilotStatusResponseFromCan(state: Int) { - when (state) { - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - OrderModel.triggerStartServiceEvent(OrderModel.isRestartAutopilot, true,1) - } - } - } - override fun startOpenAutopilot() { //非美化模式下启动动画 UiThreadHandler.post({ diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index b1b29797f3..c92322a9ea 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -191,4 +191,10 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java index b95e85fa96..34dd94048c 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java @@ -296,10 +296,6 @@ public class SweeperOperateTaskModel { }; private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { - @Override - public void brakeStatusChanged(boolean isBrakeAvailable) { - - } @Override public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 57351e135a..73ca90cec5 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1070,14 +1070,9 @@ public class TaxiModel { }; private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() { - @Override - public void brakeStatusChanged(boolean isBrakeAvailable) { - - } @Override public void onStartAutopilotFailure(@NotNull String startFailedCode, @NonNull String startFailedMessage) { - OchAutopilotAnalytics.INSTANCE.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage,System.currentTimeMillis()); if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { CallerLogger.e(M_TAXI + TAG, "mAdasStartFailureListener = " + startFailedMessage); mADASStatusCallback.onStartAdasFailure(); diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index 1c482ec269..4ef94ac62a 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -103,7 +103,6 @@ object TaxiPassengerModel { AbnormalFactorsLoopManager.startLoopAbnormalFactors(mContext!!) //开启自驾后 异常信息返回 - OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener) CallerMsgBoxEventListenerManager.addListener(TAG, iMsgBoxEventListener) TrajectoryAndDistanceManager.addDistanceListener(TAG, distanceListener) } @@ -111,7 +110,6 @@ object TaxiPassengerModel { private fun releaseListeners() { MogoAiCloudSocketManager.getInstance(mContext).unregisterLifecycleListener(10010) AbnormalFactorsLoopManager.stopLoopAbnormalFactors() - OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null) CallerMsgBoxEventListenerManager.removeListener(iMsgBoxEventListener) TrajectoryAndDistanceManager.removeListener(TAG) } @@ -230,14 +228,6 @@ object TaxiPassengerModel { } } - private val mAdasStartFailureListener: OchAdasStartFailureCallback = object : OchAdasStartFailureCallback { - override fun onStartAutopilotFailure(startFailedCode: String, startFailedMessage: String) { - OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage,System.currentTimeMillis()) - } - - override fun brakeStatusChanged(isBrakeAvailable: Boolean) { - } - } private val iMsgBoxEventListener: IMsgBoxEventListener = object : IMsgBoxEventListener { override fun onSummaryClickEvent() { if (currentOCHOrder == null) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 60a0b8b058..8353472634 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -502,7 +502,6 @@ object TaxiTaskModel { startFailedMessage: String ) { DebugView.printErrorMsg("[启自驾] 执行失败，code=$startFailedCode, msg=$startFailedMessage") - OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas(startFailedCode, startFailedMessage,System.currentTimeMillis()) if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode) { e( TAG, @@ -511,11 +510,6 @@ object TaxiTaskModel { mADASStatusCallback?.onStartAdasFailure() } } - - override fun brakeStatusChanged(isBrakeAvailable: Boolean) { - //刹车: true 松开, false 踩下 2020.9.23刹车需求暂时下掉 -// handleBrakeStatusChange(isBrakeAvailable) - } } //监听网络变化，避免启动机器时无网导致无法更新订单信息 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index dc2e181a74..b384007520 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -122,7 +122,6 @@ object TaxiPassengerModel { AbnormalFactorsLoopManager.startLoopAbnormalFactors(mContext!!) //开启自驾后 异常信息返回 - OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(mAdasStartFailureListener) CallerMsgBoxEventListenerManager.addListener(TAG, iMsgBoxEventListener) TrajectoryAndDistanceManager.addDistanceListener(TAG, distanceListener) } @@ -130,7 +129,6 @@ object TaxiPassengerModel { private fun releaseListeners() { MogoAiCloudSocketManager.getInstance(mContext).unregisterLifecycleListener(10010) AbnormalFactorsLoopManager.stopLoopAbnormalFactors() - OCHAdasAbilityManager.getInstance().setAdasStartFailureCallback(null) CallerMsgBoxEventListenerManager.removeListener(iMsgBoxEventListener) TrajectoryAndDistanceManager.removeListener(TAG) } @@ -339,23 +337,6 @@ object TaxiPassengerModel { } } - private val mAdasStartFailureListener: OchAdasStartFailureCallback = - object : OchAdasStartFailureCallback { - override fun onStartAutopilotFailure( - startFailedCode: String, - startFailedMessage: String - ) { - OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas( - startFailedCode, - startFailedMessage, - System.currentTimeMillis() - ) - } - - override fun brakeStatusChanged(isBrakeAvailable: Boolean) { - } - } - private val iMsgBoxEventListener: IMsgBoxEventListener = object : IMsgBoxEventListener { override fun onSummaryClickEvent() { if (currentOCHOrder == null) {