[6.8.2]

[fea] [轨迹下载回调相关]
2024-12-06 14:31:57 +08:00
parent d98a9d3b1a
commit cee6be8bb5
18 changed files with 494 additions and 439 deletions
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt
@@ -10,6 +10,7 @@ import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
 import com.mogo.och.offline.util.BusAnalyticsManager
+import com.mogo.och.offline.util.OffLineTrajectoryManager

 /**
 * 网约车小巴业务实现入口
@@ -31,11 +32,13 @@ class ShuttleDriverProvider : CommonServiceImpl() {
            busFragment = ShuttleFragment()
        }
        OchAutopilotAnalytics.ochEventKey = BusAnalyticsManager.getInstance()
+        OffLineTrajectoryManager.load()
        return busFragment!!
    }

    override fun resetFragment() {
        OchAutopilotAnalytics.ochEventKey = null
+        OffLineTrajectoryManager.release()
        busFragment = null
    }

--- 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
@@ -55,7 +55,7 @@ import com.mogo.och.offline.callback.IBusControllerStatusCallback;
 import com.mogo.och.offline.callback.IRefreshBusStationsCallback;
 import com.mogo.och.offline.callback.ISlidePannelHideCallback;
 import com.mogo.och.offline.constant.BusConst;
-import com.mogo.och.offline.util.BusTrajectoryManager;
+import com.mogo.och.offline.util.OffLineTrajectoryManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager;
@@ -826,7 +826,7 @@ public class OrderModel {
        updateBusTaskStatus(stationList);

        //需放在currentStationIndex赋值之后
-        BusTrajectoryManager.getInstance().syncTrajectoryInfo();
+        OffLineTrajectoryManager.INSTANCE.syncTrajectoryInfo();
    }

    private void beforeTaskTips() {
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java
@@ -28,7 +28,7 @@ import com.mogo.och.offline.callback.ISlidePannelHideCallback;
 import com.mogo.och.offline.fragment.ShuttleFragment;
 import com.mogo.och.offline.model.BusLineModel;
 import com.mogo.och.offline.model.OrderModel;
-import com.mogo.och.offline.util.BusTrajectoryManager;
+import com.mogo.och.offline.util.OffLineTrajectoryManager;
 import com.mogo.och.common.module.biz.login.ILoginCallback;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager;
@@ -286,11 +286,6 @@ public class BusPresenter extends Presenter<ShuttleFragment>
    }


-    @Override
-    public void onAutopilotGuardian(MogoReportMsg.MogoReportMessage guardianInfo, long lineId) {
-        BusTrajectoryManager.getInstance().onAutopilotGuardian(guardianInfo,lineId);
-    }
-
    @Override
    public void onStatusChange(LoginStatusEnum currentStatus) {
        CallerLogger.d(M_BUS + TAG, " loginStatus =" + LoginStatusManager.isLogin());
@@ -300,8 +295,7 @@ public class BusPresenter extends Presenter<ShuttleFragment>
            BusLineModel.startLoopAllLine();
        }else {
            BusLineModel.stopLoopAllLine();
-            BusTrajectoryManager.getInstance().stopTrajReqLoop();
-            BusTrajectoryManager.getInstance().stopTrajReqLoop();
+            OffLineTrajectoryManager.INSTANCE.stopTrajReqLoop();
            clearBusStationsMarkers();
            if(mView!=null) {
                mView.hideSlidePanel();
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
@@ -1,180 +1,183 @@
-package com.mogo.och.offline.util;
+package com.mogo.och.offline.util

-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.GsonUtils;
-import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
-import com.mogo.och.data.bean.BusRoutesResult;
-import com.mogo.och.offline.constant.BusConst;
-import com.mogo.och.offline.model.OrderModel;
-import com.mogo.och.common.module.biz.login.LoginStatusManager;
-
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import mogo_msg.MogoReportMsg;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
+import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendTrajectoryDownloadReq
+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
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin
+import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener
+import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog
+import com.mogo.och.offline.constant.BusConst
+import com.mogo.och.offline.model.OrderModel
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.functions.Function
+import io.reactivex.schedulers.Schedulers
+import mogo_msg.MogoReportMsg.MogoReportMessage
+import java.util.concurrent.TimeUnit

 /**
 * Bus轨迹管理：给MEC下发用于轨迹下载的信息
 * Created on 2022/6/23
 */
-public class BusTrajectoryManager {
-    private static final String TAG = BusTrajectoryManager.class.getSimpleName();
+object OffLineTrajectoryManager : ITrajectoryListListener {

-    private static final class SingletonHolder {
-        private static final BusTrajectoryManager INSTANCE = new BusTrajectoryManager();
+    private var mAutoPilotLine: AutoPilotLine? = null
+    private var mSendReqDisposable: Disposable? = null
+
+    private val TAG: String = OffLineTrajectoryManager::class.java.simpleName
+
+    init {
+        mAutoPilotLine = AutoPilotLine(
+            -1, "",
+            "", "", "", "", 0, "",
+            "", "", "", "", 0
+        )
    }

-    public static BusTrajectoryManager getInstance() {
-        return BusTrajectoryManager.SingletonHolder.INSTANCE;
+    fun load(){
+        TrajectoryManager.addListener(TAG,this)
    }

-    private AutopilotControlParameters.AutoPilotLine mAutoPilotLine = null;
-    private Disposable mSendReqDisposable = null;
-
-    public BusTrajectoryManager() {
-        mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "",
-                "", "", "", "", 0, "",
-                "", "", "", "", 0);
+    fun release(){
+        TrajectoryManager.removeListener(TAG)
    }

    /**
     * 同步Bus路线信息
     */
-    public void syncTrajectoryInfo() {
-        BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
-        if (LoginStatusManager.isLogin() && routesResult != null
-                && OrderModel.getInstance().getCurrentStationIndex() == 0
-                && !OrderModel.getInstance().isGoingToNextStation()) {
-            CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() start.");
-            startTrajReqLoop();
+    fun syncTrajectoryInfo() {
+        val routesResult = OrderModel.getInstance().busRoutesResult
+        if (isLogin() && routesResult != null && OrderModel.getInstance().currentStationIndex == 0 && !OrderModel.getInstance().isGoingToNextStation) {
+            d(SceneConstant.M_BUS + TAG, "syncTrajectoryInfo() start.")
+            startTrajReqLoop()
        } else {
            // 无路线信息or当前未在始发站
-            CallerLogger.d(M_BUS + TAG, "syncTrajectoryInfo() stop.");
-            stopTrajReqLoop();
+            d(SceneConstant.M_BUS + TAG, "syncTrajectoryInfo() stop.")
+            stopTrajReqLoop()
        }
    }

-    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo,long lineId) {
-        onAutopilotGuardian(guardianInfo);
+    override fun onDownLoadStart(lineId: Long) {
+        stopTrajReqLoop()
    }

-    /**
-     * 接口MEC反馈的常规信息（MAP v2.5.0新增轨迹相关信息）
-     * @param guardianInfo
-     */
-    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) {
-        if (guardianInfo == null || !guardianInfo.hasCode()) return;
-        if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
-            // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
-            stopTrajReqLoop();
-        } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
-            // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
-            stopTrajReqLoop();
-        } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
-            // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
-        } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
-            // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
-        } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
-            // 5. 轨迹管理_轨迹下载超时
-        } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) {
-            // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
-            syncTrajectoryInfo();
-        }
+    override fun onDownLoadSuccess(lineId: Long) {
+        stopTrajReqLoop()
    }

