[6.3.0]

[common 添加轨迹统一处理问题件、]

OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/ShuttleFragment.java

@@ -156,11 +156,13 @@ public class ShuttleFragment extends BaseShuttleTabFragment<ShuttleFragment, Bus
     @Override
     protected void onArriveStation() {
         mPresenter.onAutopilotArriveAtStation(null);
+        mPresenter.arriveStation(null,"点击进站触发进站操作");
     }
 
     @Override
     protected void debugArrivedStation() {
         mPresenter.onAutopilotArriveAtStation(null);
+        mPresenter.arriveStation(null,"点击debug进站按钮触发进站操作");
     }
 
     @NonNull

OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java

@@ -29,6 +29,8 @@ import com.mogo.och.common.module.bean.dpmsg.DPMsgType;
 import com.mogo.och.common.module.bean.dpmsg.LoginCacheStatus;
 import com.mogo.och.common.module.bean.dpmsg.TaskDetailsMsg;
 import com.mogo.och.common.module.biz.constant.LoginStatusManager;
+import com.mogo.och.common.module.manager.autopilotmanager.autopilot.ArrivedStation;
+import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager;
 import com.mogo.och.common.module.utils.MultiRequestLimitChecker;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
 import com.mogo.och.data.bean.BusStationBean;
@@ -338,7 +340,7 @@ public class OrderModel {
         if (distance <= BusConst.ARRIVE_AT_END_STATION_DISTANCE) {
             CallerLogger.d(M_BUS + TAG, "行程日志-judgeArrivedStation() distance = " + distance
                     + " to " + upcomingStation.getName());
-            onArriveAt(null); //无自动驾驶到站信息传null
+            onArriveAt(null,"兜底：根据定位计算到站");
         }
     }
 
@@ -654,7 +656,9 @@ public class OrderModel {
     /**
      * 到站后重置站点状态
      */
-    private void arriveSiteStation() {
+    private void arriveSiteStation(String changeInfo) {
+        OchChainLogManager.writeChainLog("触发进站", changeInfo,
+                true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS);
         if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次
             CallerLogger.e( M_BUS + TAG, "数组越界" );
             return;
@@ -796,7 +800,10 @@ public class OrderModel {
         long writeVersion = DateTimeUtil.getCurrentTimeStamp();
         leaveStationSuccess(backgroundCurrentStationIndex, currentStationName,
                 finalNextStationName,finalNextStationNameKr,writeVersion);
-
+        String changeInfo = "taskId:" + busRoutesResult.getTaskId() + "--lineId:" + busRoutesResult.getLineId() +
+                "--currentStationName:"+currentStationName+"--finalNextStationName:"+finalNextStationName;
+        OchChainLogManager.writeChainLog("滑动出发", changeInfo,
+                true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS);
         OrderServiceManager.leaveStation(mContext,
                 stationList.get(backgroundCurrentStationIndex).getSeq(),
                 stationList.get(backgroundCurrentStationIndex).getSiteId(),
@@ -804,6 +811,8 @@ public class OrderModel {
                 new OchCommonServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData o) {
+                        OchChainLogManager.writeChainLog("滑动出发成功", changeInfo,
+                                true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS);
                     }
 
 
@@ -1087,7 +1096,7 @@ public class OrderModel {
      *
      * @param data
      */
-    public void onArriveAt(MessagePad.ArrivalNotification data) {
+    public void onArriveAt(ArrivedStation data,String type) {
         if (backgroundCurrentStationIndex + 1 > stationList.size() - 1) {
             CallerLogger.e(M_BUS + TAG, "行程日志-到站异常，取消后续操作结束");
             return;
@@ -1116,7 +1125,7 @@ public class OrderModel {
         CallerLogger.d(M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex="
                 + backgroundCurrentStationIndex);
 
-        arriveSiteStation();
+        arriveSiteStation(type);
     }
 
     public boolean isGoingToNextStation() {

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

@@ -16,6 +16,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.och.common.module.manager.autopilotmanager.autopilot.ArrivedStation;
+import com.mogo.och.common.module.manager.autopilotmanager.autopilot.IOchAutopilotStatusListener;
+import com.mogo.och.common.module.manager.autopilotmanager.autopilot.OchAutoPilotStatusListenerManager;
 import com.mogo.och.data.bean.BusStationBean;
 import com.mogo.och.bus.callback.IBusADASStatusCallback;
 import com.mogo.och.bus.callback.IBusControllerStatusCallback;
@@ -46,7 +49,7 @@ import system_master.SystemStatusInfo;
  */
 public class BusPresenter extends Presenter<ShuttleFragment>
         implements IRefreshBusStationsCallback, ISlidePannelHideCallback
-        , IMoGoAutopilotStatusListener, IBusControllerStatusCallback, ILoginCallback, IBusADASStatusCallback {
+        , IOchAutopilotStatusListener, IBusControllerStatusCallback, ILoginCallback, IBusADASStatusCallback {
 
     private static final String TAG = "BusPresenter";
 
@@ -56,7 +59,7 @@ public class BusPresenter extends Presenter<ShuttleFragment>
     public BusPresenter(ShuttleFragment view) {
         super(view);
         //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口
-        CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
+        OchAutoPilotStatusListenerManager.INSTANCE.addListener(TAG,this);
         OrderModel.getInstance().init();
         OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp());
     }
@@ -148,9 +151,13 @@ public class BusPresenter extends Presenter<ShuttleFragment>
     }
 
     @Override
-    public void onAutopilotArriveAtStation(MessagePad.ArrivalNotification arrivalNotification) {
+    public void onAutopilotArriveAtStation(ArrivedStation arrivedStation) {
         CallerLogger.e( M_BUS + TAG, "行程日志-onAutopilotArriveAtStation arrive");
-        OrderModel.getInstance().onArriveAt(arrivalNotification);
+        arriveStation(arrivedStation,"底盘触发进站");
+    }
+
+    public void arriveStation(ArrivedStation arrivedStation,String type){
+        OrderModel.getInstance().onArriveAt(arrivedStation,type);
     }
 
     @Override