Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java

@@ -90,12 +90,6 @@ public class EventDispatchCenter implements
         return false;
     }
 
-
-    @Override
-    public void onCarLocationChanged( MogoLatLng latLng ) {
-        // do nothing.
-    }
-
     @Override
     public void onCarLocationChanged2( Location latLng ) {
 
@@ -112,15 +106,6 @@ public class EventDispatchCenter implements
                 } catch ( Exception e ) {
                     e.printStackTrace();
                 }
-            } else {
-                try {
-                    if ( target == null ) {
-                        target = new MogoLatLng( latLng.getLatitude(), latLng.getLongitude() );
-                    }
-                    listener.onCarLocationChanged( target );
-                } catch ( Exception e ) {
-                    e.printStackTrace();
-                }
             }
         }
     }

modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java

@@ -8,11 +8,6 @@ package com.mogo.module.main.constants;
  */
 public class MainConstants {
 
-    /**
-     * 消息：加载卡片模块
-     */
-    public static final int MSG_LOAD_CARD_MODULES = 5000;
-
     /**
      * 消息：隐藏地图遮罩（避免地图加载白屏）
      */

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -639,11 +639,6 @@ public class MogoServices implements IMogoMapListener,
         }
     }
 
-    @Override
-    public void onCarLocationChanged( MogoLatLng latLng ) {
-
-    }
-
     /**
      * 刷新数据
      */

modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java

@@ -208,10 +208,6 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener<Dispatch
         mogoLocation = loc;
     }
 
-    @Override
-    public void onCarLocationChanged(MogoLatLng mogoLatLng) {
-
-    }
 
     @Override
     public void onCheck(boolean isChecked) {

modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java

@@ -112,13 +112,20 @@ public class MogoRouteOverlayManager implements
 
     @Override
     public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) {
+        if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData ){
+            return;
+        }
         this.STATUS_AUTOPILOT = autoPilotStatusInfo.getControl_pilotmode();
         //Log.d("lianglihui","onAutopilotStatusResponse:"+STATUS_AUTOPILOT);
-        if (STATUS_AUTOPILOT == 1 ){
+//        if (STATUS_AUTOPILOT == 1 ){
 //            if (mEnding != null){
 //                RouteOverlayDrawer.getInstance(mContext).addEndingMarker(mEnding.lat,mEnding.lon);
 //            }
-        }else {
+//        }else {
+//
+//        }我
+
+        if ( STATUS_AUTOPILOT != 1){
             RouteOverlayDrawer.getInstance(mContext).clearEndingMarker();
             RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay();
         }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java

@@ -81,11 +81,6 @@ public class V2XLocationListener
         return mV2XLocationListener;
     }
 
-    @Override
-    public void onCarLocationChanged(MogoLatLng latLng) {
-        // do not impl
-    }
-
     @Override
     public void onCarLocationChanged2(Location location) {
         MogoLocation loc = new MogoLocation();