-    private void setupAutoPilotLine() {
-        BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult();
+    override fun onDownLoadReady(lineId: Long) {
+        super.onDownLoadReady(lineId)
+        // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
+        syncTrajectoryInfo()
+    }
+
+    private fun setupAutoPilotLine() {
+        val routesResult = OrderModel.getInstance().busRoutesResult
        if (routesResult == null) {
-            CallerLogger.e(M_BUS + TAG,
-                    "setupAutoPilotLine(): routesResult is null.");
-            return;
+            e(
+                SceneConstant.M_BUS + TAG,
+                "setupAutoPilotLine(): routesResult is null."
+            )
+            return
        } else {
            if (mAutoPilotLine == null) {
-                mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                        routesResult.getLineId(), routesResult.getName(),
-                        routesResult.csvFileUrl, routesResult.csvFileMd5,
-                        routesResult.txtFileUrl, routesResult.txtFileMd5,
-                        routesResult.contrailSaveTime, routesResult.carModel,
-                        routesResult.csvFileUrlDPQP, routesResult.csvFileMd5DPQP,
-                        routesResult.txtFileUrlDPQP, routesResult.txtFileMd5DPQP,
-                        routesResult.contrailSaveTimeDPQP);
+                mAutoPilotLine = AutoPilotLine(
+                    routesResult.lineId.toLong(), routesResult.name,
+                    routesResult.csvFileUrl, routesResult.csvFileMd5,
+                    routesResult.txtFileUrl, routesResult.txtFileMd5,
+                    routesResult.contrailSaveTime, routesResult.carModel,
+                    routesResult.csvFileUrlDPQP, routesResult.csvFileMd5DPQP,
+                    routesResult.txtFileUrlDPQP, routesResult.txtFileMd5DPQP,
+                    routesResult.contrailSaveTimeDPQP
+                )
            } else {
-                mAutoPilotLine.setLineId(routesResult.getLineId());
-                mAutoPilotLine.setLineName(routesResult.getName());
-                mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl==null?"":routesResult.csvFileUrl);
-                mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5==null?"":routesResult.csvFileMd5);
-                mAutoPilotLine.setStopUrl(routesResult.txtFileUrl==null?"":routesResult.txtFileUrl);
-                mAutoPilotLine.setStopMd5(routesResult.txtFileMd5==null?"":routesResult.txtFileMd5);
-                mAutoPilotLine.setTimestamp(routesResult.contrailSaveTime);
-                mAutoPilotLine.setVehicleModel(routesResult.carModel==null?"":routesResult.carModel);
+                mAutoPilotLine!!.lineId = routesResult.lineId.toLong()
+                mAutoPilotLine!!.lineName = routesResult.name
+                mAutoPilotLine!!.trajUrl =
+                    if (routesResult.csvFileUrl == null) "" else routesResult.csvFileUrl
+                mAutoPilotLine!!.trajMd5 =
+                    if (routesResult.csvFileMd5 == null) "" else routesResult.csvFileMd5
+                mAutoPilotLine!!.stopUrl =
+                    if (routesResult.txtFileUrl == null) "" else routesResult.txtFileUrl
+                mAutoPilotLine!!.stopMd5 =
+                    if (routesResult.txtFileMd5 == null) "" else routesResult.txtFileMd5
+                mAutoPilotLine!!.timestamp = routesResult.contrailSaveTime
+                mAutoPilotLine!!.vehicleModel =
+                    if (routesResult.carModel == null) "" else routesResult.carModel
            }
        }
    }

