From 58ac2bdf6f3fccafd6d423b4d18af0affa20aea6 Mon Sep 17 00:00:00 2001 From: Kuloud Date: Sat, 23 Dec 2023 11:54:22 +0800 Subject: [PATCH] release 1.0.0+5 --- .../amap/flutter/map/AMapFlutterMapPlugin.java | 16 ++-------------- .../com/amap/flutter/map/AMapOptionsBuilder.java | 4 +++- .../com/amap/flutter/map/AMapPlatformView.java | 10 +++++----- .../flutter/map/AMapPlatformViewFactory.java | 6 ++++-- .../com/amap/flutter/map/LifecycleProvider.java | 13 ------------- pubspec.yaml | 6 +++--- 6 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 android/src/main/java/com/amap/flutter/map/LifecycleProvider.java diff --git a/android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java b/android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java index e0972c7..2633dda 100644 --- a/android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java +++ b/android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java @@ -3,7 +3,6 @@ package com.amap.flutter.map; import android.app.Activity; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleOwner; @@ -43,12 +42,7 @@ public class AMapFlutterMapPlugin implements VIEW_TYPE, new AMapPlatformViewFactory( registrar.messenger(), - new LifecycleProvider() { - @Override - public Lifecycle getLifecycle() { - return ((LifecycleOwner) activity).getLifecycle(); - } - })); + () -> ((LifecycleOwner) activity).getLifecycle())); } else { registrar .platformViewRegistry() @@ -69,13 +63,7 @@ public class AMapFlutterMapPlugin implements VIEW_TYPE, new AMapPlatformViewFactory( binding.getBinaryMessenger(), - new LifecycleProvider() { - @Nullable - @Override - public Lifecycle getLifecycle() { - return lifecycle; - } - })); + () -> lifecycle)); } @Override diff --git a/android/src/main/java/com/amap/flutter/map/AMapOptionsBuilder.java b/android/src/main/java/com/amap/flutter/map/AMapOptionsBuilder.java index 5ce0b93..4fb960b 100644 --- a/android/src/main/java/com/amap/flutter/map/AMapOptionsBuilder.java +++ b/android/src/main/java/com/amap/flutter/map/AMapOptionsBuilder.java @@ -2,6 +2,8 @@ package com.amap.flutter.map; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.amap.api.maps.AMapOptions; import com.amap.api.maps.model.CameraPosition; import com.amap.api.maps.model.CustomMapStyleOptions; @@ -46,7 +48,7 @@ class AMapOptionsBuilder implements AMapOptionsSink { AMapPlatformView build(int id, Context context, BinaryMessenger binaryMessenger, - LifecycleProvider lifecycleProvider) { + LifecycleOwner lifecycleProvider) { try { //iOS端没有放大缩小UI, Android端强制隐藏 options.zoomControlsEnabled(false); diff --git a/android/src/main/java/com/amap/flutter/map/AMapPlatformView.java b/android/src/main/java/com/amap/flutter/map/AMapPlatformView.java index 546910e..096d1f7 100644 --- a/android/src/main/java/com/amap/flutter/map/AMapPlatformView.java +++ b/android/src/main/java/com/amap/flutter/map/AMapPlatformView.java @@ -53,7 +53,7 @@ public class AMapPlatformView AMapPlatformView(int id, Context context, BinaryMessenger binaryMessenger, - LifecycleProvider lifecycleProvider, + LifecycleOwner lifecycleProvider, AMapOptions options) { methodChannel = new MethodChannel(binaryMessenger, "amap_map_" + id); @@ -76,28 +76,28 @@ public class AMapPlatformView private void initMyMethodCallHandlerMap() { String[] methodIdArray = mapController.getRegisterMethodIdArray(); - if (null != methodIdArray && methodIdArray.length > 0) { + if (null != methodIdArray) { for (String methodId : methodIdArray) { myMethodCallHandlerMap.put(methodId, mapController); } } methodIdArray = markersController.getRegisterMethodIdArray(); - if (null != methodIdArray && methodIdArray.length > 0) { + if (null != methodIdArray) { for (String methodId : methodIdArray) { myMethodCallHandlerMap.put(methodId, markersController); } } methodIdArray = polylinesController.getRegisterMethodIdArray(); - if (null != methodIdArray && methodIdArray.length > 0) { + if (null != methodIdArray) { for (String methodId : methodIdArray) { myMethodCallHandlerMap.put(methodId, polylinesController); } } methodIdArray = polygonsController.getRegisterMethodIdArray(); - if (null != methodIdArray && methodIdArray.length > 0) { + if (null != methodIdArray) { for (String methodId : methodIdArray) { myMethodCallHandlerMap.put(methodId, polygonsController); } diff --git a/android/src/main/java/com/amap/flutter/map/AMapPlatformViewFactory.java b/android/src/main/java/com/amap/flutter/map/AMapPlatformViewFactory.java index b7a5f33..ac06ba5 100644 --- a/android/src/main/java/com/amap/flutter/map/AMapPlatformViewFactory.java +++ b/android/src/main/java/com/amap/flutter/map/AMapPlatformViewFactory.java @@ -2,6 +2,8 @@ package com.amap.flutter.map; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.amap.api.maps.model.CameraPosition; import com.amap.flutter.map.utils.ConvertUtil; import com.amap.flutter.map.utils.LogUtil; @@ -22,10 +24,10 @@ import io.flutter.plugin.platform.PlatformViewFactory; class AMapPlatformViewFactory extends PlatformViewFactory { private static final String CLASS_NAME = "AMapPlatformViewFactory"; private final BinaryMessenger binaryMessenger; - private final LifecycleProvider lifecycleProvider; + private final LifecycleOwner lifecycleProvider; AMapPlatformViewFactory(BinaryMessenger binaryMessenger, - LifecycleProvider lifecycleProvider) { + LifecycleOwner lifecycleProvider) { super(StandardMessageCodec.INSTANCE); this.binaryMessenger = binaryMessenger; this.lifecycleProvider = lifecycleProvider; diff --git a/android/src/main/java/com/amap/flutter/map/LifecycleProvider.java b/android/src/main/java/com/amap/flutter/map/LifecycleProvider.java deleted file mode 100644 index cb42eca..0000000 --- a/android/src/main/java/com/amap/flutter/map/LifecycleProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.amap.flutter.map; - -import androidx.lifecycle.Lifecycle; - -/** - * @author whm - * @date 2020/11/8 6:17 PM - * @mail hongming.whm@alibaba-inc.com - * @since - */ -public interface LifecycleProvider { - Lifecycle getLifecycle(); -} diff --git a/pubspec.yaml b/pubspec.yaml index 540543a..79f329f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: amap_map description: Amap SDK Flutter plugin -version: 1.0.0+4 +version: 1.0.0+5 homepage: https://github.com/kuloud/amap_map environment: @@ -10,8 +10,8 @@ environment: dependencies: flutter: sdk: flutter - # flutter_plugin_android_lifecycle: ^2.0.1 - # meta: ^1.3.0 + flutter_plugin_android_lifecycle: ^2.0.1 + meta: ^1.3.0 plugin_platform_interface: ^2.0.0 stream_transform: ^2.0.0