Merge branch 'lk' into dev_robotaxi-d-app-module_290_220715_2.9.0

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java

@@ -49,6 +49,7 @@ import com.amap.api.navi.model.RouteOverlayOptions;
 import com.autonavi.tbt.TrafficFacilityInfo;
 import com.elegant.utils.UiThreadHandler;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
@@ -62,6 +63,7 @@ import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.function.overview.InfStructureManager;
 import com.mogo.eagle.core.function.overview.Infrastructure;
 import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView;
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
@@ -686,11 +688,16 @@ public class AMapCustomView
     @Override
     public void onNaviViewLoaded() {
         Log.d(TAG, "---onNaviViewLoaded---");
+        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions();
         // 加载自定义样式
-        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
-                .setEnable(true)
-                .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(),"over_view_style.data"))
-                .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(),"over_view_style_extra.data"));
+        customMapStyleOptions.setEnable(true);
+        if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+            customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data"));
+            customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data"));
+        } else {
+            customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style_bus.data"));
+            customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra_bus.data"));
+        }
         // 设置自定义样式
         mAMap.setCustomMapStyle(customMapStyleOptions);
         // 实时路况图层关闭，必须添加在loaded结束之后,其他位置不生效