From 11a1d53743209ae446eac3aa4faa370ba2e2af07 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 9 Aug 2022 12:19:46 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=E6=9B=BF=E6=8D=A2=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=B0=8F=E5=9C=B0=E5=9B=BE=E6=A0=B7=E5=BC=8F=E7=A6=BB?= =?UTF-8?q?=E7=BA=BF=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/BusPassengerMapAssetStyleUtil.java | 4 ++-- .../utils/TaxiPassengerMapAssetStyleUtil.java | 4 ++-- .../com/mogo/och/taxi/ui/TaxiNaviFragment.java | 4 ++-- .../function/smp/SmallMapDirectionView.java | 8 ++++---- .../src/main/assets/small_map_style.data | Bin 129331 -> 0 bytes .../src/main/assets/small_map_style_extra.data | Bin 3550 -> 0 bytes .../core/utilcode/mogo/MapAssetStyleUtils.java | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 core/mogo-core-res/src/main/assets/small_map_style.data delete mode 100644 core/mogo-core-res/src/main/assets/small_map_style_extra.data 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 4b1dc9a0da30e660a3c6be08418acf02528186b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129331 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 YcmWqoZ1a%Lv=EO^Ual3bOtOUy;etHLa{vGU 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);