[6.0.0]

[autopilo]
[包修改]

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

@@ -62,7 +62,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener;
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;

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

@@ -31,7 +31,7 @@ import com.mogo.och.bus.util.BusTrajectoryManager;
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
 import com.mogo.och.common.module.biz.callback.ILoginCallback;
 import com.mogo.och.common.module.biz.constant.LoginStatusManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.voice.VoiceNotice;
 
 import java.util.ArrayList;

OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -16,7 +16,6 @@ import com.magic.mogo.och.charter.manager.CharterAnalyticsManager
 import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
 import com.magic.mogo.och.charter.net.DriverM1ServiceManager
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
-import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.voice.AIAssist
@@ -56,14 +55,10 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.utils.*
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.data.bean.*
-import io.reactivex.exceptions.UndeliverableException
-import io.reactivex.functions.Consumer
-import io.reactivex.plugins.RxJavaPlugins
-import java.io.IOException
 
 /**
  * @author: wangmingjun

OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt

@@ -22,7 +22,7 @@ import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean
 import com.mogo.och.common.module.biz.callback.ILoginCallback
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE
 import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.StopSideStatusManager
 import com.mogo.och.common.module.utils.DateTimeUtil
 import mogo.telematics.pad.MessagePad

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt

@@ -41,7 +41,7 @@ import com.mogo.och.common.module.biz.constant.TaxiLoginStatusEnum
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager
 import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATION
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt

@@ -32,7 +32,7 @@ import com.mogo.och.charter.passenger.ui.MainFragment
 import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteName
 import com.mogo.och.charter.passenger.ui.overmapview.MakerWithSiteNamewithCheck
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.StopSideStatusManager
 import com.mogo.och.common.module.manager.devicemanage.LightAirconditionDoorCallback
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java

@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.manager;
+package com.mogo.och.common.module.manager.autopilotmanager;
 
 import android.content.Context;
 

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

@@ -69,7 +69,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;

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

@@ -31,9 +31,8 @@ import com.mogo.och.bus.util.BusTrajectoryManager;
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
 import com.mogo.och.common.module.biz.callback.ILoginCallback;
 import com.mogo.och.common.module.biz.constant.LoginStatusManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.voice.VoiceNotice;
-import com.mogo.och.data.manager.cache.CacheDataManager;
 
 import org.jetbrains.annotations.NotNull;
 

OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/BaseSweeperTabFragment.java

@@ -1,6 +1,5 @@
 package com.mogo.och.sweepercloud.fragment;
 
-
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -25,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
@@ -35,8 +35,9 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
+import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.sweepercloud.R;
 import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;
@@ -125,23 +126,25 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         //设置左下角四个按钮监听事件
         setBottomBtnListener();
         // 模拟 下发启动自驾命令
-        findViewById(R.id.btnStartAutopilot).setOnClickListener(v -> {
+        findViewById(R.id.btnStartAutopilot).setOnClickListener(new View.OnClickListener() {
-            if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) {
+            @Override
-                ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + ", 请稍候重试");
+            public void onClick(View v) {
-                return;
+                if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) {
-            }
+                    ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + ", 请稍候重试");
-            new AutopilotModeConfigManager(new AutopilotModeConfigManager.OnReadAutopilotModeConfigListener() {
+                    return;
-                @Override
-                public void onReadFailed(String err) {
-                    ThreadUtils.runOnUiThread(() -> {
-                        ToastUtils.showLong("读取失败=" + err);
-                    });
                 }
+                new AutopilotModeConfigManager(new AutopilotModeConfigManager.OnReadAutopilotModeConfigListener() {
+                    @Override
+                    public void onReadFailed(String err) {
+                        ThreadUtils.runOnUiThread(() -> {
+                            ToastUtils.showLong("读取失败=" + err);
+                        });
+                    }
 
-                @Override
+                    @Override
-                public void onParseFailed(String err) {
+                    public void onParseFailed(String err) {
-                    ToastUtils.showLong("解析失败=" + err);
+                        ToastUtils.showLong("解析失败=" + err);
-                }
+                    }
 
                     @Override
                     public void onParse(MessagePad.SetAutopilotModeReq bean) {
@@ -204,17 +207,21 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         findViewById(R.id.btnSendTaskStatus).setOnClickListener(view ->
                 SweeperCloudTaskUtils.mockSendCloudBigTaskStatus()
         );
-        mTrafficDataView.getSpeedImage().setOnLongClickListener(v -> {
+        mTrafficDataView.getSpeedImage().setOnLongClickListener(new View.OnLongClickListener() {
-            debugTestBar();
+            @Override
-            return false;
+            public boolean onLongClick(View v) {
+                debugTestBar();
+                return false;
+            }
         });
     }
 
     private void updateSwitchMapIcon() {
-        if(mapBizView != null){
+        IMogoMapUIController controller = CallerMapUIServiceManager.INSTANCE.getMapUIController();
-            if (mapBizView.getUI().getCurrentMapVisualAngle().isLongSight()) {
+        if (controller != null) {
+            if (controller.getCurrentMapVisualAngle().isLongSight()) {
                 mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_big_selector);
-            } else if (mapBizView.getUI().getCurrentMapVisualAngle().isMediumSight()) {
+            } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
                 mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_small_selector);
             } else {
                 mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_small_selector);
@@ -224,6 +231,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 设置任务进度
+     *
+     * @param progress
      */
     protected void setTaskProgress(String progress) {
         ThreadUtils.runOnUiThread(() -> {
@@ -309,7 +318,9 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     private void initListener() {
         MogoMapListenerHandler.Companion.getMogoMapListenerHandler().registerHostMapListener(TAG, this);
-        mMapWeltView.getSwitchToBig().setOnClickListener((v) -> showOrHideOverMapViewFragment(true));
+        mMapWeltView.getSwitchToBig().setOnClickListener((v) -> {
+            showOrHideOverMapViewFragment(true);
+        });
     }
 
     /**
@@ -322,6 +333,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 迈速表实时更新
+     *
+     * @param newSpeed
      */
     public void updateSpeedView(float newSpeed) {
         int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值
@@ -332,6 +345,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 车辆基本信息View
+     *
+     * @return
      */
     public SweeperTrafficDataView getTrafficDataView() {
         return mTrafficDataView;
@@ -378,21 +393,33 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         mSwitchMapModeImage.setOnClickListener(new OnPreventFastClickListener() {
             @Override
             public void onClickImpl(View v) {
-                if(mapBizView != null){
+                IMogoMapUIController controller = CallerMapUIServiceManager.INSTANCE.getMapUIController();
-                    if (mapBizView.getUI().getCurrentMapVisualAngle().isLongSight()) {
+                if (controller != null) {
-                        mapBizView.getUI().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
+                    //切换地图的远近视图
+                    if (controller.getCurrentMapVisualAngle().isLongSight()) {
+                        // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
+                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_small_selector);
-                    } else if (mapBizView.getUI().getCurrentMapVisualAngle().isMediumSight()) {
+                    } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        mapBizView.getUI().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+//                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, BusConst.TYPE_MARKER_BUS_ORDER);
+                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                         mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_big_selector);
                     } else {
-                        mapBizView.getUI().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
+                        // 2.11.0去掉
+//                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers();
+                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchMapModeImage.setImageResource(R.drawable.sweeper_switch_map_big_selector);
                     }
                 }
             }
         });
-        mSettingBtn.setOnClickListener(v -> CallerHmiManager.INSTANCE.showToolsView());
+        mSettingBtn.setOnClickListener(v -> {
+            // TODO: 2021/12/9
+            CallerHmiManager.INSTANCE.showToolsView();
+        });
         if (mCardBtn != null) {
             CallerDevaToolsManager.INSTANCE.initBadCase(mCardBtn);
         }
@@ -403,6 +430,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 设置作业任务全览图隐藏或者显示
+     *
+     * @param isShow
      */
     public void showOrHideOverMapViewFragment(boolean isShow) {
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
@@ -448,15 +477,20 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 设置贴边数据到地图
+     *
+     * @param weltDataBeans
      */
     public void setWeltDataToMap(ArrayList<WeltDataBean> weltDataBeans, Boolean isWeltData, String distance) {
         mWeltDataBeanList = weltDataBeans;
-        ThreadUtils.getSinglePool().execute(() -> {
+        ThreadUtils.getSinglePool().execute(new Runnable() {
-            if (mMapWeltView != null) {
+            @Override
-                mMapWeltView.setWeltData(weltDataBeans, isWeltData, distance);
+            public void run() {
-            }
+                if (mMapWeltView != null) {
-            if (mTaskDataToFragmentCallback != null) {
+                    mMapWeltView.setWeltData(weltDataBeans, isWeltData, distance);
-                mTaskDataToFragmentCallback.setWeltData(weltDataBeans, distance);
+                }
+                if (mTaskDataToFragmentCallback != null) {
+                    mTaskDataToFragmentCallback.setWeltData(weltDataBeans, distance);
+                }
             }
         });
     }
@@ -473,6 +507,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     /**
      * 设置当前任务终点
+     *
+     * @param subTaskCoordinate
      */
     public void setCurrentTaskEndMarker(LatLng subTaskCoordinate) {
         if (mMapWeltView != null) {

OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java

@@ -29,7 +29,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCleanSyste
 import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCloudTaskListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;

OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/presenter/SweeperPresenter.java

@@ -6,7 +6,7 @@ import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCleanSystemListenerManager;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.sweepercloud.bean.SweeperRoutePlanningUpdateReqBean;
 import com.mogo.och.sweepercloud.callback.ISweeperControllerStatusCallback;
 import com.mogo.och.sweepercloud.callback.ISweeperCloudTaskCallback;

OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java

@@ -33,7 +33,7 @@ import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManag
 import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage;
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;

OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java

@@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCleanSystemListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.sweeper.bean.SweeperMainTaskBean;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java

@@ -49,7 +49,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.biz.provider.LoginService;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.manager.distancemamager.IDistanceListener;
 import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener;
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager;

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java

@@ -19,7 +19,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
 import com.mogo.och.common.module.biz.callback.ILoginCallback;
 import com.mogo.och.common.module.biz.constant.LoginStatusManager;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.taxi.bean.OrderQueryRespBean;
 import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
@@ -37,8 +37,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import mogo.telematics.pad.MessagePad;
-
 /**
  * @author congtaowang
  * @since 2021/1/18

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -12,7 +12,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.ToastUtils
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.utils.PinYinUtil
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt

@@ -16,13 +16,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 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_TAXI_P
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.distancemamager.IDistanceListener
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
@@ -30,7 +29,6 @@ import com.mogo.och.common.module.manager.loopmanager.LoopInfo
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean
-import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRemainingResp
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java

@@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
 import com.mogo.och.common.module.biz.callback.ILoginCallback;
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager;
 import com.mogo.och.taxi.callback.ITaxiADASStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt

@@ -46,7 +46,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.provider.LoginService
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.distancemamager.IDistanceListener
 import com.mogo.och.common.module.manager.distancemamager.ITrajectoryListener
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt

@@ -7,12 +7,11 @@ 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.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 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.ToastUtils
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerBaseRespBean
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt

@@ -21,7 +21,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.distancemamager.IDistanceListener
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.loopmanager.BizLoopManager
@@ -34,7 +34,6 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
-import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_DRIVE_TO_END
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_NONE
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_VIRTUAL
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt

@@ -7,12 +7,10 @@ import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.och.common.module.manager.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager
-import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
-import com.mogo.och.taxi.passenger.model.AutopilotManager
 import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
 import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment