Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0

 Conflicts:

	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java

	app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java

	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java

OCH/mogo-och-bus-passenger/build.gradle

@@ -52,12 +52,8 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxconstraintlayout
     implementation rootProject.ext.dependencies.amapnavi3dmap
     implementation project(":OCH:mogo-och-common-module")
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_function_v2x
-    }else {
-        implementation project(':foudations:mogo-aicloud-services-sdk')
-        implementation project(':core:function-impl:mogo-core-function-v2x')
-    }
+    compileOnly project(":libraries:mogo-map")
+
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java

@@ -1,15 +1,13 @@
 package com.mogo.och.bus.passenger;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
+
 import android.content.Context;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.module.status.IMogoStatusChangedListener;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.module.status.StatusDescriptor;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
@@ -18,17 +16,13 @@ import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
-
-import java.util.Objects;
-
 /**
  * 网约车-Bus-乘客端
  *
  * Created on 2022/3/29
  */
 @Route(path = BusPassengerConst.PATH)
-public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener {
+public class MogoOCHBusPassenger implements IMogoOCH {
     private static final String TAG = MogoOCHBusPassenger.class.getSimpleName();
 
     private FragmentActivity mActivity;
@@ -45,8 +39,7 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
     public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) {
         this.mActivity = activity;
         this.mContainerId = containerId;
-
-//        UiThreadHandler.post(() -> stepIntoVrMode());
+        showFragment();
         return null;
     }
 
@@ -65,18 +58,6 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
 
     @Override
     public void init(Context context) {
-        MogoStatusManager.getInstance().registerStatusChangedListener("OchBus",StatusDescriptor.VR_MODE, this);
-    }
-
-    @Override
-    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            if (isTrue){
-                showFragment();
-            }else {
-                hideFragment();
-            }
-        }
     }
 
     /**
@@ -84,7 +65,6 @@ public class MogoOCHBusPassenger implements IMogoOCH, IMogoStatusChangedListener
      */
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "进入vr模式" );
-        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(true); // 白天模式
         CallerMoGoUiSettingManager.INSTANCE.stepInDayMode();//白天模式 状态栏字体颜色变黑
     }
 

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

@@ -29,7 +29,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
@@ -272,7 +272,7 @@ public class BusPassengerModel {
         IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener );
         MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener );
         // 定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, mMapLocationListener);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, mMapLocationListener);
 
         //2021.11.1 自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.INSTANCE.addListener(TAG,moGoAutopilotPlanningListener);
@@ -284,7 +284,7 @@ public class BusPassengerModel {
         MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
         // 注销定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
 
         MogoAiCloudSocketManager.getInstance(mContext)
                 .unregisterLifecycleListener(10010);

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java

@@ -8,6 +8,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.core.widget.ContentLoadingProgressBar;
 
 import com.mogo.commons.mvp.IView;
@@ -15,14 +16,13 @@ import com.mogo.commons.mvp.MvpFragment;
 
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
+import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
-import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 
 /**
  * Created on 2022/3/31
@@ -32,6 +32,7 @@ import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 public abstract class BusPassengerBaseFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> {
     private static final String TAG = BusPassengerBaseFragment.class.getSimpleName();
 
+    private MapBizView mapBizView;
     private TextView mCurrentArriveStation;
     private TextView mCurrentArriveStationTitle;
     private TextView mCurrentArriveTip;
@@ -56,12 +57,12 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
         return TAG;
     }
 
-
     @Override
     protected void initViews() {
         //隐藏小地图
         CallerSmpManager.INSTANCE.hidePanel();
 
+        mapBizView = findViewById(R.id.mapBizView);
         mCurrentArriveStation = findViewById(R.id.bus_p_cur_station_name);
         mCurrentArriveStationTitle = findViewById(R.id.bus_p_cur_station_title);
         mCurrentArriveTip = findViewById(R.id.bus_p_cur_station_tip);
@@ -83,6 +84,37 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     @Override
     protected void initViews(Bundle savedInstanceState) {
         super.initViews(savedInstanceState);
+        mapBizView.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mapBizView.onResume();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapBizView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapBizView.onLowMemory();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapBizView.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        mapBizView.onDestroy();
+        super.onDestroyView();
     }
 
     /**
@@ -186,11 +218,9 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     }
 
     public void showOverviewFragment() {
-        CallerHmiManager.INSTANCE.showSmallFragment();
         UiThreadHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                CallerHmiManager.INSTANCE.hideSmallFragment();
             }
         },5000L);
     }

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java

@@ -29,7 +29,7 @@ import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.callback.IBusPassengerMapViewCallback;
@@ -103,14 +103,14 @@ public class BusPassengerMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt

@@ -6,8 +6,8 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.bus.passenger.R
 import kotlinx.android.synthetic.main.bus_p_traffic_light_view.view.*

OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml

@@ -4,6 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="@dimen/dp_1860"
+        android:layout_height="match_parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_490"
@@ -26,6 +34,20 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
+    <!--浓雾预警动画-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <!--刹车、转向-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
+        android:layout_width="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:day_light_mode="true"
+        android:layout_height="wrap_content"/>
+
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
         android:layout_width="wrap_content"

OCH/mogo-och-bus/build.gradle

@@ -51,11 +51,12 @@ dependencies {
 
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.androidxrecyclerview
     compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper
 
     implementation project(":OCH:mogo-och-common-module")
+    compileOnly project(":libraries:mogo-map")
 
-    implementation rootProject.ext.dependencies.androidxrecyclerview
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java

@@ -10,10 +10,8 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.module.status.IMogoStatusChangedListener;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.module.status.StatusDescriptor;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.fragment.BusFragment;
@@ -21,8 +19,6 @@ import com.mogo.och.bus.fragment.BusFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 /**
  * 网约车小巴业务实现入口
  *
@@ -42,13 +38,11 @@ public class BusProvider implements IMogoOCH {
      */
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d(M_BUS + TAG, "进入vr模式");
-        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(false);
+        CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑
     }
 
     @Override
     public void init(Context context) {
-        MogoStatusManager.getInstance().registerStatusChangedListener("OchBus"
-                , StatusDescriptor.VR_MODE, statusChangedListener);
     }
 
     private void showFragment() {
@@ -78,22 +72,6 @@ public class BusProvider implements IMogoOCH {
 
     }
 
-    private final IMogoStatusChangedListener statusChangedListener = (descriptor, isTrue) -> {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            // 进入vr模式默认显示网约车小巴fragment
-            if (isTrue) {
-                showFragment();
-            } else {
-                hideFragment();
-            }
-        } else if (MogoStatusManager.getInstance().isVrMode()) {
-            // topView进行展示时推出网约车界面，但是不隐藏整个fragment
-            if (busFragment != null && isTrue) {
-                busFragment.hideOchBus();
-            }
-        }
-    };
-
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
 
@@ -108,19 +86,15 @@ public class BusProvider implements IMogoOCH {
     @Nullable
     @Override
     public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
-
         this.containerId = integer;
         this.activity = fragmentActivity;
-
-//        UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
+        showFragment();
         return null;
     }
 
     @Override
     public void onDestroy() {
         //若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        MogoStatusManager.getInstance().unregisterStatusChangedListener("OchBus"
-                , StatusDescriptor.VR_MODE, statusChangedListener);
         if (activity == null) return;
         activity.finish();
     }

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java

@@ -22,6 +22,7 @@ import androidx.constraintlayout.widget.Group;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
@@ -29,13 +30,17 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 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.call.map.CallerVisualAngleManager;
 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;
 import com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView;
+import com.mogo.eagle.core.function.smp.view.SmallMapView;
+import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.map.MogoMapUIController;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.uicontroller.IMogoMapUIController;
@@ -49,6 +54,8 @@ import com.mogo.och.common.module.utils.SoundPoolHelper;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.Objects;
+
 import mogo.telematics.pad.MessagePad;
 import record_cache.RecordPanelOuterClass;
 
@@ -72,6 +79,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     protected RelativeLayout mBadcaseBtn;
     protected RelativeLayout mAICollectBtn;
     private FrameLayout flStationPanelContainer;
+    private MapBizView mapBizView;
     private Group groupTestPanel;
     private TrafficDataView mTrafficDataView;
     // private BusTrafficLightView mTrafficLightView;
@@ -80,6 +88,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     private ImageView mSwitchMapModeImage;
     private LinearLayout mSwitchMapModeLayout;
 
+    protected SmallMapView smallMapView;
+
     //消息盒子
     private DriverMsgBoxButtonView viewDriverMsgBoxButton;
     private DriverMsgBoxListView viewDriverMsgBoxList;
@@ -106,6 +116,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
     @Override
     protected void initViews() {
+        mapBizView = findViewById(R.id.mapBizView);
         groupTestPanel = findViewById(R.id.groupTestPanel);
         slidePanelView = findViewById(R.id.module_mogo_och_slide_panel);
         ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status);
@@ -135,10 +146,18 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                 if (controller != null) {
                     //切换地图的远近视图
                     if (controller.getCurrentMapVisualAngle().isLongSight()) {
+                        CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                         controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                     } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
+                        if (FunctionBuildConfig.isRomaMode) {
+                            controller.setRomaMode(1);
+                        } else {
+                            Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                            controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        }
                         mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
                     } else {
                         controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
@@ -218,6 +237,22 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                 viewDriverMsgBoxBubble.isShowData(true);
             }
         });
+
+        smallMapView = findViewById(R.id.smallMapView);
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mapBizView.onCreate(savedInstanceState);
+        smallMapView.onCreateView(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mapBizView.onResume();
+        smallMapView.onResume();
     }
 
     @Nullable
@@ -247,14 +282,33 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         BDRouteDataTestUtils.converToRouteData();
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapBizView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapBizView.onLowMemory();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapBizView.onPause();
+        smallMapView.onPause();
+    }
+
     @Override
     public void onDestroyView() {
+        mapBizView.onDestroy();
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
         EventBus.getDefault().unregister(this);
     }
 
-
     @Override
     public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
 //        if (!HmiBuildConfig.isShowBadCaseView && recordPanel != null && recordPanel.getType() == 1 && recordPanel.getStat() == 100) {
@@ -266,7 +320,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
     }
 
-
     /**
      * 测试到站
      */
@@ -500,6 +553,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     @Override
     public void onDestroy() {
         super.onDestroy();
+        smallMapView.onDestroy();
         MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG);
     }
 

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -18,7 +18,6 @@ import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -435,7 +434,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         }
 
         //清除鹰眼右下角小地图轨迹
