[6.4.0]

[CallerAutoPilotStatusListenerManager -> OchAutoPilotStatusListenerManager]

OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java

@@ -238,33 +238,12 @@ public class BusPresenter extends Presenter<BusFragment>
         onAutopilotStatusResponse(status);
     }
 
-    @Override
-    public void onAutopilotRouteLineId(long lineId) {
-
-    }
-
-    @Override
-    public void onAutopilotGuardian(MogoReportMsg.MogoReportMessage guardianInfo) {
-        BusTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo);
-    }
 
     @Override
     public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo, long lineId) {
-
+        BusTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo,lineId);
     }
 
-    @Override
-    public void onAutopilotIpcConnectStatusChanged(@NonNull AdasConstants.IpcConnectionStatus status, @Nullable String reason) {
-    }
-
-    @Override
-    public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) {
-
-    }
-
-    @Override
-    public void onSystemStatus(@NonNull SsmInfo.SsmStatusInf statusInf) {
-    }
 
     @Override
     public void onStatusChange(LoginStatusEnum currentStatus) {
@@ -299,11 +278,4 @@ public class BusPresenter extends Presenter<BusFragment>
         runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
     }
 
-    @Override
-    public void onAutopilotDockerInfo(@NonNull String dockerVersion) {
-    }
-
-    @Override
-    public void onSsmReceiveTimeout(boolean isTimeout) {
-    }
 }

OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java

@@ -63,6 +63,10 @@ public class BusTrajectoryManager {
         }
     }
 
+    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo,long lineId) {
+        onAutopilotGuardian(guardianInfo);
+    }
+
     /**
      * 接口MEC反馈的常规信息（MAP v2.5.0新增轨迹相关信息）
      * @param guardianInfo

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt

@@ -46,6 +46,9 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
+import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors
@@ -331,7 +334,7 @@ object BusPassengerModel {
     private fun initListeners() {
 
         // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
-        CallerAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener)
+        OchAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener)
         IntentManager.getInstance()
             .registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
         MogoStatusManager.getInstance().registerStatusChangedListener(
@@ -360,7 +363,7 @@ object BusPassengerModel {
         CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
         MogoAiCloudSocketManager.getInstance(mContext)
             .unregisterLifecycleListener(10010)
-        CallerAutoPilotStatusListenerManager.removeListener(mGoAutopilotStatusListener)
+        OchAutoPilotStatusListenerManager.removeListener(mGoAutopilotStatusListener)
         CallerTelematicListenerManager.removeListener(TAG)
         stopLoopAbnormalFactors()
     }
@@ -471,8 +474,8 @@ object BusPassengerModel {
                 }
             }
         }
-    private val mGoAutopilotStatusListener: IMoGoAutopilotStatusListener =
-        object : IMoGoAutopilotStatusListener {
+    private val mGoAutopilotStatusListener: IOchAutopilotStatusListener =
+        object : IOchAutopilotStatusListener {
             private var arriveAtEnd = false //乘客app专用字段
             override fun onAutopilotStatusResponse(state: Int) {
                 if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
@@ -499,7 +502,7 @@ object BusPassengerModel {
                 }
             }
 
-            override fun onAutopilotArriveAtStation(arrivalNotification: ArrivalNotification?) {
+            override fun onAutopilotArriveAtStation(arrivalNotification: ArrivedStation?) {
                 if (FunctionBuildConfig.isDemoMode
                     && isPassenger(FunctionBuildConfig.appIdentityMode)
                 ) {

OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt

@@ -40,6 +40,8 @@ import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.BusTransferData
 import com.mogo.och.bus.passenger.bean.PM2RoutesResponse
 import com.mogo.och.bus.passenger.network.BusPassengerServiceManager
+import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.common.module.manager.distance.IDistanceListener
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
@@ -109,7 +111,7 @@ class PM2DrivingModel private constructor() {
 
     private fun initListener() {
         //自动驾驶状态监听
-        CallerAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener)
+        OchAutoPilotStatusListenerManager.addListener(TAG, mAutoPilotStatusListener)
 
         // 定位监听
         CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 3, mMapLocationListener)
@@ -267,8 +269,8 @@ class PM2DrivingModel private constructor() {
         mDrivingInfoCallback?.updateSpeed(speedKM)
     }
 
-    private val mAutoPilotStatusListener: IMoGoAutopilotStatusListener =
-        object : IMoGoAutopilotStatusListener {
+    private val mAutoPilotStatusListener: IOchAutopilotStatusListener =
+        object : IOchAutopilotStatusListener {
 
             override fun onAutopilotStatusResponse(state: Int) {
                 super.onAutopilotStatusResponse(state)