Remove legacy registerWith and update asset lookup

android/src/main/java/com/amap/flutter/map/AMapFlutterMapPlugin.java

@@ -14,7 +14,6 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.plugins.lifecycle.FlutterLifecycleAdapter;
-import io.flutter.plugin.common.PluginRegistry;
 
 /**
  * AmapFlutterMapPlugin
@@ -28,36 +27,6 @@ public class AMapFlutterMapPlugin implements
 
     private static final String VIEW_TYPE = "com.amap.flutter.map";
 
-    public static void registerWith(PluginRegistry.Registrar registrar) {
-        LogUtil.i(CLASS_NAME, "registerWith=====>");
-
-        final Activity activity = registrar.activity();
-        if (activity == null) {
-            LogUtil.w(CLASS_NAME, "activity is null!!!");
-            return;
-        }
-        if (activity instanceof LifecycleOwner) {
-            registrar
-                    .platformViewRegistry()
-                    .registerViewFactory(
-                            VIEW_TYPE,
-                            new AMapPlatformViewFactory(
-                                    registrar.messenger(),
-                                    new LifecycleProvider() {
-                                        @Override
-                                        public Lifecycle getLifecycle() {
-                                            return ((LifecycleOwner) activity).getLifecycle();
-                                        }
-                                    }));
-        } else {
-            registrar
-                    .platformViewRegistry()
-                    .registerViewFactory(
-                            VIEW_TYPE,
-                            new AMapPlatformViewFactory(registrar.messenger(), new ProxyLifecycleProvider(activity)));
-        }
-    }
-
     public AMapFlutterMapPlugin() {
     }
 

android/src/main/java/com/amap/flutter/map/utils/ConvertUtil.java

@@ -32,7 +32,7 @@ import java.util.Map;
 
 import androidx.annotation.NonNull;
 
-import io.flutter.view.FlutterMain;
+import io.flutter.FlutterInjector;
 
 /**
  * @author whm
@@ -384,15 +384,15 @@ public class ConvertUtil {
             case "fromAsset":
                 if (data.size() == 2) {
                     return BitmapDescriptorFactory.fromAsset(
-                            FlutterMain.getLookupKeyForAsset(toString(data.get(1))));
+                            FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(toString(data.get(1))));
                 } else {
                     return BitmapDescriptorFactory.fromAsset(
-                            FlutterMain.getLookupKeyForAsset(toString(data.get(1)), toString(data.get(2))));
+                            FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(toString(data.get(1)), toString(data.get(2))));
                 }
             case "fromAssetImage":
                 if (data.size() == 3) {
                     return BitmapDescriptorFactory.fromAsset(
-                            FlutterMain.getLookupKeyForAsset(toString(data.get(1))));
+                            FlutterInjector.instance().flutterLoader().getLookupKeyForAsset(toString(data.get(1))));
                 } else {
                     throw new IllegalArgumentException(
                             "'fromAssetImage' Expected exactly 3 arguments, got: " + data.size());