-        CallerSmpManager.clearPolyline();
+        smallMapView.clearPolyline();
     }
 
     /**
@@ -471,7 +470,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                         .latitude(lat)
                         .longitude(longi);
                 IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(
                         longi,lat,-1);
                 if (null != centerLine && marker != null) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空
                     marker.setRotateAngle(centerLine.getAngle().floatValue());

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java

@@ -30,7 +30,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 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.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
@@ -151,7 +151,7 @@ public class BusOrderModel {
         mContext = AbsMogoApplication.getApp();
         loginService = (LoginService) ARouter.getInstance().build(OchCommonConst.LOGINSERVICE).navigation();
         // 定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, mMapLocationListener);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, mMapLocationListener);
 
         MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
@@ -331,7 +331,7 @@ public class BusOrderModel {
         MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
         // 注销定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
 
         //自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener);

OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml

@@ -5,32 +5,60 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
-        <FrameLayout
-            android:id="@+id/fl_speed"
-            android:layout_width="@dimen/dp_616"
-            android:layout_height="@dimen/dp_320"
-            android:layout_marginLeft="@dimen/dp_13"
-            android:layout_marginTop="@dimen/dp_40"
-            android:visibility="visible"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <FrameLayout
+        android:id="@+id/fl_speed"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_320"
+        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginTop="@dimen/dp_40"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView
             android:id="@+id/bus_arc"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
 
     </FrameLayout>
 
+    <!--浓雾预警动画-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <!--V2X预警红色边框-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!--刹车、转向-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <!--Vip车辆标志-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
         android:layout_width="@dimen/module_vip_width"
         android:layout_height="@dimen/module_vip_height"
+        android:layout_marginStart="@dimen/dp_640"
+        android:layout_marginTop="@dimen/dp_80"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="@dimen/dp_640"
-        android:layout_marginTop="@dimen/dp_80"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
@@ -77,7 +105,7 @@
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <!--消息盒子选择入口-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView
@@ -87,8 +115,7 @@
         android:layout_marginTop="15dp"
         android:layout_marginEnd="25dp"
         app:layout_constraintRight_toLeftOf="@id/viewLimitingVelocity"
-        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon" />
     <!--消息盒子打开视图-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView
         android:id="@+id/viewDriverMsgBoxList"
@@ -143,12 +170,12 @@
         android:id="@+id/module_mogo_och_autopilot_status"
         android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height"
-        app:layout_constraintTop_toBottomOf="@+id/fl_speed"
-        android:background="@drawable/bus_autopilot_status_bg"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_13"
+        android:background="@drawable/bus_autopilot_status_bg"
         android:gravity="center"
-        tools:visibility="visible" >
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fl_speed"
+        tools:visibility="visible">
 
         <ImageView
             android:id="@+id/bus_autopilot_btn_iv"
@@ -175,74 +202,74 @@
         android:id="@+id/module_mogo_och_station_panel_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_13"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
 
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
+        layout="@layout/bus_test_bar_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/bus_test_bar_view"
         android:visibility="visible"
-        app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
         app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_station_panel_container"
-        tools:visibility="visible"/>
+        app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
+        tools:visibility="visible" />
 
     <!--切换地图远近事件 @dimen/module_switch_map -->
-        <LinearLayout
-            android:id="@+id/bus_switch_model_layout"
-            android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
-            android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
-            android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
-            app:layout_goneMarginBottom="@dimen/module_mogo_och_margin_bottom"
-            app:layout_goneMarginLeft="@dimen/module_mogo_och_margin_left"
-            android:background="@drawable/bus_switch_map_bg"
-            android:elevation="@dimen/bus_dp_10"
-            android:padding="@dimen/bus_dp_20"
-            app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_arrived_tv"
-            app:layout_constraintLeft_toRightOf="@+id/module_mogo_och_arrived_tv"
-            android:gravity="center"
-            android:orientation="horizontal">
+    <LinearLayout
+        android:id="@+id/bus_switch_model_layout"
+        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
+        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
+        android:background="@drawable/bus_switch_map_bg"
+        android:elevation="@dimen/bus_dp_10"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="@dimen/bus_dp_20"
+        app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_arrived_tv"
+        app:layout_constraintLeft_toRightOf="@+id/module_mogo_och_arrived_tv"
+        app:layout_goneMarginBottom="@dimen/module_mogo_och_margin_bottom"
+        app:layout_goneMarginLeft="@dimen/module_mogo_och_margin_left">
 
-            <ImageView
-                android:id="@+id/bus_switch_model_icon"
-                android:layout_width="@dimen/dp_60"
-                android:layout_height="60dp" />
-        </LinearLayout>
-<!--    <CheckedTextView-->
-<!--        android:id="@+id/module_mogo_och_operation_status"-->
-<!--        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->
-<!--        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"-->
-<!--        android:background="@drawable/bus_operation_status_bg"-->
-<!--        android:elevation="@dimen/dp_10"-->
-<!--        android:gravity="center"-->
-<!--        android:text="出车"-->
-<!--        android:textAlignment="center"-->
-<!--        android:textColor="@color/bus_autopilot_text_color_selector"-->
-<!--        android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"-->
-<!--        android:textStyle="bold"-->
-<!--        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"-->
-<!--        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"/>-->
+        <ImageView
+            android:id="@+id/bus_switch_model_icon"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="60dp" />
+    </LinearLayout>
+    <!--    <CheckedTextView-->
+    <!--        android:id="@+id/module_mogo_och_operation_status"-->
+    <!--        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"-->
+    <!--        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"-->
+    <!--        android:background="@drawable/bus_operation_status_bg"-->
+    <!--        android:elevation="@dimen/dp_10"-->
+    <!--        android:gravity="center"-->
+    <!--        android:text="出车"-->
+    <!--        android:textAlignment="center"-->
+    <!--        android:textColor="@color/bus_autopilot_text_color_selector"-->
+    <!--        android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"-->
+    <!--        android:textStyle="bold"-->
+    <!--        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"-->
+    <!--        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintLeft_toLeftOf="parent"/>-->
 
     <TextView
         android:id="@+id/module_mogo_och_arrived_tv"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
+        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/bus_operation_status_bg_selector"
         android:elevation="@dimen/dp_10"
-        android:text="@string/bus_arrived_str"
         android:gravity="center"
+        android:text="@string/bus_arrived_str"
         android:textColor="@color/bus_autopilot_text_color_selector"
         android:textSize="@dimen/module_mogo_och_arrived_text_size"
         android:textStyle="bold"
-        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
-        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <RelativeLayout
         android:id="@+id/module_mogo_och_setting_layout"
@@ -254,6 +281,7 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/bus_switch_model_layout">
+
         <ImageView
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
@@ -287,8 +315,8 @@
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:elevation="@dimen/dp_10"
         android:background="@drawable/bus_operation_status_bg_selector"
+        android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl">
 
@@ -378,4 +406,15 @@
         ,btnAutopilotRunning,btnAutopilotRoute"
         tools:visibility="visible" />
 
+    <com.mogo.eagle.core.function.smp.view.SmallMapView
+        android:id="@+id/smallMapView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="30dp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-common-module/build.gradle

@@ -60,19 +60,17 @@ dependencies {
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         api rootProject.ext.dependencies.mogoutils
         api rootProject.ext.dependencies.mogocommons
-        api rootProject.ext.dependencies.mogo_core_data
         api rootProject.ext.dependencies.mogo_core_function_call
-        implementation rootProject.ext.dependencies.mogo_core_function_v2x
         api rootProject.ext.dependencies.mogo_core_function_hmi
+        api rootProject.ext.dependencies.mogo_core_function_map
     }else {
         api project(":core:mogo-core-utils")
         api project(":foudations:mogo-commons")
-        api project(':core:mogo-core-data')
         api project(':core:mogo-core-function-call')
-        implementation project(':core:function-impl:mogo-core-function-v2x')
         api project(':core:function-impl:mogo-core-function-hmi')
+        api project(':core:function-impl:mogo-core-function-map')
     }
 
-    implementation project(':libraries:mogo-adas')
+    compileOnly project(':libraries:mogo-adas')
 
 }

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
 import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -36,7 +36,7 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
     fun init(context: Context) {
         mContext = context.applicationContext
         // 达到起始站围栏监听
-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
     }
 
     fun hasInit(): Boolean {
@@ -65,7 +65,7 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
         mContext = null
         iTaxiLoginCallback = null
         // 注销到达起始站围栏监听
-        CallerChassisLocationGCJ20ListenerManager.removeListener(TAG)
+        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
     }
 
     /**

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

@@ -4,12 +4,10 @@ import android.content.Context;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager;
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
 import com.zhidao.support.adas.high.bean.AutopilotStatistics;

OCH/mogo-och-noop/build.gradle

@@ -60,7 +60,6 @@ dependencies {
     }else {
         implementation project(":core:mogo-core-utils")
         implementation project(":foudations:mogo-commons")
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:function-impl:mogo-core-function-hmi')
     }

OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml

@@ -16,7 +16,6 @@
 
     <!--V2X预警红色边框-->
     <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
-        android:id="@+id/flV2XWarningView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -39,6 +38,13 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <!--Vip车辆标志-->
         <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
             android:layout_width="@dimen/module_vip_width"

OCH/mogo-och-sweeper/build.gradle

@@ -51,10 +51,11 @@ dependencies {
 
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.androidxrecyclerview
 
     implementation project(":OCH:mogo-och-common-module")
+    compileOnly project(":libraries:mogo-map")
 
-    implementation rootProject.ext.dependencies.androidxrecyclerview
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java

@@ -1,6 +1,5 @@
 package com.mogo.och.sweeper;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 
 import android.content.Context;
 
@@ -8,10 +7,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.module.status.IMogoStatusChangedListener;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.module.status.StatusDescriptor;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.sweeper.constant.SweeperConst;
 import com.mogo.och.sweeper.fragment.SweeperFragment;
@@ -19,8 +14,6 @@ import com.mogo.och.sweeper.fragment.SweeperFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 /**
  * 清扫车业务实现入口
  *
@@ -35,19 +28,8 @@ public class SweeperProvider implements IMogoOCH {
     private int containerId;
     private FragmentActivity activity;
 
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private void stepIntoVrMode(){
-        CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" );
-        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController())
-                .stepInVrMode(false);
-    }
-
     @Override
     public void init(Context context) {
-        MogoStatusManager.getInstance().registerStatusChangedListener("OchSweeper"
-                , StatusDescriptor.VR_MODE, statusChangedListener);
     }
 
     private void showFragment() {
@@ -69,22 +51,6 @@ public class SweeperProvider implements IMogoOCH {
 
     }
 
-    private final IMogoStatusChangedListener statusChangedListener = (descriptor, isTrue) -> {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            // 进入vr模式默认显示网约车小巴fragment
-            if (isTrue) {
-                showFragment();
-            } else {
-                hideFragment();
-            }
-        } else if (MogoStatusManager.getInstance().isVrMode()) {
-            // topView进行展示时推出网约车界面，但是不隐藏整个fragment
-            if (sweeperFragment != null && isTrue) {
-                sweeperFragment.hideOchSweeper();
-            }
-        }
-    };
-
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
 
@@ -99,11 +65,9 @@ public class SweeperProvider implements IMogoOCH {
     @Nullable
     @Override
     public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
-
         this.containerId = integer;
         this.activity = fragmentActivity;
-
-//        UiThreadHandler.postDelayed(this::stepIntoVrMode, 5_000L );
+        showFragment();
         return null;
     }
 

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

@@ -5,6 +5,7 @@ import static com.mogo.och.sweeper.constant.SweeperConst.TIMER_START_AUTOPILOT_I
 
 import android.animation.ObjectAnimator;
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -31,6 +32,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 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.smp.view.SmallMapView;
+import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -71,6 +74,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     protected RelativeLayout mAICollectBtn;
     public boolean isOperationStatus;//false-收车，true-出车
     private FrameLayout flStationPanelContainer;
+    private MapBizView mapBizView;
     private Group groupTestPanel;
     private FrameLayout flSpeed;
     //    private BusArcView mouduleArc;
@@ -82,6 +86,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     private ImageView mSwitchMapModeImage;
     private LinearLayout mSwitchMapModeLayout;
 
+    private SmallMapView smallMapView;
+
     private ObjectAnimator autopilotLoadingAnimator;
 
     public boolean isAnimateRunning = false;
@@ -105,6 +111,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
 
     @Override
     protected void initViews() {
+        mapBizView = findViewById(R.id.mapBizView);
         groupTestPanel = findViewById(R.id.groupTestPanel);
         slidePanelView = findViewById(R.id.module_mogo_och_slide_panel);
         ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status);
@@ -220,6 +227,8 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         if (mAICollectBtn != null) {
             CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
         }
+
+        smallMapView = findViewById(R.id.smallMapView);
     }
 
     private void updateSwitchMapIcon() {
@@ -235,17 +244,49 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
         }
     }
 
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mapBizView.onCreate(savedInstanceState);
+        smallMapView.onCreateView(savedInstanceState);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        smallMapView.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mapBizView.onResume();
+        smallMapView.onResume();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapBizView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapBizView.onLowMemory();
+    }
+
     private void debugArrivedRoute() {
         BDRouteDataTestUtils.converToRouteData();
     }
 
     @Override
     public void onDestroyView() {
+        mapBizView.onDestroy();
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
     }
 
-
     @Override
     public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
 //        if (!HmiBuildConfig.isShowBadCaseView && recordPanel != null && recordPanel.getType() == 1 && recordPanel.getStat() == 100) {
@@ -495,6 +536,7 @@ public abstract class BaseSweeperTabFragment<V extends IView, P extends Presente
     @Override
     public void onDestroy() {
         super.onDestroy();
+        smallMapView.onDestroy();
         MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG);
     }
 

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java

@@ -14,7 +14,6 @@ import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
@@ -356,7 +355,7 @@ public class SweeperFragment extends BaseSweeperTabFragment<SweeperFragment, Swe
                         .latitude(lat)
                         .longitude(longi);
                 IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(
                         longi, lat, -1);
                 if (null != centerLine) { // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致
                     marker.setRotateAngle(centerLine.getAngle().floatValue());

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java

@@ -24,7 +24,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 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.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
@@ -123,7 +123,7 @@ public class SweeperOrderModel {
     public void init() {
         mContext = AbsMogoApplication.getApp();
         // 定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG,mMapLocationListener);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG,mMapLocationListener);
 
         MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
@@ -248,7 +248,7 @@ public class SweeperOrderModel {
         startOrStopOrderLoop(false);
         MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
         // 注销定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
 
         //自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener);

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt

@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG
 import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.och.sweeper.R
 import kotlinx.android.synthetic.main.sweeper_limiting_speed.view.*
 
@@ -29,7 +29,7 @@ class SweeperLimitingVelocityView(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        CallerViewLimitingVelocityListenerManager.addListener(TAG, this)
+        CallerLimitingVelocityListenerManager.addListener(TAG, this)
         CallerHmiViewControlListenerManager.addListener(LimitingVelocityView_TAG, this)
     }
 
@@ -49,7 +49,7 @@ class SweeperLimitingVelocityView(
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        CallerViewLimitingVelocityListenerManager.removeListener(TAG)
+        CallerLimitingVelocityListenerManager.removeListener(TAG)
         CallerHmiViewControlListenerManager.removeListener(LimitingVelocityView_TAG)
     }
 

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt

@@ -6,8 +6,8 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.sweeper.R
 import kotlinx.android.synthetic.main.sweeper_traffic_light_view.view.*

OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml

@@ -5,33 +5,55 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
-        <FrameLayout
-            android:id="@+id/fl_speed"
-            android:layout_width="@dimen/dp_616"
-            android:layout_height="@dimen/dp_320"
-            android:layout_marginLeft="@dimen/dp_13"
-            android:layout_marginTop="@dimen/dp_40"
-            android:visibility="visible"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
 
-            <com.mogo.och.sweeper.view.SweeperTrafficDataView
-                android:id="@+id/sweeper_arc"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
 
-        </FrameLayout>
+    <FrameLayout
+        android:id="@+id/fl_speed"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_320"
+        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginTop="@dimen/dp_40"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
+        <com.mogo.och.sweeper.view.SweeperTrafficDataView
+            android:id="@+id/sweeper_arc"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+    <!--V2X预警红色边框-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!--刹车、转向-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--Vip车辆标志-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
         android:layout_width="@dimen/module_vip_width"
         android:layout_height="@dimen/module_vip_height"
+        android:layout_marginStart="@dimen/dp_640"
+        android:layout_marginTop="@dimen/dp_80"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="@dimen/dp_640"
-        android:layout_marginTop="@dimen/dp_80"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
@@ -76,12 +98,12 @@
         android:id="@+id/module_mogo_och_autopilot_status"
         android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height"
-        app:layout_constraintTop_toBottomOf="@+id/fl_speed"
-        android:background="@drawable/sweeper_autopilot_status_bg"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_13"
+        android:background="@drawable/sweeper_autopilot_status_bg"
         android:gravity="center"
-        tools:visibility="visible" >
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fl_speed"
+        tools:visibility="visible">
 
         <ImageView
             android:id="@+id/sweeper_autopilot_btn_iv"
@@ -108,8 +130,8 @@
         android:id="@+id/module_mogo_och_station_panel_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_13"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
         tools:visibility="visible" />
@@ -118,8 +140,8 @@
         android:id="@+id/module_mogo_och_sweeper_operate_panel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_24"
         android:layout_marginStart="@dimen/dp_8"
+        android:layout_marginTop="@dimen/dp_24"
         app:layout_constraintLeft_toRightOf="@id/fl_speed"
         app:layout_constraintTop_toTopOf="@id/fl_speed"
         tools:background="#f00"
@@ -127,40 +149,43 @@
 
     <include
         android:id="@+id/module_mogo_och_sweeper_test_bar"
+        layout="@layout/sweeper_test_bar_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/sweeper_test_bar_view"
         android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
         app:layout_constraintLeft_toLeftOf="@id/module_mogo_och_station_panel_container"
-        tools:visibility="visible"/>
+        app:layout_constraintTop_toBottomOf="@id/module_mogo_och_station_panel_container"
+        tools:visibility="visible" />
 
     <!--切换地图远近事件 @dimen/module_switch_map -->
-        <LinearLayout
-            android:id="@+id/sweeper_switch_model_layout"
-            android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
-            android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
-            android:background="@drawable/sweeper_switch_map_bg"
-            android:elevation="@dimen/sweeper_dp_10"
-            android:padding="@dimen/sweeper_dp_20"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
-            android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-            android:gravity="center"
-            android:orientation="horizontal">
+    <LinearLayout
+        android:id="@+id/sweeper_switch_model_layout"
+        android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
+        android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
+        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
+        android:background="@drawable/sweeper_switch_map_bg"
+        android:elevation="@dimen/sweeper_dp_10"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="@dimen/sweeper_dp_20"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent">
+
+        <ImageView
+            android:id="@+id/sweeper_switch_model_icon"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_80"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center" />
+    </LinearLayout>
 
-            <ImageView
-                android:id="@+id/sweeper_switch_model_icon"
-                android:layout_width="@dimen/dp_80"
-                android:layout_height="@dimen/dp_80"
-                android:layout_centerInParent="true"
-                android:layout_gravity="center" />
-        </LinearLayout>
     <CheckedTextView
         android:id="@+id/module_mogo_och_operation_status"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
+        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
+        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
         android:background="@drawable/sweeper_operation_status_bg"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
@@ -169,11 +194,9 @@
         android:textColor="@color/sweeper_autopilot_text_color_selector"
         android:textSize="@dimen/module_mogo_och_autopilot_status_text_size"
         android:textStyle="bold"
-        android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
-        android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:visibility="gone"/>
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <RelativeLayout
         android:id="@+id/module_mogo_och_setting_layout"
@@ -185,6 +208,7 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/sweeper_switch_model_layout">
+
         <ImageView
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
@@ -203,12 +227,13 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout">
+
         <ImageView
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:src="@drawable/bad_case_selector"/>
+            android:src="@drawable/bad_case_selector" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -217,8 +242,8 @@
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:elevation="@dimen/dp_10"
         android:background="@drawable/sweeper_operation_status_bg_selector"
+        android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl">
 
@@ -246,8 +271,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:textSize="@dimen/module_mogo_och_slide_panel_textSize"
-        tools:visibility="visible"
-        />
+        tools:visibility="visible" />
 
     <Button
         android:id="@+id/btnAutopilotDisable"
@@ -288,6 +312,7 @@
         android:textSize="30sp"
         app:layout_constraintRight_toRightOf="@id/btnAutopilotDisable"
         app:layout_constraintTop_toBottomOf="@id/btnAutopilotRunning" />
+
     <Button
         android:id="@+id/btnAutopilotRoute"
         android:layout_width="wrap_content"
@@ -307,4 +332,15 @@
         ,btnAutopilotRunning,btnAutopilotRoute"
         tools:visibility="visible" />
 
+    <com.mogo.eagle.core.function.smp.view.SmallMapView
+        android:id="@+id/smallMapView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="30dp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

OCH/mogo-och-taxi-passenger/build.gradle

@@ -55,11 +55,8 @@ dependencies {
     implementation rootProject.ext.dependencies.amapsearch
 
     implementation project(":OCH:mogo-och-common-module")
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_function_v2x
-    }else {
-        implementation project(':core:function-impl:mogo-core-function-v2x')
-    }
+    compileOnly project(":libraries:mogo-map")
+
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java

@@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.module.status.IMogoStatusChangedListener;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.module.status.StatusDescriptor;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
 import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment;
@@ -19,8 +19,6 @@ import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public
 /**
  * @author congtaowang
@@ -29,7 +27,7 @@ public
  * 网约车-出租车-乘客端
  */
 @Route(path = TaxiPassengerConst.PATH)
-class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
+class MogoOCHTaxiPassenger implements IMogoOCH {
 
     private static final String TAG = "MogoOCHTaxiPassenger";
     private TaxiPassengerBaseFragment ochTaxiPassengerFragment;
@@ -39,7 +37,6 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
     @Override
     public void init(Context context) {
         CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "init");
-        MogoStatusManager.getInstance().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE, this);
     }
 
     /**
@@ -47,8 +44,7 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
      */
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "进入vr模式");
-        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController())
-                .stepInVrMode(false);
+        CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑
     }
 
     private void showFragment() {
@@ -68,17 +64,6 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
         }
     }
 
-    @Override
-    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            if (isTrue) {
-                showFragment();
-            } else {
-                hideFragment();
-            }
-        }
-    }
-
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
 
@@ -95,15 +80,13 @@ class MogoOCHTaxiPassenger implements IMogoOCH, IMogoStatusChangedListener {
     public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
         this.mActivity = fragmentActivity;
         this.mContainerId = integer;
-
-//        UiThreadHandler.postDelayed(() -> stepIntoVrMode(), 5_000L);
+        showFragment();
         return null;
     }
 
     @Override
     public void onDestroy() {
 //        若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        MogoStatusManager.getInstance().unregisterStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE, this);
         if (mActivity == null) return;
         mActivity.finish();
     }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerGeocodeSearchModel.java

@@ -1,5 +1,7 @@
 package com.mogo.och.taxi.passenger.model;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
+
 import android.content.Context;
 
 import com.amap.api.services.core.AMapException;