-    private void clearAutoPilotLine() {
-        if (mAutoPilotLine == null) return;
-        mAutoPilotLine.setLineId(-1);
-        mAutoPilotLine.setLineName("");
-        mAutoPilotLine.setTrajUrl("");
-        mAutoPilotLine.setTrajMd5("");
-        mAutoPilotLine.setStopUrl("");
-        mAutoPilotLine.setStopMd5("");
-        mAutoPilotLine.setTimestamp(0);
-        mAutoPilotLine.setVehicleModel("");
-        mAutoPilotLine.setTrajUrl_dpqp("");
-        mAutoPilotLine.setTrajMd5_dpqp("");
-        mAutoPilotLine.setStopUrl_dpqp("");
-        mAutoPilotLine.setStopMd5_dpqp("");
-        mAutoPilotLine.setTimestamp_dpqp(0);
+    private fun clearAutoPilotLine() {
+        if (mAutoPilotLine == null) return
+        mAutoPilotLine!!.lineId = -1
+        mAutoPilotLine!!.lineName = ""
+        mAutoPilotLine!!.trajUrl = ""
+        mAutoPilotLine!!.trajMd5 = ""
+        mAutoPilotLine!!.stopUrl = ""
+        mAutoPilotLine!!.stopMd5 = ""
+        mAutoPilotLine!!.timestamp = 0
+        mAutoPilotLine!!.vehicleModel = ""
+        mAutoPilotLine!!.trajUrl_dpqp = ""
+        mAutoPilotLine!!.trajMd5_dpqp = ""
+        mAutoPilotLine!!.stopUrl_dpqp = ""
+        mAutoPilotLine!!.stopMd5_dpqp = ""
+        mAutoPilotLine!!.timestamp_dpqp = 0
    }

-    private void startTrajReqLoop() {
-        if (mSendReqDisposable != null && !mSendReqDisposable.isDisposed()) {
-            return;
+    private fun startTrajReqLoop() {
+        if (mSendReqDisposable != null && !mSendReqDisposable!!.isDisposed) {
+            return
        }
-        CallerLogger.d(M_BUS + TAG, "startTrajReqLoop()");
-        setupAutoPilotLine();
-        mSendReqDisposable = Observable.interval(BusConst.LOOP_DELAY,
-                BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS)
-                .map((aLong -> aLong + 1))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(aLong -> {
-                    if (aLong > BusConst.LOOP_SEND_TRAJ_TIMES) {
-                        stopTrajReqLoop();
-                        return;
-                    }
-                    CallerLogger.d(M_BUS + TAG, "loop sendTrajectoryReq: " + aLong);
-                    sendTrajectoryReq();
-                });
+        d(SceneConstant.M_BUS + TAG, "startTrajReqLoop()")
+        setupAutoPilotLine()
+        mSendReqDisposable = Observable.interval(
+            BusConst.LOOP_DELAY,
+            BusConst.LOOP_PERIOD_10S, TimeUnit.MILLISECONDS
+        )
+            .map((Function { aLong: Long -> aLong + 1 }))
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { aLong: Long ->
+                if (aLong > BusConst.LOOP_SEND_TRAJ_TIMES) {
+                    stopTrajReqLoop()
+                    return@subscribe
+                }
+                d(SceneConstant.M_BUS + TAG, "loop sendTrajectoryReq: $aLong")
+                sendTrajectoryReq()
+            }
    }

-    public void stopTrajReqLoop() {
+    fun stopTrajReqLoop() {
        if (mSendReqDisposable != null) {
-            CallerLogger.d(M_BUS + TAG, "stopTrajReqLoop()");
-            mSendReqDisposable.dispose();
-            mSendReqDisposable = null;
-            clearAutoPilotLine();
+            d(SceneConstant.M_BUS + TAG, "stopTrajReqLoop()")
+            mSendReqDisposable!!.dispose()
+            mSendReqDisposable = null
+            clearAutoPilotLine()
        }
    }

-    private void sendTrajectoryReq() {
+    private fun sendTrajectoryReq() {
        if (mAutoPilotLine == null) {
-            CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!");
-            return;
+            e(SceneConstant.M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!")
+            return
        }
-        OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
-        CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
-        CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): "
-                + GsonUtils.toJson(mAutoPilotLine));
+        writeChainLog(
+            "轨迹监控",
+            "sendTrajectoryReq() 下发轨迹 轨迹id" + mAutoPilotLine!!.lineId,
+            true,
+            OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY
+        )
+        sendTrajectoryDownloadReq(mAutoPilotLine!!)
+        d(
+            SceneConstant.M_BUS + TAG, "sendTrajectoryReq(): "
+                    + GsonUtils.toJson(mAutoPilotLine)
+        )
    }
 }