[feature]

[模型修改]

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

@@ -22,7 +22,6 @@ 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.function.api.autopilot.IMoGoAutopilotRecordListener;
 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.autopilot.CallerAutopilotRecordListenerManager;
@@ -60,7 +59,7 @@ import record_cache.RecordPanelOuterClass;
  *
  * @author tongchenfei
  */
-public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener, IMoGoAutopilotRecordListener {
+public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener {
 
     private static final String TAG = "BaseBusTabFragment";
 
@@ -206,7 +205,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
         if (mBadcaseBtn != null) {
             CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
-            CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
         }
 
         //消息盒子
@@ -299,18 +297,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         EventBus.getDefault().unregister(this);
     }
 
-    @Override
-    public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
-    }
-
-    @Override
-    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
-    }
-
-    @Override
-    public void onBagManagerResult(@NonNull BagManagerOuterClass.BagManager bagManager) {
-    }
-
     /**
      * 测试到站
      */

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

@@ -22,20 +22,23 @@ 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.data.config.HdMapBuildConfig;
 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.autopilot.CallerAutopilotRecordListenerManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
 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.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
+import com.mogo.map.MogoMap;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.uicontroller.IMogoMapUIController;
@@ -62,7 +65,7 @@ import record_cache.RecordPanelOuterClass;
  *
  * @author tongchenfei
  */
-public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener, IMoGoAutopilotRecordListener {
+public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener {
 
     private static final String TAG = "BaseBusTabFragment";
 
@@ -209,7 +212,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
         if (mBadcaseBtn != null) {
             CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
-            CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
         }
 
         mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl);
@@ -261,6 +263,17 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     protected abstract void onArriveStation();
 
     private void updateSwitchMapIcon() {
+
+        IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController(MogoMap.DEFAULT);
+        if(mapUIController!=null){
+            if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+                mapUIController.changeCurrentIcon(R.raw.m2);
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.m2;
+            }else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
+                mapUIController.changeCurrentIcon(R.raw.xiaoba);
+                HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba;
+            }
+        }
         if(mapBizView != null){
             IMogoMapUIController uiController = mapBizView.getUI();
             if(uiController != null){
@@ -306,18 +319,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         EventBus.getDefault().unregister(this);
     }
 
-    @Override
-    public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
-    }
-
-    @Override
-    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
-    }
-
-    @Override
-    public void onBagManagerResult(@NonNull BagManagerOuterClass.BagManager bagManager) {
-    }
-
     /**
      * 测试到站
      */

OCH/shuttle/passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml

@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         app:styleMode="MAP_STYLE_DAY_VR"
         app:isWeatherEnable="false"
-        app:locationIcon3DRes="@raw/m2"
+        app:locationIcon3DRes="@raw/xiaoba"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>