@@ -17,8 +19,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P;
-
 /**
  * @author: wangmingjun
  * @date: 2021/12/6

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

@@ -34,7 +34,7 @@ import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener;
 import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener;
 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.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager;
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager;
@@ -241,7 +241,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         IntentManager.getInstance().registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener );
         MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
         // 定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG,mMapLocationListener);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG,mMapLocationListener);
 
         //2021.11.1 自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.INSTANCE.addListener(TAG,moGoAutopilotPlanningListener);
@@ -261,7 +261,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
         // 注销定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
 
         MogoAiCloudSocketManager.getInstance(mContext)
                 .unregisterLifecycleListener(10010);
@@ -713,6 +713,11 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
      */
     private final ILimitingVelocityListener limitingVelocityListener = new ILimitingVelocityListener(){
 
+        @Override
+        public void onUnion(int limitingVelocity, @NonNull DataSourceType sourceType) {
+
+        }
+
         @Override
         public void onLimitingVelocityChange(int limitingVelocity, DataSourceType dataSourceType) {
             if (mVeloctityCallback != null){

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt

@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.mogo.commons.mvp.BaseFragment
-import com.mogo.eagle.core.function.overview.view.OverMapView
+import com.mogo.eagle.core.function.view.OverMapView
 
 class OverviewFragment : BaseFragment() {
 
-    private var overmapview:OverMapView?=null
+    private var overmapview: OverMapView?=null
 
     override fun onCreateView(
         inflater: LayoutInflater,

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java

@@ -14,14 +14,16 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.mvp.MvpFragment;
+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.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
+import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxListView;
+import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.util.OverlayViewUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
@@ -40,6 +42,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 
 
 /**
@@ -54,6 +57,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
     static final String TAG = "TaxiPassengerBaseFragment";
 
+    private MapBizView mapBizView;
     private ImageView mAutopilotImage;
     private ImageView mMapswitchBtn;
 
@@ -92,6 +96,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
         hideEagleConfig();
 
+        mapBizView = findViewById(R.id.mapBizView);
         mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
         updateSwitchMapIcon();
@@ -120,6 +125,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         });
     }
 
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mapBizView.onCreate(savedInstanceState);
+    }
+
     private void updateSwitchMapIcon() {
         IMogoMapUIController controller = CallerMapUIServiceManager.INSTANCE.getMapUIController();
         if (controller != null) {
@@ -139,10 +150,18 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             if (controller != null) {
                 //切换地图的远近视图
                 if (controller.getCurrentMapVisualAngle().isLongSight()) {
+                    CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
+                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                     controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
                 } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                    controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
+                    if (FunctionBuildConfig.isRomaMode) {
+                        controller.setRomaMode(1);
+                    } else {
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    }
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_long);
                 } else {
                     controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
@@ -180,6 +199,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     @Override
     public void onResume() {
         super.onResume();
+        mapBizView.onResume();
 //        mPresenter.startOrStopOrderLoop();
 //        showOrHideServingOrderFragment(true,false);
 //        showOrHideStartAutopilotView(true,true);
@@ -249,8 +269,27 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         return new BaseTaxiPassengerPresenter(this);
     }
 
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapBizView.onLowMemory();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapBizView.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapBizView.onPause();
+    }
+
     @Override
     public void onDestroyView() {
+        mapBizView.onDestroy();
         super.onDestroyView();
         EventBus.getDefault().unregister(this);
         removeListener();
@@ -321,7 +360,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
             }
             if (showOrHideLefeMenu) {
                 OverlayLeftViewUtils.INSTANCE.dismissOverlayView(true);
-                CallerHmiManager.INSTANCE.hideSmallFragment();
             }
         }
     }

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java

@@ -31,7 +31,7 @@ import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.callback.ITaxiPassengerMapViewCallback;
@@ -104,14 +104,14 @@ public class TaxiPassengerMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTrafficLightView.kt

@@ -6,8 +6,8 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxi_p_traffic_light_view.view.*

OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml

@@ -5,6 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
         android:layout_width="@dimen/dp_630"
@@ -27,6 +32,20 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--浓雾预警动画-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <!--刹车、转向-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
+        android:layout_width="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:day_light_mode="true"
+        android:layout_height="wrap_content"/>
+
     <!--pnc行为决策-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
         android:layout_width="wrap_content"

OCH/mogo-och-taxi/build.gradle

@@ -53,12 +53,8 @@ dependencies {
     implementation rootProject.ext.dependencies.amapnavi3dmap
 
     implementation project(":OCH:mogo-och-common-module")
+    compileOnly project(":libraries:mogo-map")
 
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_function_v2x
-    }else {
-        implementation project(':core:function-impl:mogo-core-function-v2x')
-    }
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java

@@ -8,10 +8,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.module.status.IMogoStatusChangedListener;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.module.status.StatusDescriptor;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.constant.TaxiConst;
 import com.mogo.och.taxi.ui.TaxiFragment;
@@ -19,8 +16,6 @@ import com.mogo.och.taxi.ui.TaxiFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public
 /**
  * @author congtaowang
@@ -29,7 +24,7 @@ public
  * 网约车-出租车
  */
 @Route( path = TaxiConst.PATH )
-class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
+class TaxiProvider implements IMogoOCH {
 
     private static final String TAG = "TaxiProvider";
     private TaxiFragment ochTaxiFragment;
@@ -38,7 +33,6 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
     @Override
     public void init( Context context ) {
         CallerLogger.INSTANCE.d( M_TAXI + TAG, "init" );
-        MogoStatusManager.getInstance().registerStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
     }
 
     /**
@@ -46,7 +40,7 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
      */
     private void stepIntoVrMode() {
         CallerLogger.INSTANCE.d( M_TAXI + TAG, "进入vr模式" );
-        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).stepInVrMode(false);
+        CallerMoGoUiSettingManager.INSTANCE.stepInNightMode();//夜间模式 状态栏字体颜色变黑
     }
 
     private void showFragment() {
@@ -66,17 +60,6 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
         }
     }
 
-    @Override
-    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if (descriptor == StatusDescriptor.VR_MODE){
-            if (isTrue){
-                showFragment();
-            }else {
-                hideFragment();
-            }
-        }
-    }
-
     @Override
     public void createCoverage(FragmentActivity activity, int containerId) {
 
@@ -93,13 +76,13 @@ class TaxiProvider implements IMogoOCH , IMogoStatusChangedListener {
     public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
         this.mActivity = fragmentActivity;
         this.mContainerId = integer;
+        showFragment();
         return null;
     }
 
     @Override
     public void onDestroy() {
         //若不调用finish, 设置中打开关闭UITouch,会造成och fragment 重叠
-        MogoStatusManager.getInstance().unregisterStatusChangedListener("ochTaxi", StatusDescriptor.VR_MODE,this);
         if (mActivity == null) return;
         mActivity.finish();
     }

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

@@ -32,7 +32,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 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.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
@@ -223,7 +223,7 @@ public class TaxiModel {
         MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
         //定位监听， 传false是高德坐标系
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG,mMapLocationLIstener);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG,mMapLocationLIstener);
 
         //2021.11.1 自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.INSTANCE.addListener(TAG, moGoAutopilotPlanningListener);
@@ -262,7 +262,7 @@ public class TaxiModel {
         MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
 
         // 注销地图监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
 
         OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(OCHSocketMessageManager.msgMonitorType);
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java

@@ -4,6 +4,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAX
 import static com.mogo.och.taxi.constant.TaxiConst.TIMER_START_AUTOPILOT_INTERVAL;
 
 import android.animation.ObjectAnimator;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
@@ -24,6 +25,7 @@ import androidx.fragment.app.FragmentTransaction;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
@@ -31,14 +33,17 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 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.call.map.CallerSmpManager;
+import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 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;
+import com.mogo.eagle.core.function.view.MapBizView;
+import com.mogo.eagle.core.function.smp.view.SmallMapView;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.map.MogoMapUIController;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
@@ -46,6 +51,7 @@ import com.mogo.och.common.module.utils.AnimatorDrawableUtil;
 import com.mogo.och.taxi.R;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 import mogo.telematics.pad.MessagePad;
 import record_cache.RecordPanelOuterClass;
@@ -67,6 +73,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     protected TextView mDriverRole;
     protected FrameLayout flStationPanelContainer;
     private FrameLayout flNaviPanelContainer;
+    private MapBizView mapBizView;
     private Group groupTestPanel;
     private TextView mSpeedView;
     private ImageView mAutopilotImage;
@@ -86,6 +93,8 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     protected TaxiRottingNaviFragment taxiRottingNaviFragment = null;
     // protected TaxiTrafficLightView mTrafficLightView;
 
+    protected SmallMapView smallMapView;
+
     private Handler mHandler = new Handler(Looper.getMainLooper());
 
     private Integer[] startAutopilotDrawableIds = new Integer[]{
@@ -153,6 +162,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
     @Override
     protected void initViews() {
+        mapBizView = findViewById(R.id.mapBizView);
         groupTestPanel = findViewById(R.id.groupTestPanel);
         ctvAutopilotStatusRL = findViewById(R.id.module_mogo_och_autopilot_status);
         ctvAutopilotStatusRL.setBackground(getResources().getDrawable(R.drawable.taxi_autopilot_bg_selector));
@@ -186,10 +196,18 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                 if (controller != null) {
                     //切换地图的远近视图
                     if (controller.getCurrentMapVisualAngle().isLongSight()) {
+                        CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                         controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
                     } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
+                        if (FunctionBuildConfig.isRomaMode) {
+                            controller.setRomaMode(1);
+                        } else {
+                            Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                            controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        }
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
                     } else {
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
@@ -290,6 +308,29 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                 viewDriverMsgBoxBubble.isShowData(true);
             }
         });
+
+        smallMapView = findViewById(R.id.smallMapView);
+    }
+
+    @Override
+    protected void initViews(Bundle savedInstanceState) {
+        super.initViews(savedInstanceState);
+        mapBizView.onCreate(savedInstanceState);
+        smallMapView.onCreateView(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mapBizView.onResume();
+        smallMapView.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapBizView.onPause();
+        smallMapView.onPause();
     }
 
     protected void onChangeOperationStatus() {
@@ -309,12 +350,31 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         }
     }
 
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapBizView.onLowMemory();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapBizView.onSaveInstanceState(outState);
+    }
+
     @Override
     public void onDestroyView() {
+        mapBizView.onDestroy();
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        smallMapView.onDestroy();
+    }
+
     @Override
     public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
 //        if (!HmiBuildConfig.isShowBadCaseView && recordPanel != null && recordPanel.getType() == 1 && recordPanel.getStat() == 100) {
@@ -564,11 +624,11 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             transaction.commitAllowingStateLoss();
             mCloseNaviIcon.setVisibility(View.VISIBLE);
             flNaviPanelContainer.setVisibility(View.VISIBLE);
-            CallerSmpManager.hidePanel();//隐藏小地图
+            smallMapView.setVisibility(View.GONE);
         } else {
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
-            CallerSmpManager.showPanel();//显示小地图
+            smallMapView.setVisibility(View.VISIBLE);
         }
     }
 
@@ -607,12 +667,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             transaction.commitAllowingStateLoss();
             mCloseNaviIcon.setVisibility(View.VISIBLE);
             flNaviPanelContainer.setVisibility(View.VISIBLE);
