yangjie
/
amap_map
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release 1.0.0+5

This commit is contained in:
Kuloud 2023-12-23 11:54:22 +08:00
parent cd017f876b
commit 58ac2bdf6f
6 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java
View File

@ -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

4
android/src/main/java/com/amap/flutter/map/AMapOptionsBuilder.java
View File

@ -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);

10
android/src/main/java/com/amap/flutter/map/AMapPlatformView.java
View File

@ -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);
}

6
android/src/main/java/com/amap/flutter/map/AMapPlatformViewFactory.java
View File

@ -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;

13
android/src/main/java/com/amap/flutter/map/LifecycleProvider.java
View File

@ -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();
}

6
pubspec.yaml
View File

@ -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