diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java index fb012b4143..edab28cb78 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/utils/BusPassengerMapAssetStyleUtil.java @@ -16,7 +16,7 @@ public class BusPassengerMapAssetStyleUtil { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1); @@ -39,7 +39,7 @@ public class BusPassengerMapAssetStyleUtil { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style_extra.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style_extra.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java index 6605ec413a..9c3eea52f9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerMapAssetStyleUtil.java @@ -16,7 +16,7 @@ public class TaxiPassengerMapAssetStyleUtil { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1); @@ -39,7 +39,7 @@ public class TaxiPassengerMapAssetStyleUtil { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style_extra.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style_extra.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java index 4038351737..35438d42a4 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiNaviFragment.java @@ -81,8 +81,8 @@ public class TaxiNaviFragment extends BaseTaxiUIFragment implements AMapNaviView aMap.setCustomMapStyle( new CustomMapStyleOptions() .setEnable(true) - .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "small_map_style.data")) - .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "small_map_style_extra.data")) + .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data")) + .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data")) ); //设置希望展示的地图缩放级别 diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 00270c4f24..33bc16afc1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -129,8 +129,8 @@ public class SmallMapDirectionView // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions() .setEnable(true) - .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "small_map_style.data")) - .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "small_map_style_extra.data")); + .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data")) + .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data")); // 设置自定义样式 mAMap.setCustomMapStyle(customMapStyleOptions); //设置希望展示的地图缩放级别 @@ -146,8 +146,8 @@ public class SmallMapDirectionView // 加载自定义样式 CustomMapStyleOptions customMapStyleOptions1 = new CustomMapStyleOptions() .setEnable(true) - .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "small_map_style.data")) - .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "small_map_style_extra.data")); + .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data")) + .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data")); // 设置自定义样式 mAMap.setCustomMapStyle(customMapStyleOptions1); mAMapNaviView.getMap().setPointToCenter(mAMapNaviView.getWidth() / 2, mAMapNaviView.getHeight() / 2); diff --git a/core/mogo-core-res/src/main/assets/small_map_style.data b/core/mogo-core-res/src/main/assets/small_map_style.data deleted file mode 100644 index 4b1dc9a0da..0000000000 Binary files a/core/mogo-core-res/src/main/assets/small_map_style.data and /dev/null differ diff --git a/core/mogo-core-res/src/main/assets/small_map_style_extra.data b/core/mogo-core-res/src/main/assets/small_map_style_extra.data deleted file mode 100644 index 6e201b10d4..0000000000 Binary files a/core/mogo-core-res/src/main/assets/small_map_style_extra.data and /dev/null differ diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java index beeb628e8d..84093b7f72 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/MapAssetStyleUtils.java @@ -16,7 +16,7 @@ public class MapAssetStyleUtils { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1); @@ -39,7 +39,7 @@ public class MapAssetStyleUtils { byte[] buffer1 = null; InputStream is1 = null; try { - is1 = context.getResources().getAssets().open(fileName); //eg. small_map_style_extra.data + is1 = context.getResources().getAssets().open(fileName); //eg. over_view_style_extra.data int lenght1 = is1.available(); buffer1 = new byte[lenght1]; is1.read(buffer1);