-            CallerSmpManager.hidePanel();//隐藏小地图
+            smallMapView.setVisibility(View.GONE);
         } else {
             closeRouteViewIFHadeAdd();
             mCloseNaviIcon.setVisibility(View.GONE);
             flNaviPanelContainer.setVisibility(View.GONE);
-            CallerSmpManager.showPanel();//显示小地图
+            smallMapView.setVisibility(View.VISIBLE);
         }
     }
 

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -21,7 +21,6 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -673,7 +672,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
     }
 
     private void clearSmallMapRouteLine() {
-        CallerSmpManager.clearPolyline();
+//        CallerSmpManager.clearPolyline();
     }
 
     /**
@@ -765,7 +764,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
                         .latitude(station.get(1))
                         .longitude(station.get(0));
                 IMogoMarker marker = Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMarkerManager(AbsMogoApplication.getApp())).addMarker(uuid, options);
-                CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(station.get(0)
+                CenterLine centerLine = CallerMapUIServiceManager.INSTANCE.getMapUIController().getCenterLineInfo(station.get(0)
                         , station.get(1), -1);
                 if (null != centerLine && marker != null) {// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致
                     marker.setRotateAngle(centerLine.getAngle().floatValue());

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiMapDirectionView.java

@@ -31,7 +31,7 @@ import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.utils.TaxiMapAssetStyleUtil;
@@ -98,14 +98,14 @@ public class TaxiMapDirectionView
         initAMapView();
 
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.removeListener(TAG);
     }
 
     private void initAMapView() {

OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml

@@ -6,6 +6,11 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
 
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
     <LinearLayout
         android:id="@+id/module_mogo_och_speed_layout"
         android:layout_height="@dimen/taxi_tab_speed_width_height"
@@ -80,6 +85,28 @@
 
     </RelativeLayout>
 
+    <!--浓雾预警动画-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <!--V2X预警红色边框-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!--刹车、转向-->
+    <com.mogo.eagle.core.function.hmi.ui.vehicle.SteeringBrakeView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <!--Vip车辆标志-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
         android:layout_width="@dimen/module_vip_width"
@@ -377,4 +404,15 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:src="@drawable/taxi_close_navi_icon"/>
 
+    <com.mogo.eagle.core.function.smp.view.SmallMapView
+        android:id="@+id/smallMapView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="30dp"
+        android:layout_marginBottom="30dp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/build.gradle

@@ -158,6 +158,12 @@ android {
             storePassword 'ZDauto123456'
             keyPassword 'ZDauto123456'
         }
+        releaseEB5 {
+            keyAlias = 'android_platform'
+            storeFile file('../keystore/EB5/car_launcher.jks')
+            storePassword 'ZDauto123456'
+            keyPassword 'ZDauto123456'
+        }
     }
     buildTypes {
         debug {
@@ -341,21 +347,44 @@ dependencies {
     implementation rootProject.ext.dependencies.lancetx_runtime
     implementation rootProject.ext.dependencies.mogocustommap
     implementation project(':core:function-impl:mogo-core-function-startup')
+    implementation project(':libraries:map-usbcamera')
 //    // 暂不使用Shizuku-API
 //    implementation rootProject.ext.dependencies.shizuku_provider
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.ttspad
         implementation rootProject.ext.dependencies.mogo_core_function_hmi
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogo_core_utils
+        implementation rootProject.ext.dependencies.mogo_core_function_map
+        implementation rootProject.ext.dependencies.mogo_core_function_v2x
+        implementation rootProject.ext.dependencies.mogo_core_function_datacenter
+        implementation rootProject.ext.dependencies.mogo_core_function_devatools
+        implementation rootProject.ext.dependencies.mogo_core_function_chat
+        implementation rootProject.ext.dependencies.mogo_core_function_biz
+        implementation rootProject.ext.dependencies.mogo_core_function_call
 
         androidTestImplementation rootProject.ext.dependencies.mogo_core_function_call
         androidTestImplementation rootProject.ext.dependencies.mogo_core_res
     } else {
         implementation project(':tts:tts-pad')
         implementation project(':core:function-impl:mogo-core-function-hmi')
+        implementation project(':core:function-impl:mogo-core-function-map')
+        implementation project(':core:function-impl:mogo-core-function-v2x')
+        implementation project(':core:function-impl:mogo-core-function-datacenter')
+        implementation project(':core:function-impl:mogo-core-function-devatools')
+        implementation project(':core:function-impl:mogo-core-function-chat')
+        implementation project(':core:function-impl:mogo-core-function-biz')
+        implementation project(':core:mogo-core-function-call')
+        implementation project(':core:mogo-core-utils')
+        implementation project(':core:mogo-core-res')
+        implementation project(':foudations:mogo-commons')
+
         androidTestImplementation project(':core:mogo-core-function-call')
         androidTestImplementation project(':core:mogo-core-res')
+
     }
 
+
     apply from: "./functions/och.gradle"
 
     androidTestImplementation rootProject.ext.dependencies.androidx_test_core

app/productFlavors/fMultiDisplayOchBus.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -18,7 +18,12 @@ project.android.productFlavors {
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
         //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true]
+        manifestPlaceholders = [
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                CHANNEL_VALUE     : "fPadLenovoOchBus",
+                ACTIVITY_ROOT     : true,
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fMultiDisplayOchTaxi.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -17,8 +17,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi",ACTIVITY_ROOT:true]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchTaxi",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovo.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -15,8 +15,17 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        // 高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovo",ACTIVITY_ROOT:true]
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovo",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovoOchBus.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -17,8 +17,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBus",ACTIVITY_ROOT:true]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchBus",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovoOchBusPassenger.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -15,8 +15,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger",ACTIVITY_ROOT:true]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchBusPassenger",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovoOchSweeper.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -17,8 +17,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchSweeper",ACTIVITY_ROOT:true]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchSweeper",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovoOchTaxi.gradle

@@ -5,7 +5,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -18,8 +18,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxi",ACTIVITY_ROOT:true]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchTaxi",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/productFlavors/fPadLenovoOchTaxiPassenger.gradle

@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-               abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -17,8 +17,18 @@ project.android.productFlavors {
 
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
-        //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxiPassenger",ACTIVITY_ROOT:false]
+
+        // 配置AndroidManifest.xml中用到的参数
+        manifestPlaceholders = [
+                // 高德地图鉴权信息
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                // BUGLY_APP_CHANNEL
+                CHANNEL_VALUE     : "fPadLenovoOchTaxiPassenger",
+                // 在启动的时候把Task给清空
+                ACTIVITY_ROOT     : false,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否需要实时上报坐标
         buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'

app/src/androidTest/java/com/mogo/functions/test/AutoPilotBadCaseTest.kt

@@ -4,7 +4,7 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment
+import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
 import com.mogo.eagle.core.function.main.MainLauncherActivity
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
@@ -121,15 +121,15 @@ class AutoPilotBadCaseTest {
         delay(TimeUnit.HOURS.toMillis(2))
     }
 
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
         launch.onActivity { itx ->
             val executor = Executors.newSingleThreadScheduledExecutor()
             executor.scheduleAtFixedRate({
                 var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 while (find == null) {
                     find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
 
                 }
                 while (!find.isResumed) {

app/src/androidTest/java/com/mogo/functions/test/MapDataCollectTest.kt

@@ -5,7 +5,7 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment
+import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
 import com.mogo.eagle.core.function.main.MainLauncherActivity
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
@@ -35,15 +35,15 @@ class MapDataCollectTest {
         CallerMapDataCollectorManager.setIsInit()
         delay(TimeUnit.HOURS.toMillis(1))
     }
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
         launch.onActivity { itx ->
             val executor = Executors.newSingleThreadScheduledExecutor()
             executor.scheduleAtFixedRate({
                 var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 while (find == null) {
                     find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
 
                 }
                 while (!find.isResumed) {

app/src/androidTest/java/com/mogo/functions/test/ReminderTest.kt

@@ -81,15 +81,15 @@ class ReminderTest {
         delay(3000000)
     }
 
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
         launch.onActivity { itx ->
             val executor = Executors.newSingleThreadScheduledExecutor()
             executor.scheduleAtFixedRate({
                 var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 while (find == null) {
                     find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 }
                 while (!find.isResumed) {
                     Thread.sleep(500)

app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt

@@ -136,15 +136,15 @@ class RoadAITest {
 
     }
 
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
         launch.onActivity { itx ->
             val executor = Executors.newSingleThreadScheduledExecutor()
             executor.scheduleAtFixedRate({
                 var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 while (find == null) {
                     find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 }
                 while (!find.isResumed) {
                     Thread.sleep(500)

app/src/androidTest/java/com/mogo/functions/test/TipToastLeakTest.kt

@@ -3,7 +3,7 @@ package com.mogo.functions.test
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment
+import com.mogo.eagle.core.function.hmi.ui.MoGoHmiProvider
 import com.mogo.eagle.core.function.main.MainLauncherActivity
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import kotlinx.coroutines.Dispatchers
@@ -44,15 +44,15 @@ class TipToastLeakTest {
         delay(TimeUnit.SECONDS.toMillis(2))
     }
 
-    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiFragment = suspendCancellableCoroutine {
+    private suspend fun ensureMoGoHmiFragmentShow(): MoGoHmiProvider = suspendCancellableCoroutine {
         launch.onActivity { itx ->
             val executor = Executors.newSingleThreadScheduledExecutor()
             executor.scheduleAtFixedRate({
                 var find =
-                    itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                    itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
                 while (find == null) {
                     find =
-                        itx.supportFragmentManager.fragments.find { it is MoGoHmiFragment } as? MoGoHmiFragment
+                        itx.supportFragmentManager.fragments.find { it is MoGoHmiProvider } as? MoGoHmiProvider
 
                 }
                 while (!find.isResumed) {

config.gradle

@@ -1,6 +1,7 @@
 ext {
     time = ""
-    kotlin_version = "1.4.31"
+//    kotlin_version = "1.4.31"
+    kotlin_version = "1.5.0"
     dependencies = [
             // androidx
             androidxappcompat            : "androidx.appcompat:appcompat:1.3.1",
@@ -22,9 +23,10 @@ ext {
 //            amapnavi3dmap              : "com.amap.api:navi-3dmap:8.0.1_3dmap8.0.1",
 //            amapsearch                 : "com.amap.api:search:7.9.0",
 //            amaplocation               : "com.amap.api:location:5.5.0",
-            amapnavi3dmap                : "com.amap.api:navi-3dmap:9.5.1_3dmap9.5.0",
+            amapnavi3dmap                : "com.amap.api:navi-3dmap:9.6.0_3dmap9.6.0",
             amapsearch                   : "com.amap.api:search:9.5.0",
             amaplocation                 : "com.amap.api:location:6.2.0",
+
             // json 转换
             gson                         : "com.google.code.gson:gson:2.8.4",
             // 内存泄漏检测
@@ -135,10 +137,8 @@ ext {
             mogologlib                   : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
             kotlingradleplugin           : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
             crashreport                  : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}",
-            crashreportbugly             : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}",
             crashreportapmbyte           : "com.mogo.test:crashreport-apmbyte:${CRASHREPORT_APMBYTE_VERSION}",
             crashreportnoop              : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",
-            crashreportupgrade           : "com.mogo.test:crashreport-upgrade:${CRASHREPORT_UPGRADE_VERSION}",
             apm_insight                  : 'com.volcengine:apm_insight:1.4.9.cn-rc.5',
             apm_insight_crash            : 'com.volcengine:apm_insight_crash:1.4.6-rc.14',
             cicle_indicator              : 'me.relex:circleindicator:2.1.6',

core/README.md

@@ -24,3 +24,4 @@
 - mogo-core-res：程序中涉及到的图片及布局资源，同一管理，并通过设置不同的目录指定是那个模块的资源，这里只存放公共资源，图片，布局，动画等
 
 - mogo-core-utils：基于成熟的工具类开源框架下沉的，这里可以增添针对我们业务上的一些工具类
+  - MultiDisplayUtils ：多屏幕管理工具

core/README_MULT_DISPLAY.md

@@ -0,0 +1,16 @@
+## 多屏幕场景
+
+```java
+// 在第二个屏幕启动页面
+MultiDisplayUtils.INSTANCE.startActWithSecond(
+        context,
+        VideoAdAtc.class);
+```
+
+```java
+// 在指定屏幕启动页面
+MultiDisplayUtils.INSTANCE.startActWithProcess(
+        1,
+        context,
+        VideoAdAtc.class);
+```

core/function-impl/mogo-core-function-biz/build.gradle

@@ -62,7 +62,6 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxroomktx
 
     implementation project(':foudations:mogo-commons')
-    implementation project(':core:mogo-core-data')
     implementation project(':core:mogo-core-utils')
     implementation project(':core:mogo-core-network')
     implementation project(':core:mogo-core-function-call')

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt

@@ -13,9 +13,7 @@ import com.mogo.eagle.function.biz.notice.NoticeSocketManager.Companion.noticeSo
 import com.mogo.eagle.function.biz.notice.network.NoticeNetWorkManager
 import com.mogo.eagle.function.biz.v2x.overview.OverViewDataManager
 import com.mogo.eagle.function.biz.v2x.overview.db.OverviewDb
-import com.mogo.eagle.function.biz.v2x.speedlimit.SpeedLimitDispatcher
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager
-import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightDispatcher
 import com.mogo.eagle.function.biz.v2x.vip.VipCarManager
 
 @Route(path = MogoServicePaths.PATH_FUNC_BIZ)
@@ -31,8 +29,6 @@ class FuncBizProvider : IMoGoFuncBizProvider {
 
         MogoTrafficLightManager.INSTANCE.initServer(context)
         VipCarManager.INSTANCE.initServer(context)
-        TrafficLightDispatcher.INSTANCE.initServer(context) //todo 宏宇 放入dataCenter
-        SpeedLimitDispatcher.INSTANCE.initLimit(context) //todo 宏宇，放入dataCenter
 //        RedLightWarningManager.INSTANCE.listenTrafficLight()
     }
 
@@ -89,7 +85,6 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         cronTaskManager.release()
 
         VipCarManager.INSTANCE.destroy()
-        TrafficLightDispatcher.INSTANCE.destroy()
 //        RedLightWarningManager.INSTANCE.onDestroy()
     }
 }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt

@@ -7,7 +7,7 @@ import com.mogo.commons.constants.HostConst
 import com.mogo.commons.utils.RetryWithDelay
 import com.mogo.eagle.core.data.camera.CameraEntity
 import com.mogo.eagle.core.data.camera.ReqLiveCarBean
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -90,7 +90,7 @@ class CronTaskManager {
      * 请求路口一定范围内的设备信息(包含：摄像头、灯)
      */
     private fun requestDeviceList() {
-        CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()?.let { location ->
+        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.let { location ->
             disposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
                 .create(ICameraListServices::class.java)
                 .getDeviceList(location.longitude, location.latitude, 500)
@@ -124,7 +124,7 @@ class CronTaskManager {
     }
 
     private fun requestCarCameraList() {
-        CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()?.let { location ->
+        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.let { location ->
             carDisposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
                 .create(ICameraListServices::class.java)
                 .getCarCameraList(ReqLiveCarBean(location.longitude, location.latitude))

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt

@@ -13,14 +13,14 @@ import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.data.trafficlight.TrafficLightStatusHelper.getCurrentRoadTrafficLight
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.api.vip.IMoGoVipSetListener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallVipSetListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.utilcode.util.LocationUtils
@@ -84,7 +84,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
 
     fun listenTrafficLight() {
         CallerTrafficLightListenerManager.addListener(TAG, this)
-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
         CallVipSetListenerManager.addListener(TAG, this)
     }
 
@@ -266,7 +266,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
     fun onDestroy() {
         CallVipSetListenerManager.removeListener(TAG)
         CallerTrafficLightListenerManager.removeListener(TAG)
-        CallerChassisLocationGCJ20ListenerManager.removeListener(TAG)
+        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
     }
 
     override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) {

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt

@@ -6,9 +6,9 @@ import android.os.Looper
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_LOOP_SEARCH_CROSS_ROAD
@@ -41,7 +41,7 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
 
     fun initServer(context: Context) {
         mContext = context
-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
         mThreadHandler =
             TrafficLightThreadHandler(Looper.getMainLooper(), {
                 //第一次查询路口时，如果红绿灯显示，则隐藏掉
@@ -75,7 +75,6 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                     trafficLightNetWorkModel.requestTrafficLight(
                         it.latitude, it.longitude, it.heading, road, { result ->
                             trafficLightResult = result
-//                            TrafficLightHMIManager.INSTANCE.updateTrafficLight(result)
                             CallerTrafficLightListenerManager.invokeTrafficLightStatus(result)
                         },
                         { errorMsg ->

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightApiService.kt

@@ -12,17 +12,17 @@ interface TrafficLightApiService {
 
     //获取前方路口RoadID
     @FormUrlEncoded
-    @POST("ai-roadInfo-service/cross/near")
+    @POST("eagle-eye-dns/ai-roadInfo-service/cross/near")
     suspend fun getFrontRoadID(@FieldMap roadID: Map<String, String>): BaseResponse<RoadIDResult>
 
     //获取前方红绿灯状态
     @FormUrlEncoded
-    @POST("mec-etl-server/light/bgd/channel/realTime")
+    @POST("eagle-eye-dns/mec-etl-server/light/bgd/channel/realTime")
     suspend fun getTrafficLight(@FieldMap status: Map<String, String>): BaseResponse<TrafficLightResult>
 
     //变灯
     @FormUrlEncoded
-    @POST("mec-etl-server/light/bdg/newTask")
+    @POST("eagle-eye-dns/mec-etl-server/light/bdg/newTask")
     suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<TrafficLightControl>
 
 }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -1,18 +1,18 @@
 package com.mogo.eagle.function.biz.v2x.trafficlight.network
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.cancel
 import com.mogo.eagle.core.network.request
-import com.mogo.commons.constants.HostConst.CITY_HOST
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 
 class TrafficLightNetWorkModel {
 
-    private fun getNetWorkApi(baseUrl: String = CITY_HOST): TrafficLightApiService {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): TrafficLightApiService {
         return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
             .create(TrafficLightApiService::class.java)
     }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt

@@ -19,13 +19,12 @@ import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
 import com.mogo.eagle.core.data.trafficlight.isGreen
 import com.mogo.eagle.core.data.trafficlight.isRed
 import com.mogo.eagle.core.data.v2x.VipMessage
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallVipSetListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.utilcode.util.ToastUtils

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipApiService.kt

@@ -7,7 +7,7 @@ import retrofit2.http.*
 interface VipApiService {
 
     //查询是否为VIP车辆
-    @GET("/dataService/carUser/getVipStatusBySn")
+    @GET("eagle-eye-dns/dataService/carUser/getVipStatusBySn")
     suspend fun requestVip(@Query("sn") sn: String): BaseResponse<VipRequest>
 
 }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/network/VipNetWorkModel.kt

@@ -1,17 +1,17 @@
 package com.mogo.eagle.function.biz.v2x.vip.network
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.HostConst
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.v2x.VipRequest
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.apiCall
 import com.mogo.eagle.core.network.request
-import com.mogo.commons.constants.HostConst.DATA_SERVICE_HOST
 
 
 class VipNetWorkModel {
 
-    private fun getNetWorkApi(baseUrl: String = DATA_SERVICE_HOST): VipApiService {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): VipApiService {
         return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
             .create(VipApiService::class.java)
     }

core/function-impl/mogo-core-function-chat/build.gradle

@@ -61,13 +61,11 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.mogo_core_res
     } else {
         implementation project(':foudations:mogo-commons')
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:mogo-core-res')

core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt

@@ -15,7 +15,7 @@ import com.mogo.eagle.core.function.api.chat.biz.IMCallType.CALL_TYPE_DEFAULT
 import com.mogo.eagle.core.function.api.chat.biz.IMCallType.CALL_TYPE_VEHICLE_TEAM
 import com.mogo.eagle.core.function.api.chat.biz.IMCallType.CALL_TYPE_VOICE
 import com.mogo.eagle.core.function.api.chat.biz.IMType.*
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.chat.facade.analytics.ChatAnalyticsFacade
 import com.mogo.eagle.core.function.chat.facade.audio.AudioFocusFacade
 import com.mogo.eagle.core.function.chat.facade.bridge.BridgeApi
@@ -581,7 +581,7 @@ object MoGoChatFacade: IMoGoChatFacade {
             }
             //告之服务器给发送方下发接收通话消息
             try {
-                val location = CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()
+                val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                 val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VOICE.type).also {
                     it.nickName = mySelf.get().name
                     it.headImgUrl = mySelf.get().icon
@@ -812,7 +812,7 @@ object MoGoChatFacade: IMoGoChatFacade {
             }
             val response = serverApi.inviteJoinVehicleTeam(CallRequestParam().also {
                 val user = mySelf.get()
-                val location = CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()
+                val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                 it.snSender = mySn
                 it.snReceiver = sn
                 it.nickName = user.name
@@ -958,7 +958,7 @@ object MoGoChatFacade: IMoGoChatFacade {
             }
             //告之服务器给发送方下发接收通话消息
             try {
-                val location = CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()
+                val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
                 val response = serverApi.requestConnectStatus(ConnectStatusParam(MoGoAiCloudClientConfig.getInstance().sn, sn, roomId, PUSH_MSG_AGREE_ENTER, CALL_TYPE_VEHICLE_TEAM.type).also {
                     it.nickName = mySelf.get().name
                     it.headImgUrl = mySelf.get().icon

core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt

@@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.chat.UserInfo
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts
 import com.mogo.eagle.core.function.api.chat.biz.IMCallType.CALL_TYPE_VOICE
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.chat.facade.net.bean.*
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -69,7 +69,7 @@ internal class ChatServiceModel {
         val map = hashMapOf<String, String>()
         val sn = MoGoAiCloudClientConfig.getInstance().sn
 
-        val location = CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()
+        val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
         if (location != null) {
             params.lon = location.longitude
             params.lat = location.latitude
@@ -103,7 +103,7 @@ internal class ChatServiceModel {
 
     suspend fun requestRoomInfo(param: CallRequestParam): BaseResponse<RoomInfo> {
         val map = hashMapOf<String, String>()
-        val location = CallerChassisLocationGCJ20ListenerManager.getChassisLocationGCJ02()
+        val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
         if (location != null) {
             param.lat = location.latitude
             param.lon = location.longitude

core/function-impl/mogo-core-function-datacenter/README.md

@@ -44,7 +44,7 @@ MogoObuManager.getInstance().init(Context context);
 ```
 ## 连接
 ```java
-//默认192.168.8.199
+//默认192.168.1.199
 MogoObuManager.getInstance().connect();
 //自定义 IP
 MogoObuManager.getInstance().connect(String ip);

core/function-impl/mogo-core-function-datacenter/build.gradle

@@ -60,17 +60,14 @@ dependencies {
     implementation rootProject.ext.dependencies.amapnavi3dmap
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
 
         implementation project(':libraries:mogo-adas')
         implementation rootProject.ext.dependencies.mogocommons
     } else {
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
-
         implementation project(':libraries:mogo-adas')
         implementation project(':foudations:mogo-commons')
     }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt

@@ -5,6 +5,8 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterProvider
 import com.mogo.eagle.core.function.datacenter.location.MoGoLocationDispatcher
+import com.mogo.eagle.core.function.datacenter.v2x.SpeedLimitDispatcher
+import com.mogo.eagle.core.function.datacenter.v2x.TrafficLightDispatcher
 
 @Route(path = MogoServicePaths.PATH_DATA_CENTER_MODULE)
 class DataCenterProvider: IDataCenterProvider {
@@ -14,9 +16,15 @@ class DataCenterProvider: IDataCenterProvider {
 
     override fun init(context: Context?) {
         MoGoLocationDispatcher.initListener()
+
+        context?.let {
+            TrafficLightDispatcher.INSTANCE.initServer(it)
+            SpeedLimitDispatcher.INSTANCE.initLimit(it)
+        }
     }
 
     override fun onDestroy() {
-
+        TrafficLightDispatcher.INSTANCE.destroy()
+        SpeedLimitDispatcher.INSTANCE.destroy()
     }
 }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt

@@ -52,6 +52,7 @@ import com.zhidao.support.adas.high.OnMultiDeviceListener
 import com.zhidao.support.adas.high.common.Constants
 import com.zhidao.support.adas.high.common.Constants.IPC_CONNECTION_STATUS
 import com.zhidao.support.adas.high.common.CupidLogUtils
+import com.zhidao.support.adas.high.common.MessageType
 import com.zhidao.support.adas.high.common.MogoReport
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
@@ -720,7 +721,20 @@ class MoGoAutopilotControlProvider :
     }
 
     override fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd) {
-        Log.d(TAG, "---- sendSweeperFuTianTaskCmd ----")
         AdasManager.getInstance().sendRoboSweeperFuTianTaskCmd(fuTianTaskCmd)
     }
+
+    override fun setIsDrawPointCloud(isDrawPointCloud: Boolean) {
+        if (isDrawPointCloud) {
+            AdasManager.getInstance().subscribeInterface(
+                Constants.TERMINAL_ROLE.DRIVER,
+                Constants.SUBSCRIBE_TYPE.SUBSCRIBE,
+                MessageType.TYPE_RECEIVE_POINT_CLOUD)
+        } else {
+            AdasManager.getInstance().subscribeInterface(
+                Constants.TERMINAL_ROLE.DRIVER,
+                Constants.SUBSCRIBE_TYPE.UNSUBSCRIBE,
+                MessageType.TYPE_RECEIVE_POINT_CLOUD)
+        }
+    }
 }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -526,16 +526,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-    /**
-     * OBU预警事件
-     *
-     * @param header         头
-     * @param obuWarningData 数据
-     */
-    override fun onObuWarningData(header: MessagePad.Header?, obuWarningData: ObuWarningEvent.ObuWarningData?) {
-        CallerObuDcCombineListenerManager.invokeObuDcData(obuWarningData)
-    }
-
     /**
      * OBU 红绿灯预警信息
      *

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt

@@ -1,9 +1,9 @@
 package com.mogo.eagle.core.function.datacenter.autopilot.server
 
 import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 
 /**
  * @author xiaoyuzhou

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt

@@ -6,16 +6,20 @@ import com.amap.api.location.AMapLocationClientOption
 import com.amap.api.location.AMapLocationListener
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.constants.SharedPrefsConstants
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisGnssListener
+import com.mogo.eagle.core.function.api.obu.IMoGoObuLocationWGS84Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisGnssListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
+import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.Utils
+import com.mogo.support.obu.model.MogoObuHvBasicsData
 import mogo.telematics.pad.MessagePad
 
 /**
@@ -25,6 +29,7 @@ import mogo.telematics.pad.MessagePad
  */
 object MoGoLocationDispatcher :
     IMoGoChassisGnssListener,
+    IMoGoObuLocationWGS84Listener,
     AMapLocationListener {
 
     private val TAG = "MoGoLocationManager"
@@ -37,6 +42,11 @@ object MoGoLocationDispatcher :
      */
     private var lastGnssLocation: MogoLocation = MogoLocation()
 
+    /**
+     * 最后一次OBU GNSS 返回更新的位置
+     */
+    private var lastOBULocation: MogoLocation = MogoLocation()
+
     /**
      * 最后一次高德定位返回的位置信息
      */
@@ -69,6 +79,7 @@ object MoGoLocationDispatcher :
 
         // 初始化监听订阅工控机位置信息
         CallerChassisGnssListenerManager.addListener(TAG, this)
+        CallerObuLocationWGS84ListenerManager.addListener(TAG, this)
     }
 
     override fun onChassisGnss(gnssInfo: MessagePad.GnssInfo) {
@@ -77,6 +88,11 @@ object MoGoLocationDispatcher :
         lastGnssLocation.lastReceiveTime = TimeUtils.getNowMills()
         // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
         mapLocation?.let {
+            //agps 高德
+            //agps_rtk 高德-高精
+            lastGnssLocation.locType = 1000 // 定位类型为WGS84进行转译的坐标
+            lastGnssLocation.satellite = 4
+
             lastGnssLocation.cityName = it.city
             lastGnssLocation.cityCode = it.cityCode
             lastGnssLocation.provider = it.provider
@@ -95,17 +111,19 @@ object MoGoLocationDispatcher :
             lastGnssLocation.errorCode = it.errorCode
             lastGnssLocation.errorInfo = it.errorInfo
         }
-
-        // WGS84坐标系高精度位置信息
-        CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84(
-            lastGnssLocation,
-            DataSourceType.TELEMATIC
-        )
-        // GCJ02高德坐标系位置信息
-        CallerChassisLocationGCJ20ListenerManager.invokeChassisLocationGCJ02(
-            lastGnssLocation,
-            DataSourceType.TELEMATIC
-        )
+        //FileUtils.writeToFile("/sdcard/Download/", "location_wgs84.txt", "${gnssInfo.longitude},${gnssInfo.latitude}\n")
+        if (1 == FunctionBuildConfig.gpsProvider) {
+            // WGS84坐标系高精度位置信息
+            CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84(
+                lastGnssLocation,
+                DataSourceType.TELEMATIC
+            )
+            // GCJ02高德坐标系位置信息
+            CallerChassisLocationGCJ02ListenerManager.invokeChassisLocationGCJ02(
+                lastGnssLocation,
+                DataSourceType.TELEMATIC
+            )
+        }
     }
 
     /**
@@ -115,7 +133,7 @@ object MoGoLocationDispatcher :
     override fun onLocationChanged(aMapLocation: AMapLocation) {
         mapLocation = aMapLocation
         // 更新GNSS 信息
-
+        lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
 
         // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
         mapLocation?.let {
@@ -131,6 +149,9 @@ object MoGoLocationDispatcher :
             lastGaoDeLocation.satelliteTime = it.time
             lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
 
+            lastGaoDeLocation.locType = 1 // 定位类型为高德坐标(网路或者硬件定位)
+            lastGaoDeLocation.satellite = 4
+
             lastGaoDeLocation.cityName = it.city
             lastGaoDeLocation.cityCode = it.cityCode
             lastGaoDeLocation.provider = it.provider
@@ -151,26 +172,104 @@ object MoGoLocationDispatcher :
         }
 
         // 计算最后一次工控机同步的定位是否超时，如果超时则切换为高德地图定位,暂定超过30秒需要切换
-        if (TimeUtils.getNowMills() - lastGnssLocation.lastReceiveTime > 30000) {
-            // WGS84坐标系高精度位置信息
-            CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84(
-                lastGaoDeLocation,
-                DataSourceType.MAP
-            )
-            // GCJ02高德坐标系位置信息
-            CallerChassisLocationGCJ20ListenerManager.invokeChassisLocationGCJ02(
-                lastGaoDeLocation,
-                DataSourceType.MAP
-            )
+        if (1 == FunctionBuildConfig.gpsProvider) {
+            if (TimeUtils.getNowMills() - lastGnssLocation.lastReceiveTime > 30000) {
+                syncGaoDeLocation()
+            }
+        } else if (2 == FunctionBuildConfig.gpsProvider) {
+            if (TimeUtils.getNowMills() - lastOBULocation.lastReceiveTime > 30000) {
+                syncGaoDeLocation()
+            }
         }
 
+
         // 本地SP缓存城市Code
         val cityCode = aMapLocation.cityCode
         if (cityCode != null && cityCode.isNotEmpty()) {
             mCityCode = aMapLocation.cityCode
             SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
                 .putString(SharedPrefsConstants.LOCATION_CITY_CODE, cityCode)
+
+            SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
+                .putString(
+                    SharedPrefsConstants.LOCATION_LATITUDE,
+                    aMapLocation.latitude.toString()
+                )
+            SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
+                .putString(
+                    SharedPrefsConstants.LOCATION_LONGITUDE,
+                    aMapLocation.longitude.toString()
+                )
         }
 
     }
+
+    /**
+     * 对外同步高德回掉的定位数据
+     */
+    private fun syncGaoDeLocation() {
+        // WGS84坐标系高精度位置信息
+        CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84(
+            lastGaoDeLocation,
+            DataSourceType.MAP
+        )
+        // GCJ02高德坐标系位置信息
+        CallerChassisLocationGCJ02ListenerManager.invokeChassisLocationGCJ02(
+            lastGaoDeLocation,
+            DataSourceType.MAP
+        )
+    }
+
+    /**
+     * OBU定位回调监听
+     */
+    override fun onObuLocationWGS84(data: MogoObuHvBasicsData) {
+        // 更新GNSS 信息
+        lastOBULocation.longitude = data.vehBasicsMsg.longitude
+        lastOBULocation.latitude = data.vehBasicsMsg.latitude
+        lastOBULocation.heading = data.vehBasicsMsg.heading
+        lastOBULocation.gnssSpeed = data.vehBasicsMsg.speed.toFloat()
+        lastOBULocation.altitude = data.vehBasicsMsg.elevation
+        lastOBULocation.satelliteTime = data.vehBasicsMsg.secMark
+        lastOBULocation.lastReceiveTime = TimeUtils.getNowMills()
+
+        // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
+        mapLocation?.let {
+            //agps 高德
+            //agps_rtk 高德-高精
+            lastOBULocation.locType = 1000 // 定位类型为WGS84进行转译的坐标
+            lastOBULocation.satellite = 4
+
+            lastOBULocation.cityName = it.city
+            lastOBULocation.cityCode = it.cityCode
+            lastOBULocation.provider = it.provider
+            lastOBULocation.address = it.address
+            lastOBULocation.district = it.district
+            lastOBULocation.province = it.province
+            lastOBULocation.adCode = it.adCode
+            lastOBULocation.locationDetail = it.locationDetail
+            lastOBULocation.poiName = it.poiName
+            lastOBULocation.aoiName = it.aoiName
+            lastOBULocation.street = it.street
+            lastOBULocation.streetNum = it.streetNum
+            lastOBULocation.description = it.description
+            lastOBULocation.buildingId = it.buildingId
+            lastOBULocation.floor = it.floor
+            lastOBULocation.errorCode = it.errorCode
+            lastOBULocation.errorInfo = it.errorInfo
+        }
+
+        if (2 == FunctionBuildConfig.gpsProvider) {
+            // WGS84坐标系高精度位置信息
+            CallerChassisLocationWGS84ListenerManager.invokeChassisLocationWGS84(
+                lastOBULocation,
+                DataSourceType.OBU
+            )
+            // GCJ02高德坐标系位置信息
+            CallerChassisLocationGCJ02ListenerManager.invokeChassisLocationGCJ02(
+                lastOBULocation,
+                DataSourceType.OBU
+            )
+        }
+    }
 }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt

@@ -22,8 +22,7 @@ class MoGoObuProvider : IMoGoObuProvider {
     private val TAG = "MoGoObuProvider"
 
     private var mContext: Context? = null
-    private val busObuIp = "192.168.8.199"
-    private val taxiObuIp = "192.168.1.199"
+    private val taxiObuIp = "192.168.1.199" //obu的taxi和bus的ip已经全部统一成1网段ip
 
     override val functionName: String
         get() = TAG
@@ -37,35 +36,16 @@ class MoGoObuProvider : IMoGoObuProvider {
         MogoObuDcCombineManager.INSTANCE.init(context)
         CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress())
 
-        //bus乘客版本obu功能去掉
-        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
-            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
-        ) {
-            //不处理
-        } else {
-            mContext = context
-            mContext?.let {
-                if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //bus 司机端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, busObuIp)
-
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { //taxi 司机端和乘客端
-                    val ipAddress =
-                        SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
-                    //mogo obu
-                    MogoPrivateObuNewManager.INSTANCE.connectObu(
-                        it,
-                        ipAddress,
-                        CommonUtils.getIpAddressString()
-                    )
-                }
-            }
+        //bus乘客版本obu功能去掉，大理项目需要全部车辆接收，不在限制
+        mContext = context
+        mContext?.let {
+            val ipAddress = SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp)
+            //mogo obu
+            MogoPrivateObuNewManager.INSTANCE.connectObu(
+                it,
+                ipAddress,
+                CommonUtils.getIpAddressString()
+            )
         }
     }
 

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt

@@ -9,7 +9,6 @@ import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningMapListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsiListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsmListener
@@ -21,13 +20,12 @@ import com.mogo.eagle.core.function.call.obu.CallerObuMapMathListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuWarningRsiListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuWarningRsmListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuWarningSpatListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.support.obu.ObuScene
 import com.mogo.support.obu.constants.MogoObuConstants
-import mogo.v2x.ObuWarningEvent.*
 import kotlin.math.roundToInt
 
 
@@ -258,8 +256,6 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
             when (status) {
                 // 添加
                 MogoObuConstants.STATUS.ADD -> {
-                    //显示警告红边
-                    CallerHmiManager.showWarning(direction)
                     CallerMsgBoxManager.saveMsgBox(
                         MsgBoxBean(
                             MsgBoxType.V2X,
@@ -275,13 +271,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     CallerHmiManager.warningV2X(
                         appId,
                         alertContent,
-                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                        object : IMoGoWarningStatusListener {
-                            override fun onDismiss() {
-                                // 关闭警告红边
-                                CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
-                            }
-                        }
+                        ttsContent, null, direction
                     )
 
                     // 更新数据，是否需要
@@ -297,7 +287,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 // 删除
                 MogoObuConstants.STATUS.DELETE -> {
                     // 关闭警告红边
-//                    CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                    CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_NON)
                     // 更新数据，删除标牌？
 //                    TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(rsiWarningData)
 //                        ?.let {
@@ -345,24 +335,20 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     level = rsmWarningData.warningMsg.warningDataList[0].warningLevel
                     CallerLogger.d(
                         "${M_OBU}${TAG}",
-                        "MogoObuDcCombineManager onMogoObuRsmWarning ---status---> ${rsmWarningData.status} --list status----> ${
-                            rsmWarningData.warningMsg.warningDataList.get(
-                                0
-                            ).status
+                        "ObuDcCombineManager onObuRsmWarning ---status---> ${rsmWarningData.status} --list status----> ${
+                            rsmWarningData.warningMsg.warningDataList[0].status
                         } --v2xType--- $v2xType ---alertContent = $alertContent ---ttsContent= $ttsContent"
                     )
 
-                    when (rsmWarningData.warningMsg.warningDataList.get(0).status) {
+                    when (rsmWarningData.warningMsg.warningDataList[0].status) {
                         MogoObuConstants.STATUS.ADD -> { // 添加
-                            //显示警告红边
-                            CallerHmiManager.showWarning(direction)
                             CallerMsgBoxManager.saveMsgBox(
                                 MsgBoxBean(
                                     MsgBoxType.V2X,
                                     V2XMsg(
                                         v2xType,
                                         alertContent,
-                                        ttsContent
+                                        ttsContent,
                                     )
                                 ).apply {
                                     sourceType = DataSourceType.TELEMATIC
@@ -371,15 +357,9 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                             CallerHmiManager.warningV2X(
                                 v2xType,
                                 alertContent,
-                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                object : IMoGoWarningStatusListener {
-                                    override fun onDismiss() {
-                                        // 关闭警告红边
-                                        CallerHmiManager.dismissWarning(
-                                            WarningDirectionEnum.ALERT_WARNING_ALL
-                                        )
-                                    }
-                                }
+                                ttsContent,
+                                null,
+                                direction
                             )
 
                             // 更新数据 TODO
@@ -396,7 +376,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                         // 删除
                         MogoObuConstants.STATUS.DELETE -> {
                             // 关闭警告红边
-                            CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                            CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
                             // 更新数据 TODO 由于obu通过域控需要转换单位，这里临时转换，后面3.0不需要转换
 //                            TrafficDataConvertUtils.cvxPtcThreatIndInfo2TrafficData(rsmWarningData)?.let {
 //                                    // 事件结束，还原交通参与者颜色
@@ -451,8 +431,8 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     } --- data.speedMaxLimit = ${data.speedMaxLimit}"
                 )
                 when (data.status) {
-                    MogoObuConstants.STATUS.ADD -> { // 添加
-                        CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                    MogoObuConstants.STATUS.ADD -> { // 添加 TODO
+                        CallerLimitingVelocityListenerManager.invokeUnion(
                             (data.speedMaxLimit * 0.02 * 3.6).roundToInt().toInt(),
                             DataSourceType.OBU
                         )
@@ -462,7 +442,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                     }
 
                     MogoObuConstants.STATUS.DELETE -> { // 删除
-                        CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                        CallerLimitingVelocityListenerManager.invokeUnion(
                             -1,
                             DataSourceType.OBU
                         )
@@ -637,7 +617,6 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                                 sourceType = DataSourceType.TELEMATIC
                             }
                         )
-
                         CallerHmiManager.warningV2X(
                             EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
                             alertContent,
@@ -651,40 +630,38 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
         when (currentLight.light) {
             // 灯光不可用
             0 -> {
-                CallerTrafficLightListenerManager.showTrafficLight(
+                CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.BLACK,
+                    -1,
                     DataSourceType.TELEMATIC
                 )
             }
-
             // 红灯
             2, 3 -> {
-                CallerTrafficLightListenerManager.showTrafficLight(
+                val red = (currentLight.countDown / 10).toInt()
+                CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.RED,
+                    red,
                     DataSourceType.TELEMATIC
                 )
-                val red = currentLight.countDown / 10
-                CallerTrafficLightListenerManager.changeCountdownRed(red.toInt())
             }
-
             // 绿灯
             4, 5, 6 -> {
-                CallerTrafficLightListenerManager.showTrafficLight(
+                val green = (currentLight.countDown / 10).toInt()
+                CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.GREEN,
+                    green,
                     DataSourceType.TELEMATIC
                 )
-                val green = currentLight.countDown / 10
-                CallerTrafficLightListenerManager.changeCountdownGreen(green.toInt())
             }
-
             // 黄灯
             7, 8 -> {
-                CallerTrafficLightListenerManager.showTrafficLight(
+                val yellow = (currentLight.countDown / 10).toInt()
+                CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.YELLOW,
+                    yellow,
                     DataSourceType.TELEMATIC
                 )
-                val yellow = currentLight.countDown / 10
-                CallerTrafficLightListenerManager.changeCountdownYellow(yellow.toInt())
             }
         }
     }

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -16,8 +16,9 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Defa
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.TooClose
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
@@ -31,7 +32,6 @@ import com.mogo.support.obu.model.*
 import com.mogo.support.obu.model.advance.SpatLight
 import com.mogo.support.obu.option.MogoObuCom
 import com.mogo.support.obu.option.MogoObuOptions
-import org.json.JSONObject
 import kotlin.math.roundToInt
 
 /**
@@ -107,45 +107,22 @@ class MogoPrivateObuNewManager private constructor() {
         /**
          * HV车辆基础信息 CvxHvCarIndInfo  CvxHvInfoIndInfo
          */
-        override fun onMogoObuHvBasics(p0: MogoObuHvBasicsData?) {
-            if (p0 != null && p0.vehBasicsMsg != null) {
+        override fun onMogoObuHvBasics(mogoObuHvBasicsData: MogoObuHvBasicsData?) {
+            if (mogoObuHvBasicsData != null && mogoObuHvBasicsData.vehBasicsMsg != null) {
                 CallerLogger.d(
                     "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-                    "onMogoObuHvBasics  lon = ${p0.vehBasicsMsg.longitude} --- lat = ${p0.vehBasicsMsg.latitude} ---speed = ${p0.vehBasicsMsg.speed} ---heading = ${p0.vehBasicsMsg.heading} --acceleration = ${p0.vehBasicsMsg.accFourAxes.accLat} --yawRate = ${p0.vehBasicsMsg.accFourAxes.accYaw}"
+                    "onMogoObuHvBasics  lon = ${mogoObuHvBasicsData.vehBasicsMsg.longitude} --- lat = ${mogoObuHvBasicsData.vehBasicsMsg.latitude} ---speed = ${mogoObuHvBasicsData.vehBasicsMsg.speed} ---heading = ${mogoObuHvBasicsData.vehBasicsMsg.heading} --acceleration = ${mogoObuHvBasicsData.vehBasicsMsg.accFourAxes.accLat} --yawRate = ${mogoObuHvBasicsData.vehBasicsMsg.accFourAxes.accYaw}"
                 )
-                val data = JSONObject()
-                try {
-                    data.putOpt("lon", p0.vehBasicsMsg.longitude)
-                    data.putOpt("lat", p0.vehBasicsMsg.latitude)
-                    data.putOpt("speed", p0.vehBasicsMsg.speed)
-                    data.putOpt("heading", p0.vehBasicsMsg.heading)
-                    data.putOpt("acceleration", p0.vehBasicsMsg.accFourAxes.accLat)
-                    data.putOpt("yawRate", p0.vehBasicsMsg.accFourAxes.accYaw)
-
-                    try {
-                        data.putOpt("systemTime", System.currentTimeMillis())
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                    try {
-                        data.putOpt("satelliteTime", System.currentTimeMillis())
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-
-                    // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle  GPS_PROVIDER  0-Android系统，1-工控机，2-OBU
-                    if (2 == FunctionBuildConfig.gpsProvider) {
-                        // 同步给MAP地图
-                        CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(data)
-                        // 同步更新经纬度和系统时间至 AutoPilotStatusListener
-                        CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(
-                            System.currentTimeMillis() / 1000.0,
-                            p0.vehBasicsMsg.longitude,
-                            p0.vehBasicsMsg.latitude
-                        )
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
+                // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle  GPS_PROVIDER  0-Android系统，1-工控机，2-OBU
+                if (2 == FunctionBuildConfig.gpsProvider) {
+                    // 同步给MAP地图
+                    CallerObuLocationWGS84ListenerManager.invokeObuLocationWGS84(mogoObuHvBasicsData)
+                    // 同步更新经纬度和系统时间至 AutoPilotStatusListener
+                    CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(
+                        System.currentTimeMillis() / 1000.0,
+                        mogoObuHvBasicsData.vehBasicsMsg.longitude,
+                        mogoObuHvBasicsData.vehBasicsMsg.latitude
+                    )
                 }
             }
         }
@@ -410,12 +387,7 @@ class MogoPrivateObuNewManager private constructor() {
                                 appId,
                                 alertContent,
                                 ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                object : IMoGoWarningStatusListener {
-                                    override fun onDismiss() {
-                                        // 关闭警告红边
-                                        CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
-                                    }
-                                }
+                                null, direction
                             )
 
                             // 更新数据
@@ -551,8 +523,6 @@ class MogoPrivateObuNewManager private constructor() {
                                 if (alertContent.isEmpty() || ttsContent.isEmpty()) {
                                     return
                                 }
-                                //显示警告红边
-                                CallerHmiManager.showWarning(direction)
                                 CallerMsgBoxManager.saveMsgBox(
                                     MsgBoxBean(
                                         MsgBoxType.V2X,
@@ -570,14 +540,7 @@ class MogoPrivateObuNewManager private constructor() {
                                     v2xType,
                                     alertContent,
                                     ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                    object : IMoGoWarningStatusListener {
-                                        override fun onDismiss() {
-                                            // 关闭警告红边
-                                            CallerHmiManager.dismissWarning(
-                                                WarningDirectionEnum.ALERT_WARNING_ALL
-                                            )
-                                        }
-                                    }
+                                    null, direction
                                 )
                             }
 
@@ -586,7 +549,7 @@ class MogoPrivateObuNewManager private constructor() {
 
                             MogoObuConstants.STATUS.DELETE -> { // 删除
                                 // 关闭警告红边
-                                CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
                                 //删除弱势交通元素
                                 CallerMapUIServiceManager.getMarkerService()
                                     ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString())
@@ -612,7 +575,7 @@ class MogoPrivateObuNewManager private constructor() {
                     MogoObuConstants.STATUS.ADD -> { // 添加
                         UiThreadHandler.post {
                             if (data.speedMaxLimit > 0) {
-                                CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                                CallerLimitingVelocityListenerManager.invokeUnion(
                                     (data.speedMaxLimit * 3.6).roundToInt(), DataSourceType.OBU
                                 )
                             }
@@ -624,7 +587,7 @@ class MogoPrivateObuNewManager private constructor() {
 
                     MogoObuConstants.STATUS.DELETE -> { // 删除
                         UiThreadHandler.post {
-                            CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                            CallerLimitingVelocityListenerManager.invokeUnion(
                                 -1,
                                 DataSourceType.OBU
                             )
@@ -635,198 +598,368 @@ class MogoPrivateObuNewManager private constructor() {
         }
     }
 
-  }
+}
 
-    /**
-     * 获取消息的方位 车辆相关
-     */
-    private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
-        //        CallerLogger.d("$M_OBU${TAG_MOGO_NEW_OBU}", "预警红边：预警方向->$targetClassification")
-        return when (targetClassification) {
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
+/**
+ * 获取消息的方位 车辆相关
+ */
+private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum {
+    //        CallerLogger.d("$M_OBU${TAG_MOGO_NEW_OBU}", "预警红边：预警方向->$targetClassification")
+    return when (targetClassification) {
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_BOTTOM //正后方
 
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
+        MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_RIGHT -> WarningDirectionEnum.ALERT_WARNING_RIGHT //正右方
 
-            MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
+        MogoObuConstants.VEH_TARGET_POSITION.INTERSECTION_LEFT -> WarningDirectionEnum.ALERT_WARNING_LEFT //正左方
 
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
-            -> WarningDirectionEnum.ALERT_WARNING_TOP_LEFT //左前方
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_LEFT,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_LEFT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAR_LEFT
+        -> WarningDirectionEnum.ALERT_WARNING_TOP_LEFT //左前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
-            MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
-            -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
+        MogoObuConstants.VEH_TARGET_POSITION.AHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.AHEAD_FAR_RIGHT,
+        MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_FAT_RIGHT
+        -> WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT //右前方
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
-            -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_LEFT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_LEFT,
+        -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT //左后方
 
-            MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
-            -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
+        MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_RIGHT, MogoObuConstants.VEH_TARGET_POSITION.BEHEAD_FAR_RIGHT,
+        -> WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT  //右后方
 
-            MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
-            else -> WarningDirectionEnum.ALERT_WARNING_ALL
+        MogoObuConstants.VEH_TARGET_POSITION.UNCLASSIFIED -> WarningDirectionEnum.ALERT_WARNING_NON //未知
+        else -> WarningDirectionEnum.ALERT_WARNING_ALL
+    }
+}
+
+/**
+ * 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
+ *
+ * @param appId    使用WarningTypeEnum获取icon、提示内容、tts内容  TODO 添加事件频繁播报拦截
+ *
+ * @see com.mogo.module.common.enums.EventTypeEnum
+ */
+private fun handleSdkObu(
+    appId: String,
+    direction: WarningDirectionEnum,
+    status: Int,
+    level: Int,
+    info: MogoObuRvWarningData
+) {
+    //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnumNew 提供的
+    var alertContent: String = ""
+    var ttsContent: String = ""
+    var changeVisualAngle = false
+    when (appId) {
+        //交叉路口碰撞预警
+        MogoObuConstants.V2X_WARNING_TYPE.FCW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
+        }
+
+        //交叉路口碰撞预警
+        MogoObuConstants.V2X_WARNING_TYPE.ICW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType)
+        }
+
+        //左转辅助预警
+        MogoObuConstants.V2X_WARNING_TYPE.LTA.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LTA.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_LTA.poiType)
+        }
+
+        //盲区预警
+        MogoObuConstants.V2X_WARNING_TYPE.BSW.toString() -> {
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType)
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType)
+            if (
+                direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+            ) { //左后
+                changeVisualAngle = true
+                ttsContent = String.format(ttsContent, "左")
+                alertContent = String.format(alertContent, "左")
+            } else if (
+                direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+            ) { //右后
+                changeVisualAngle = true
+                ttsContent = String.format(ttsContent, "右")
+                alertContent = String.format(alertContent, "右")
+            }
+        }
+
+        // 变道预警,注意左后车辆/注意右后车辆
+        MogoObuConstants.V2X_WARNING_TYPE.LCW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType)
+            if (
+                direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+            ) {
+                ttsContent = String.format(ttsContent, "左")
+                alertContent = String.format(alertContent, "左")
+            } else if (
+                direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+                direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+            ) {
+                ttsContent = String.format(ttsContent, "右")
+                alertContent = String.format(alertContent, "右")
+            }
+        }
+
+        //逆向超车预警
+        MogoObuConstants.V2X_WARNING_TYPE.DNPW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType)
+        }
+
+        //紧急制动预警
+        MogoObuConstants.V2X_WARNING_TYPE.EBW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EBW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_EBW.poiType)
+        }
+
+        //异常车辆提醒
+        MogoObuConstants.V2X_WARNING_TYPE.AVW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType)
+            alertContent = String.format(alertContent, direction.desc)
+            ttsContent = String.format(ttsContent, direction.desc)
+        }
+
+        //车辆失控预警
+        MogoObuConstants.V2X_WARNING_TYPE.CLW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType)
+            alertContent = String.format(alertContent, direction.desc)
+            ttsContent = String.format(ttsContent, direction.desc)
+        }
+        //车辆失控预警
+        MogoObuConstants.V2X_WARNING_TYPE.EVW.toString() -> {
+            alertContent =
+                EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EVW.poiType)
+            ttsContent =
+                EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_EVW.poiType)
+        }
+
+        // 这里处理固定的提示信息,包括了<紧急车辆提醒>
+        else -> { //TODO
+//                ttsContent = EventTypeEnumNew.getWarningTts(appId.toString())
+//                alertContent = EventTypeEnumNew.getWarningContent(appId.toString())
         }
     }
 
-    /**
-     * 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
-     *
-     * @param appId    使用WarningTypeEnum获取icon、提示内容、tts内容  TODO 添加事件频繁播报拦截
-     *
-     * @see com.mogo.module.common.enums.EventTypeEnum
-     */
-    private fun handleSdkObu(
-        appId: String,
-        direction: WarningDirectionEnum,
-        status: Int,
-        level: Int,
-        info: MogoObuRvWarningData
-    ) {
-        //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnumNew 提供的
-        var alertContent: String = ""
-        var ttsContent: String = ""
-        var changeVisualAngle = false
-        when (appId) {
-            //交叉路口碰撞预警
-            MogoObuConstants.V2X_WARNING_TYPE.FCW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
-            }
+    when (status) {
+        // 添加,更新 add的时候，可能级别是2，
+        MogoObuConstants.STATUS.ADD,
+        MogoObuConstants.STATUS.UPDATE -> {
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
+                "new handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+            )
+            if (level == 2 || level == 3) {
+                //不显示弹框，其它保留
+                CallerMsgBoxManager.saveMsgBox(
+                    MsgBoxBean(
+                        MsgBoxType.V2X,
+                        V2XMsg(
+                            appId,
+                            alertContent,
+                            ttsContent
+                        )
+                    ).apply {
+                        sourceType = DataSourceType.OBU
+                    }
+                )
+                CallerHmiManager.warningV2X(
+                    appId,
+                    alertContent,
+                    ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                    object : IMoGoWarningStatusListener {
+                        override fun onShow() {
+                            super.onShow()
+                            if (changeVisualAngle) {
+                                CallerVisualAngleManager.changeVisualAngle(TooClose)
+                            }
+                        }
 
-            //交叉路口碰撞预警
-            MogoObuConstants.V2X_WARNING_TYPE.ICW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_ICW.poiType)
+                        override fun onDismiss() {
+                            if (changeVisualAngle) {
+                                CallerVisualAngleManager.changeVisualAngle(Default())
+                            }
+                        }
+                    }, direction
+                )
             }
-
-            //左转辅助预警
-            MogoObuConstants.V2X_WARNING_TYPE.LTA.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LTA.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_LTA.poiType)
-            }
-
-            //盲区预警
-            MogoObuConstants.V2X_WARNING_TYPE.BSW.toString() -> {
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType)
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_BSW.poiType)
-                if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) { //左后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) { //右后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
-                }
-            }
-
-            // 变道预警,注意左后车辆/注意右后车辆
-            MogoObuConstants.V2X_WARNING_TYPE.LCW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType)
-                if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) {
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                    direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                    direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) {
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
-                }
-            }
-
-            //逆向超车预警
-            MogoObuConstants.V2X_WARNING_TYPE.DNPW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_DNPW.poiType)
-            }
-
-            //紧急制动预警
-            MogoObuConstants.V2X_WARNING_TYPE.EBW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EBW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_EBW.poiType)
-            }
-
-            //异常车辆提醒
-            MogoObuConstants.V2X_WARNING_TYPE.AVW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_AVW.poiType)
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
-            }
-
-            //车辆失控预警
-            MogoObuConstants.V2X_WARNING_TYPE.CLW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_CLW.poiType)
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
-            }
-            //车辆失控预警
-            MogoObuConstants.V2X_WARNING_TYPE.EVW.toString() -> {
-                alertContent =
-                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_EVW.poiType)
-                ttsContent =
-                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_EVW.poiType)
-            }
-
-            // 这里处理固定的提示信息,包括了<紧急车辆提醒>
-            else -> { //TODO
-    //                ttsContent = EventTypeEnumNew.getWarningTts(appId.toString())
-    //                alertContent = EventTypeEnumNew.getWarningContent(appId.toString())
+            //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
+            TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
+                CallerMapUIServiceManager.getMarkerService()
+                    ?.updateITrafficThreatLevelInfo(it)
             }
         }
+        // 删除
+        MogoObuConstants.STATUS.DELETE -> {
+            // 关闭警告红边
+            CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
+            //更新周边车辆进行预警颜色变换，车辆实时移动和变色
+            TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
+                it.threatLevel = 0x01
+                CallerMapUIServiceManager.getMarkerService()
+                    ?.updateITrafficThreatLevelInfo(it)
+            }
+        }
+    }
+}
 
-        when (status) {
-            // 添加,更新 add的时候，可能级别是2，
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE -> {
+/**
+ * 处理红绿灯
+ */
+private fun handlerTrafficLight(appId: Int, status: Int, lights: List<SpatLight>) {
+    CallerLogger.d(
+        "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
+        "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights ---appId = $appId"
+    )
+    when (status) {
+        // 添加
+        MogoObuConstants.STATUS.ADD,
+        MogoObuConstants.STATUS.UPDATE
+        -> {
+            if (lights != null && lights.isNotEmpty()) {
+                changeTrafficLightStatus(appId, lights)
+            }
+        }
+        // 删除
+        MogoObuConstants.STATUS.DELETE -> {
+            // 移除顶部弹窗
+            CallerTrafficLightListenerManager.disableTrafficLight()
+            isShowGreenWave = false
+            isShowRunRedLight = false
+//                lightCountDownRed = 1
+//                lightCountDownGreen = 1
+//                lightCountDownYellow = 1
+        }
+    }
+}
+
+private var isShowGreenWave = false
+private var isShowRunRedLight = false
+
+
+/**
+ * 修改红绿灯
+ */
+@Synchronized
+private fun changeTrafficLightStatus(
+    appId: Int,
+    lights: List<SpatLight>
+) {
+    var ttsContent = ""
+    var alertContent = ""
+    //这里需要根据真实数据确定 index 取值方式
+    val currentLight = lights[0]
+    CallerLogger.d(
+        "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
+        "changeTrafficLightStatus currentLight = $currentLight ----currentLight.light = ${currentLight.light} ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId --countDown =  ${currentLight.countDown.toInt()}"
+    )
+    // 闯红灯预警，绿波通行和闯红灯是互斥的
+    when (appId) {
+        0 -> {//不可用 V2I_RLVW_VIOLATION_TYPE_UNAVAILABLE 无效
+
+        }
+        1 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT 一个红灯周期只显示一次
+            if (!isShowRunRedLight) {
+                isShowRunRedLight = true
                 CallerLogger.d(
                     "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-                    "new handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+                    "changeTrafficLightStatus 闯红灯 --------> "
                 )
-                if (level == 2 || level == 3) {
-                    //不显示弹框，其它保留
+                ttsContent =
+                    EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType)
+                alertContent =
+                    EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType)
+                CallerMsgBoxManager.saveMsgBox(
+                    MsgBoxBean(
+                        MsgBoxType.V2X,
+                        V2XMsg(
+                            EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType,
+                            alertContent,
+                            ttsContent
+                        )
+                    ).apply {
+                        sourceType = DataSourceType.OBU
+                    }
+                )
+
+                CallerHmiManager.warningV2X(
+                    EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType,
+                    alertContent,
+                    ttsContent// 只有第一次才tts，防止更新的时候不断的提醒
+                )
+            }
+        }
+
+        2 -> { //绿波通行引导 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION 一个绿灯周期只显示一次 100m的时候
+            if (!isShowGreenWave) {
+                isShowGreenWave = true
+
+                var minSpeedTemp = Math.round(currentLight.suggestMinSpeed * 3.6)
+                var maxSpeedTemp = Math.round(currentLight.suggestMaxSpeed * 3.6)
+                if (minSpeedTemp == maxSpeedTemp) {
+                    minSpeedTemp -= 5
+                }
+
+                val adviceSpeed = "$minSpeedTemp - $maxSpeedTemp"
+                val adviceSpeedTts = "$minSpeedTemp 到 $maxSpeedTemp"
+
+//                    val adviceSpeed =
+//                        "${Math.round(currentLight.suggestMinSpeed*3.6)} - ${Math.round(currentLight.suggestMaxSpeed*3.6)}"
+//                    val adviceSpeedTts =
+//                        "${Math.round(currentLight.suggestMinSpeed*3.6)} 到 ${Math.round(currentLight.suggestMaxSpeed*3.6)}"
+
+                ttsContent =
+                    String.format(
+                        EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                        adviceSpeedTts
+                    )
+                alertContent =
+                    String.format(
+                        EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                        adviceSpeed
+                    )
+
+                val maxSpeed = currentLight.suggestMaxSpeed
+                if (maxSpeed > 0) {
                     CallerMsgBoxManager.saveMsgBox(
                         MsgBoxBean(
                             MsgBoxType.V2X,
                             V2XMsg(
-                                appId,
+                                EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
                                 alertContent,
                                 ttsContent
                             )
@@ -835,205 +968,50 @@ class MogoPrivateObuNewManager private constructor() {
                         }
                     )
                     CallerHmiManager.warningV2X(
-                        appId,
-                        alertContent,
-                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                        object : IMoGoWarningStatusListener {
-                            override fun onShow() {
-                                super.onShow()
-                                if (changeVisualAngle) {
-                                    CallerVisualAngleManager.changeVisualAngle(TooClose)
-                                }
-                            }
-
-                            override fun onDismiss() {
-                                // 关闭警告红边
-                                CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
-                                if (changeVisualAngle) {
-                                    CallerVisualAngleManager.changeVisualAngle(Default())
-                                }
-                            }
-                        }
-                    )
-                    //显示警告红边
-                    CallerHmiManager.showWarning(direction)
-                }
-                //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
-                TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    CallerMapUIServiceManager.getMarkerService()
-                        ?.updateITrafficThreatLevelInfo(it)
-                }
-            }
-            // 删除
-            MogoObuConstants.STATUS.DELETE -> {
-                // 关闭警告红边
-                CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                // 移除顶部弹窗
-                //                CallerHmiManager.disableWarningV2X((appId + direction.direction))
-                //更新周边车辆进行预警颜色变换，车辆实时移动和变色
-                TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
-                    it.threatLevel = 0x01
-                    CallerMapUIServiceManager.getMarkerService()
-                        ?.updateITrafficThreatLevelInfo(it)
-                }
-            }
-        }
-    }
-
-    /**
-     * 处理红绿灯
-     */
-    private fun handlerTrafficLight(appId: Int, status: Int, lights: List<SpatLight>) {
-        CallerLogger.d(
-            "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-            "handlerTrafficLight --- status = $status ---lights.size = ${lights.size} ---lights = $lights ---appId = $appId"
-        )
-        when (status) {
-            // 添加
-            MogoObuConstants.STATUS.ADD,
-            MogoObuConstants.STATUS.UPDATE
-            -> {
-                if (lights != null && lights.isNotEmpty()) {
-                    changeTrafficLightStatus(appId, lights)
-                }
-            }
-            // 删除
-            MogoObuConstants.STATUS.DELETE -> {
-                // 移除顶部弹窗
-                CallerTrafficLightListenerManager.disableTrafficLight()
-                isShowGreenWave = false
-                isShowRunRedLight = false
-            }
-        }
-    }
-
-
-    private var isYellowLight = false
-    private var isShowGreenWave = false
-    private var isShowRunRedLight = false
-
-
-
-    /**
-     * 修改红绿灯
-     */
-    @Synchronized
-    private fun changeTrafficLightStatus(
-        appId: Int,
-        lights: List<SpatLight>
-    ) {
-        var ttsContent = ""
-        var alertContent = ""
-        //这里需要根据真实数据确定 index 取值方式
-        val currentLight = lights[0]
-        CallerLogger.d(
-            "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-            "changeTrafficLightStatus currentLight = $currentLight ----currentLight.light = ${currentLight.light} ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId --countDown =  ${currentLight.countDown.toInt()}"
-        )
-        // 闯红灯预警，绿波通行和闯红灯是互斥的
-        when (appId) {
-            0 -> {//不可用 V2I_RLVW_VIOLATION_TYPE_UNAVAILABLE 无效
-
-            }
-            1 -> {//闯红灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_RED_LIGHT 一个红灯周期只显示一次
-                if (!isShowRunRedLight) {
-                    isShowRunRedLight = true
-                    CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-                        "changeTrafficLightStatus 闯红灯 --------> "
-                    )
-                    ttsContent =
-                        EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType)
-                    alertContent =
-                        EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType)
-                    CallerMsgBoxManager.saveMsgBox(
-                        MsgBoxBean(
-                            MsgBoxType.V2X,
-                            V2XMsg(
-                                EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType,
-                                alertContent,
-                                ttsContent
-                            )
-                        ).apply {
-                            sourceType = DataSourceType.OBU
-                        }
-                    )
-
-                    CallerHmiManager.warningV2X(
-                        EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType,
+                        EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
                         alertContent,
                         ttsContent// 只有第一次才tts，防止更新的时候不断的提醒
                     )
                 }
             }
-
-            2 -> { //绿波通行引导 V2I_RLVW_VIOLATION_TYPE_NO_VIOLATION 一个绿灯周期只显示一次 100m的时候
-                if (!isShowGreenWave) {
-                    isShowGreenWave = true
-
-                    var minSpeedTemp = Math.round(currentLight.suggestMinSpeed * 3.6)
-                    var maxSpeedTemp = Math.round(currentLight.suggestMaxSpeed * 3.6)
-                    if (minSpeedTemp == maxSpeedTemp) {
-                        minSpeedTemp -= 5
-                    }
-
-                    val adviceSpeed = "$minSpeedTemp - $maxSpeedTemp"
-                    val adviceSpeedTts = "$minSpeedTemp 到 $maxSpeedTemp"
-
-                    ttsContent =
-                        String.format(
-                            EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                            adviceSpeedTts
-                        )
-                    alertContent =
-                        String.format(
-                            EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                            adviceSpeed
-                        )
-
-                    val maxSpeed = currentLight.suggestMaxSpeed
-                    if (maxSpeed > 0) {
-                        CallerMsgBoxManager.saveMsgBox(
-                            MsgBoxBean(
-                                MsgBoxType.V2X,
-                                V2XMsg(
-                                    EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
-                                    alertContent,
-                                    ttsContent
-                                )
-                            ).apply {
-                                sourceType = DataSourceType.OBU
-                            }
-                        )
-
-                        CallerHmiManager.warningV2X(
-                            EventTypeEnumNew.TYPE_USECASE_ID_IVP_GREEN.poiType,
-                            alertContent,
-                            ttsContent// 只有第一次才tts，防止更新的时候不断的提醒
-                        )
-                    }
-                }
-            }
-        }
-
-        when (currentLight.light) {
-            // 灯光不可用
-            0 -> {
-                CallerTrafficLightListenerManager.invokeObuTrafficLightStatus(TrafficLightEnum.BLACK)
-            }
-            // 红灯
-            2, 3 -> {
-                CallerTrafficLightListenerManager.invokeObuTrafficLightStatus(TrafficLightEnum.RED)
-            }
-
-            // 绿灯
-            4, 5, 6 -> {
-                CallerTrafficLightListenerManager.invokeObuTrafficLightStatus(TrafficLightEnum.GREEN)
-            }
-
-            // 黄灯
-            7, 8 -> {
-                CallerTrafficLightListenerManager.invokeObuTrafficLightStatus(TrafficLightEnum.YELLOW)
-            }
         }
     }
+
+    when (currentLight.light) {
+        // 灯光不可用
+        0 -> {
+            CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
+                TrafficLightEnum.BLACK,
+                -1,
+                DataSourceType.OBU
+            )
+        }
+        // 红灯
+        2, 3 -> {
+            val red = currentLight.countDown.toInt()
+            CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
+                TrafficLightEnum.RED,
+                red,
+                DataSourceType.OBU
+            )
+        }
+        // 绿灯
+        4, 5, 6 -> {
+            val green = currentLight.countDown.toInt()
+            CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
+                TrafficLightEnum.GREEN,
+                green,
+                DataSourceType.OBU
+            )
+        }
+        // 黄灯
+        7, 8 -> {
+            val yellow = currentLight.countDown.toInt()
+            CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
+                TrafficLightEnum.YELLOW,
+                yellow,
+                DataSourceType.OBU
+            )
+        }
+    }
+}

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt

