From 0f017814c3f972b4046540af52840de698ad329e Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 8 Aug 2022 19:49:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E8=BD=A6=E6=A8=A1?= =?UTF-8?q?=E9=97=AA=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原因:切换线程后源数据被修改 --- .../core/function/smp/AMapCustomView.java | 41 ++++++++++--------- .../res/layout/module_overview_map_view.xml | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index e72ef33969..71aa82ba9d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -17,7 +17,7 @@ import androidx.annotation.Nullable; import com.amap.api.maps.AMap; import com.amap.api.maps.CameraUpdate; import com.amap.api.maps.CameraUpdateFactory; -import com.amap.api.maps.TextureMapView; +import com.amap.api.maps.MapView; import com.amap.api.maps.UiSettings; import com.amap.api.maps.model.BitmapDescriptor; import com.amap.api.maps.model.BitmapDescriptorFactory; @@ -65,7 +65,7 @@ public class AMapCustomView extends RelativeLayout implements IMoGoMapLocationListener { public static final String TAG = "AMapCustomView"; - private TextureMapView mAMapView; + private MapView mAMapView; private AMap mAMap; private int zoomLevel = 15; private CameraUpdate mCameraUpdate; @@ -94,6 +94,7 @@ public class AMapCustomView private MogoLocation mLocation; private boolean isFirstLocation = true; + CustomMapStyleOptions mCustomMapStyleOptions; public AMapCustomView(Context context) { this(context, null); @@ -140,20 +141,22 @@ public class AMapCustomView Log.d(TAG, "initAMapView"); mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel); mAMap = mAMapView.getMap(); + mCustomMapStyleOptions = new CustomMapStyleOptions(); + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + mCustomMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style.data")); + mCustomMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra.data")); + } else { + mCustomMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext(), "over_view_style_bus.data")); + mCustomMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext(), "over_view_style_extra_bus.data")); + } mAMap.setOnMapLoadedListener(() -> { Log.d(TAG, "---onMapLoaded---"); - CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions(); - // 加载自定义样式 - 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")); + if (mCustomMapStyleOptions != null) { + // 加载自定义样式 + mCustomMapStyleOptions.setEnable(true); + // 设置自定义样式 + mAMap.setCustomMapStyle(mCustomMapStyleOptions); } - // 设置自定义样式 - mAMap.setCustomMapStyle(customMapStyleOptions); // 实时路况图层关闭,必须添加在loaded结束之后,其他位置不生效 mAMap.setTrafficEnabled(false); }); @@ -269,13 +272,11 @@ public class AMapCustomView public void onLocationChanged(@org.jetbrains.annotations.Nullable MogoLocation location, int from) { mLocation = location; MarkerDrawerManager.INSTANCE.setLonLat(new Pair(location.getLongitude(), location.getLatitude())); - UiThreadHandler.post(() -> { - drawCarMarker(location); - if (isFirstLocation) { - displayCustomOverView(); - isFirstLocation = false; - } - }); + drawCarMarker(location); + if (isFirstLocation) { + displayCustomOverView(); + isFirstLocation = false; + } } public void onCreateView(Bundle savedInstanceState) { diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml index dedfa69132..d5184f1e3d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:layout_centerInParent="true"> - From 4bac99a31e1a4e94b9999340c4ee47f46341337b Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 8 Aug 2022 19:50:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BESDK=E5=8D=87=E7=BA=A7=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9C=B0=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/assets/map_style.data | Bin 58605 -> 68668 bytes .../src/main/assets/map_style_extra.data | Bin 8926 -> 15198 bytes .../src/main/assets/map_style.data | Bin 58943 -> 69988 bytes .../src/main/assets/map_style_extra.data | Bin .../src/main/assets/over_view_style.data | Bin 125572 -> 146841 bytes .../src/main/assets/over_view_style_bus.data | Bin 58691 -> 68668 bytes .../main/assets/over_view_style_extra.data | Bin 10782 -> 10782 bytes 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 OCH/mogo-och-bus-passenger/src/main/assets/map_style.data mode change 100755 => 100644 OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data mode change 100755 => 100644 OCH/mogo-och-taxi-passenger/src/main/assets/map_style.data mode change 100755 => 100644 OCH/mogo-och-taxi-passenger/src/main/assets/map_style_extra.data diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style.data b/OCH/mogo-och-bus-passenger/src/main/assets/map_style.data old mode 100755 new mode 100644 index 4deed98e6a1ae45541c64b288d21f5a77c712730..ab077f984974ac9aca03d62b22520bb815b24fdd GIT binary patch literal 68668 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 XzkmOJSB~o6|NQMc?)k8PrT+g16}B4e literal 58605 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 diff --git a/OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data old mode 100755 new mode 100644 index a3c0811e86a6f11f16ca16fc136a8c0f69b87092..01f7f2116ecf898b4b694db6f591728d6361cd46 GIT binary patch delta 13730 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 M`&I=>`_^Vt1Fl4>KmY&$ delta 7409 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 diff --git a/OCH/mogo-och-taxi-passenger/src/main/assets/map_style.data b/OCH/mogo-och-taxi-passenger/src/main/assets/map_style.data old mode 100755 new mode 100644 index 0e9e36690ef971ddd1d7cf2c54cf137554eafeac..b200669659035c621d33021d25b9adbe97d72451 GIT binary patch literal 69988 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 literal 58943 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 diff --git a/OCH/mogo-och-taxi-passenger/src/main/assets/map_style_extra.data b/OCH/mogo-och-taxi-passenger/src/main/assets/map_style_extra.data old mode 100755 new mode 100644 diff --git a/core/mogo-core-res/src/main/assets/over_view_style.data b/core/mogo-core-res/src/main/assets/over_view_style.data index 48e6253f98b9bfd4010530bbd8daa26a56377e10..49eb4d9eb8c5d886db59022bc933062e897ffcb5 100644 GIT binary patch literal 146841 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 literal 125572 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 diff --git a/core/mogo-core-res/src/main/assets/over_view_style_bus.data b/core/mogo-core-res/src/main/assets/over_view_style_bus.data index 2fdafcbf19fed0d025f9d73c2bf2c2f5ef7a8573..ab077f984974ac9aca03d62b22520bb815b24fdd 100644 GIT binary patch literal 68668 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 XzkmOJSB~o6|NQMc?)k8PrT+g16}B4e literal 58691 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 Date: Tue, 9 Aug 2022 12:19:46 +0800 Subject: [PATCH 3/3] =?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);