@@ -1,12 +1,9 @@
-package com.mogo.eagle.function.biz.v2x.speedlimit
+package com.mogo.eagle.core.function.datacenter.v2x
 
 import android.content.Context
-import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
-import com.zhjt.service_biz.BizConfig
 
 /**
  * @author lixiaopeng
@@ -35,11 +32,12 @@ class SpeedLimitDispatcher : ILimitingVelocityListener {
      * 地图限速数据
      */
 //    @BizConfig(FuncBizConfig.V2I, "", FuncBizConfig.BIZ_SLW) //todo arrow 重新考虑放的位置
-    override fun onLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) {
+    override fun onUnion(limitingVelocity: Int, sourceType: DataSourceType) {
+        super.onUnion(limitingVelocity, sourceType)
         when (sourceType) { // obu 优先级高于 map，体现链路能力
             DataSourceType.OBU -> {
                 hasObuStatus = limitingVelocity > 0
-                CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
                     limitingVelocity,
                     sourceType
                 )
@@ -47,7 +45,7 @@ class SpeedLimitDispatcher : ILimitingVelocityListener {
             }
             DataSourceType.MAP -> {
                 if (!hasObuStatus) {
-                    CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
+                    CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
                         limitingVelocity,
                         sourceType
                     )

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.function.biz.v2x.trafficlight.core
+package com.mogo.eagle.core.function.datacenter.v2x
 
 import android.content.Context
 import android.os.Handler
@@ -6,12 +6,31 @@ import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
 import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import perception.TrafficLightOuterClass
 import perception.TrafficLightOuterClass.TrafficLight
 
+fun TrafficLightStatus.convert(): TrafficLightEnum {
+    return when {
+        this.isGreen() || this.isFlashGreen() -> TrafficLightEnum.GREEN
+        this.isYellow() -> TrafficLightEnum.YELLOW
+        this.isRed() -> TrafficLightEnum.RED
+        else -> TrafficLightEnum.BLACK
+    }
+}
+
+fun TrafficLight.convert(): TrafficLightEnum {
+    return when (this.state) {
+        TrafficLightOuterClass.LightState.STATE_GREEN -> TrafficLightEnum.GREEN
+        TrafficLightOuterClass.LightState.STATE_YELLOW -> TrafficLightEnum.YELLOW
+        TrafficLightOuterClass.LightState.STATE_RED -> TrafficLightEnum.RED
+        TrafficLightOuterClass.LightState.STATE_OFF -> TrafficLightEnum.BLACK
+        else -> TrafficLightEnum.BLACK
+    }
+}
+
 /**
  * @author XuXinChao
  * @description 对多个红绿灯信号来源进行统一调度（AI云、工控机、OBU）
@@ -38,7 +57,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
 
     fun initServer(context: Context) {
         mContext = context
-        //注册监听AI云获取红绿灯状态
+        //注册监听AI云.OBU，路侧获取红绿灯状态
         CallerTrafficLightListenerManager.addListener(TAG, this)
         //注册监听工控机感知红绿灯
         CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
@@ -66,39 +85,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                         //隐藏红绿灯显示
                         CallerTrafficLightListenerManager.disableTrafficLight()
                     } else {
-                        when (light.state) {
-                            TrafficLightOuterClass.LightState.STATE_RED -> {
-                                //红灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.RED,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownRed(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_YELLOW -> {
-                                //黄灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.YELLOW,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownYellow(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_GREEN -> {
-                                //绿灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.GREEN,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownGreen(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_OFF -> {
-                                //黑灯，隐藏红绿灯显示
-                                CallerTrafficLightListenerManager.disableTrafficLight()
-                            }
-                            else -> {}
-                        }
+                        onTrafficLightPlusSource(light.convert(), 0, DataSourceType.TELEMATIC)
                     }
-
                 }
             }
         }
@@ -109,8 +97,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
      */
     override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
         if (!hasObuLightStatus) {
-            updateTrafficLight(trafficLightResult)
             hasAiLightStatus = true
+            updateTrafficLight(trafficLightResult)
         }
     }
 
@@ -140,10 +128,38 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     /**
      * obu 红绿灯数据
      */
-    override fun onObuTrafficLightStatus(light: TrafficLightEnum) {
-        super.onObuTrafficLightStatus(light)
-        hasObuLightStatus = true
-        CallerTrafficLightListenerManager.showTrafficLight(light, DataSourceType.OBU)
+    override fun onTrafficLightPlusSource(
+        light: TrafficLightEnum,
+        remain: Int,
+        lightSource: DataSourceType
+    ) {
+        super.onTrafficLightPlusSource(light, remain, lightSource)
+
+        if (lightSource == DataSourceType.OBU) {
+            hasObuLightStatus = true //todo 会存在优先级高的数据没有回调，导致没有数据出现
+        }
+
+        CallerTrafficLightListenerManager.showTrafficLight(light, lightSource)
+        if (remain == -1) {
+            CallerTrafficLightListenerManager.disableTrafficLightCountDown()
+            return
+        }
+
+        when (light) {
+            TrafficLightEnum.GREEN -> {
+                CallerTrafficLightListenerManager.changeCountdownGreen(remain)
+            }
+            TrafficLightEnum.RED -> {
+                CallerTrafficLightListenerManager.changeCountdownRed(remain)
+            }
+            TrafficLightEnum.YELLOW -> {
+                CallerTrafficLightListenerManager.changeCountdownYellow(remain)
+            }
+            TrafficLightEnum.BLACK -> {
+                CallerTrafficLightListenerManager.disableTrafficLightCountDown()
+            }
+        }
+
     }
 
     private fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
@@ -154,25 +170,13 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
             } else {
                 it.remain
             }
-            when {
-                it.isGreen() || it.isFlashGreen() -> {
-                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.GREEN, DataSourceType.AICLOUD)
-                    CallerTrafficLightListenerManager.changeCountdownGreen(remain)
-                }
-                it.isYellow() -> {
-                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.YELLOW, DataSourceType.AICLOUD)
-                    CallerTrafficLightListenerManager.changeCountdownYellow(remain)
-                }
-                it.isRed() -> {
-                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.RED, DataSourceType.AICLOUD)
-                    CallerTrafficLightListenerManager.changeCountdownRed(remain)
-                }
-            }
+            onTrafficLightPlusSource(it.convert(), remain, DataSourceType.AICLOUD)
         }
+
     }
 
     fun destroy() {
-        //取消注册监听AI云获取红绿灯状态
+        //取消注册监听AI云.OBU,路侧获取红绿灯状态
         CallerTrafficLightListenerManager.removeListener(TAG)
         //取消注册监听工控机感知红绿灯
         CallerAutopilotIdentifyListenerManager.removeListener(TAG)

core/function-impl/mogo-core-function-devatools/build.gradle

@@ -88,14 +88,11 @@ dependencies {
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_utils
         implementation rootProject.ext.dependencies.mogo_core_function_call
-        implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_res
     }else {
-        implementation project(':foudations:mogo-aicloud-services-sdk')
         implementation project(':foudations:mogo-commons')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
-        implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-res')
     }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -13,7 +13,9 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
+import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
 import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
@@ -21,6 +23,8 @@ import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl
 import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangManager.Companion.moFangManager
 import com.zhjt.mogo_core_function_devatools.monitor.MonitorManager
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb.Companion.getDb
 import com.zhjt.mogo_core_function_devatools.report.IPCReportManager.Companion.iPCReportManager
 import com.zhjt.mogo_core_function_devatools.scene.SceneManager.Companion.sceneManager
 import com.zhjt.mogo_core_function_devatools.status.StatusManager
@@ -55,6 +59,27 @@ class DevaToolsProvider : IDevaToolsProvider {
         bindingCarManager.init(mContext!!)
     }
 
+    override fun checkMonitorDb() {
+        mContext?.let {
+            Thread {
+                val limitId: Long = 50001
+                val file = it.getDatabasePath(MonitorDb.INTERNAL_DB_NAME)
+                try {
+                    if (file != null && file.exists()) {
+                        val cpuList = getDb(it).monitorDao().getAllCPUById(limitId)
+                        val memList = getDb(it).monitorDao().getAllMemById(limitId)
+                        // 大于5w条清除
+                        if (cpuList.isNotEmpty() || memList.isNotEmpty()) {
+                            it.deleteDatabase(MonitorDb.INTERNAL_DB_NAME)
+                        }
+                    }
+                } catch (e: Exception) {
+                    CallerLogger.e(TAG, e.message)
+                }
+            }.start()
+        }
+    }
+
     override fun startLogCatch() {
         MogoLogCatchManager.startCatchLog()
     }
@@ -123,6 +148,10 @@ class DevaToolsProvider : IDevaToolsProvider {
         upgradeManager.downLoadPackage(mContext!!, downloadKey, downloadUrl)
     }
 
+    override fun updateUpgradeProgress() {
+        upgradeManager.updateUpgradeProgress(mContext!!)
+    }
+
     override fun showStatusBar(ctx: Context, container: ViewGroup) {
         StatusManager.init(ctx)
         StatusManager.show(container)
@@ -148,6 +177,26 @@ class DevaToolsProvider : IDevaToolsProvider {
         return EnvChangeManager.getEnvConfig()
     }
 
+    override fun getEnvCityName(): String {
+        return EnvChangeManager.getCityName()
+    }
+
+    override fun getEnvNetMode(): String {
+        return EnvChangeManager.getNetMode()
+    }
+
+    override fun envConfigReset() {
+        EnvChangeManager.reset()
+    }
+
+    override fun envConfigChange(cityCode: String, netMode: Int) {
+        EnvChangeManager.changeTo(cityCode, netMode)
+    }
+
+    override fun dockerVersion(dockerVersion: String?) {
+        BadCaseConfig.dockerVersion = dockerVersion
+    }
+
     override fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
         bindingCarManager.modifyCarInfo(callBack)
     }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/repository/net/api/BadCaseApi.kt

@@ -8,9 +8,9 @@ import retrofit2.http.*
 internal interface BadCaseApi {
 
     @FormUrlEncoded
-    @POST("/yycp-vehicle-management-service/tool/badcase/add/v2")
+    @POST("eagle-eye-dns/yycp-vehicle-management-service/tool/badcase/add/v2")
     suspend fun post(@FieldMap map: Map<String, String>): Response<UploadResult>
 
-    @GET("/yycp-vehicle-management-service/tool/badcase/reasons")
+    @GET("eagle-eye-dns/yycp-vehicle-management-service/tool/badcase/reasons")
     suspend fun get(@Query("channel", encoded = true) channel: String, @Query("pageNo") pageNo: Int): Response<BadCaseResponse>
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt

@@ -17,6 +17,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
+import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
 import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeAppNetWorkManager
 import mogo.telematics.pad.MessagePad
 
@@ -160,4 +161,13 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
             .getAppUpgradeInfo(mContext, mAddress, role.toString() + "")
     }
 
-}
+    /**
+     * 司机屏 处理obu升级即可,乘客屏不需要处理 TODO OBU的角色
+     *
+     */
+    fun queryObuUpgrade() {
+        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, role.toString() + "")
+    }
+
+}
+

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt

@@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBindingCarDialog
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showModifyBindingCarDialog
-import com.mogo.eagle.core.function.call.map.CallerHDMapManager.changeCurrentIcon
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
@@ -156,19 +156,19 @@ class BindingCarNetWorkManager private constructor() {
         d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId")
         when (brandId) {
             "1" -> {
-                changeCurrentIcon(R.raw.chuzuche)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
                 HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
             }
             "2" -> {
-                changeCurrentIcon(R.raw.hq_h9)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.hq_h9)
                 HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9
             }
             "3" -> {
-                changeCurrentIcon(R.raw.xiaobache)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
                 HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
             }
             else -> {
-                changeCurrentIcon(R.raw.chuzuche)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
                 HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche
             }
         }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt

@@ -2,12 +2,12 @@ package com.zhjt.mogo_core_function_devatools.env
 
 import android.content.Context.MODE_PRIVATE
 import android.os.Process
-import com.mogo.commons.constants.*
-import com.mogo.commons.debug.*
+import com.mogo.commons.constants.SharedPrefsConstants
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.EnvConfig
-import com.mogo.eagle.core.function.call.map.*
-import com.mogo.eagle.core.utilcode.mogo.storage.*
-import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.Utils
 
 
 object EnvChangeManager {
@@ -34,7 +34,7 @@ object EnvChangeManager {
     fun getCityName(): String {
         val cache = getConfig()
         return if (cache == null) {
-            when(CallerMapLocationListenerManager.getCurrentLocation()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
+            when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
                 "010" -> "北京"
                 "0734" -> "衡阳"
                 else -> "未知"

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt

@@ -8,7 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import com.mogo.eagle.core.data.mofang.MfConstants
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateMfStatusView
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager.invokeMoFangStatus
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_F
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
@@ -96,7 +96,7 @@ class MoFangManager private constructor() {
                 BluetoothDevice.ACTION_ACL_CONNECTED -> { //蓝牙设备已连接
                     if (!isMfConnect) {
 //                        showBondedDevice(mBluetoothAdapter)
-                        updateMfStatusView(TAG, true)
+                        invokeMoFangStatus(true)
                         isMfConnect = true
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, true) }
                     }
@@ -106,7 +106,7 @@ class MoFangManager private constructor() {
                 BluetoothDevice.ACTION_ACL_DISCONNECTED -> { //蓝牙设备已断开 主动更新
                     CallerLogger.d("$M_F${TAG}","bluetoothMonitorReceiver  ACTION_ACL_DISCONNECTED ----- isMfConnect = $isMfConnect ")
                     if (isMfConnect) {
-                        updateMfStatusView(TAG, false)
+                        invokeMoFangStatus(false)
                         isMfConnect = false
                         mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean(MfConstants.BLUETOOTH_STATUS, false) }
                     }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java

@@ -0,0 +1,95 @@
+package com.zhjt.mogo_core_function_devatools.upgrade;
+
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING;
+
+import android.content.Context;
+
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.constants.HostConst;
+import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.network.MoGoRetrofitFactory;
+import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.AppUtils;
+
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * @author lixiaopeng
+ * @description 获取obu升级信息
+ * @since: 3/25/22
+ */
+public class ObuUpgradeAppNetWorkManager {
+    private static volatile ObuUpgradeAppNetWorkManager requestNoticeManager;
+    private final UpgradeApiService mUpgradeApiService;
+    private static final String TAG = "ObuUpgrade";
+
+    private ObuUpgradeAppNetWorkManager() {
+        mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost())
+                .create(UpgradeApiService.class);
+    }
+
+    public static ObuUpgradeAppNetWorkManager getInstance() {
+        if (requestNoticeManager == null) {
+            synchronized (ObuUpgradeAppNetWorkManager.class) {
+                if (requestNoticeManager == null) {
+                    requestNoticeManager = new ObuUpgradeAppNetWorkManager();
+                }
+            }
+        }
+        return requestNoticeManager;
+    }
+
+    /**
+     * 获取obu升级信息
+     * mac ：工控机mac地址
+     * screenType ： 类型
+     */
+    public void getObuUpgradeInfo(Context context, String mac, String screenType) {
+//        String sn = "X20202203105S688HZ";
+//        String mac = "48:b0:2d:3a:bc:78";
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        int versionCode = AppUtils.getAppVersionCode();
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
+        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
+        RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
+        mUpgradeApiService.getUpgradeInfo(requestBody)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<UpgradeAppInfo>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                    }
+
+                    @Override
+                    public void onNext(@NonNull UpgradeAppInfo info) {
+                        if (info != null && info.result != null) {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
+                            if (info.result.getVersionCode() > versionCode) {
+                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType());
+                            }
+                        } else {
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt

@@ -1,7 +1,12 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
+import android.app.NotificationManager
 import android.content.Context
+import androidx.core.app.NotificationCompat
+import com.elegant.utils.UiThreadHandler
+import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateStatusBarDownloadView
 import com.mogo.eagle.core.utilcode.breakpoint.Config
 import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
 import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
@@ -110,4 +115,36 @@ class UpgradeManager : IDownload {
             }
         }
     }
+
+    fun updateUpgradeProgress(context: Context) {
+        val builder = NotificationCompat.Builder(context)
+        //        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
+        builder.setContentTitle("下载")
+        builder.setContentText("正在下载")
+        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        CallerDevaToolsUpgradeListenerManager.addListener(
+            TAG,
+            object : IMogoDevaToolsUpgradeListener {
+                override fun onStart(url: String?) {}
+                override fun onPause(url: String?) {}
+                override fun onProgress(url: String?, length: Int) {
+                    builder.setProgress(100, length, false)
+                    manager.notify(0x3, builder.build())
+                    //下载进度提示
+                    builder.setContentText("已下载$length%")
+                    updateStatusBarDownloadView(true, "download", length)
+                }
+
+                override fun onFinished(url: String?) {
+                    builder.setContentText("已下载" + 100 + "%")
+                    UiThreadHandler.postDelayed({
+                        manager.cancel(0x3)
+                        updateStatusBarDownloadView(false, "download", 100)
+                    }, 1000)
+                }
+
+                override fun onError(url: String?, errorMsg: String?) {}
+            })
+    }
+
 }

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -78,39 +78,22 @@ dependencies {
     implementation rootProject.ext.dependencies.koomnative
     implementation rootProject.ext.dependencies.koomxhook
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        api rootProject.ext.dependencies.mogoaicloudservicesdk
-        api rootProject.ext.dependencies.mogocommons
-        api rootProject.ext.dependencies.mogomap
-        api rootProject.ext.dependencies.crashreportupgrade
 
+        compileOnly rootProject.ext.dependencies.mogocommons
         api rootProject.ext.dependencies.mogo_core_res
-        api rootProject.ext.dependencies.mogo_core_data
-        api rootProject.ext.dependencies.mogo_core_utils
-        api rootProject.ext.dependencies.mogo_core_network
-        api rootProject.ext.dependencies.mogo_core_function_map
-        api rootProject.ext.dependencies.mogo_core_function_v2x
-        api rootProject.ext.dependencies.mogo_core_function_devatools
-        api rootProject.ext.dependencies.mogo_core_function_call
-
-        implementation project(':libraries:map-usbcamera')
+        compileOnly rootProject.ext.dependencies.mogo_core_utils
+        compileOnly rootProject.ext.dependencies.mogo_core_function_datacenter
+        compileOnly rootProject.ext.dependencies.mogo_core_function_call
+        compileOnly project(':libraries:mogo-adas')
     } else {
-        api project(':foudations:mogo-aicloud-services-sdk')
-        api project(':foudations:mogo-commons')
-        api project(':test:crashreport-upgrade')
         api project(':test:crashreport-apmbyte')
 
+        compileOnly project(':core:function-impl:mogo-core-function-datacenter')
+        compileOnly project(':foudations:mogo-commons')
         api project(':core:mogo-core-res')
-        api project(':core:mogo-core-data')
-        api project(':core:mogo-core-utils')
-        api project(':core:function-impl:mogo-core-function-map')
-        api project(':core:function-impl:mogo-core-function-v2x')
-        api project(':core:function-impl:mogo-core-function-devatools')
-        api project(':core:function-impl:mogo-core-function-chat')
-        api project(':core:function-impl:mogo-core-function-datacenter')
-        api project(':core:function-impl:mogo-core-function-biz')
-        api project(':core:mogo-core-function-call')
-        api project(':libraries:mogo-adas')
-        api project(':libraries:map-usbcamera')
+        compileOnly project(':core:mogo-core-utils')
+        compileOnly project(':core:mogo-core-function-call')
+        compileOnly project(':libraries:mogo-adas')
     }
 }
 

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.mogo.eagle.core.function.hmi">
 
+
+    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.BIND_APPWIDGET" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -39,10 +56,11 @@
             android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:resizeableActivity="false"
             android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
+            android:screenOrientation="${SCREEN_ORIENTATION}"
             android:stateNotNeeded="true"
             android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
@@ -67,7 +85,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.PassengerLauncherActivity"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -99,7 +116,6 @@
 
         <activity
             android:name="com.mogo.eagle.core.function.main.VideoAdAtc"
-            android:clearTaskOnLaunch="${ACTIVITY_ROOT}"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
             android:enabled="true"
             android:exported="true"
@@ -121,6 +137,16 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.mogo.eagle.core.function.main.AppListActivity"
+            android:exported="true"
+            android:launchMode="singleTask">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN"/>-->
+            <!--                <category android:name="android.intent.category.LAUNCHER"/>-->
+            <!--            </intent-filter>-->
+        </activity>
+
         <meta-data
             android:name="MAP_SDK_VERSION111111"
             android:value="${MAP_SDK_VERSION}" />

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt

@@ -7,7 +7,7 @@ import android.view.View
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
@@ -61,7 +61,7 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
      * @param limitingVelocitySpeed    限速速度
      */
     private fun dispatchShowWaring(limitingVelocitySpeed: Int) {
-        CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(limitingVelocitySpeed,DataSourceType.MAP)
+        CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(limitingVelocitySpeed,DataSourceType.MAP)
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt

@@ -14,7 +14,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框
@@ -77,7 +77,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
         ttsContent: String?,
     ) {
         if (EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType == v2xType.toString()) {
-            CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(1,DataSourceType.MAP)
+            CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(1,DataSourceType.MAP)
         }
         if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
             Log.d("MsgBox-V2XWarningBR", "alertContent或ttsContent为空!")

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/HmiPresenter.kt

@@ -1,13 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui
-
-import com.mogo.commons.mvp.Presenter
-
-/**
- * @author xiaoyuzhou
- * @date 2021/8/3 3:55 下午
- */
-class HmiPresenter(view: MoGoHmiContract.View?) :
-    Presenter<MoGoHmiContract.View?>(view) {
-
-
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiContract.kt

@@ -1,19 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui
-
-import com.mogo.commons.mvp.IView
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.eagle.core.data.notice.NoticeNormalData
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-
-
-/**
- *@author        xiaoyuzhou
- *@date          2021/8/4 3:38 下午
- */
-interface MoGoHmiContract {
-
-    interface View : IView {
-
-    }
-}