From d95560df799016303af4fd96dd76a12b60858e40 Mon Sep 17 00:00:00 2001
From: Kuloud <kuloud@outlook.com>
Date: Tue, 26 Dec 2023 11:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0demo=E5=B7=A5=E7=A8=8BAGP?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE                                               |  2 +-
 README.md                                             | 10 ++++++++++
 .../java/com/amap/flutter/map/core/MapController.java |  6 ------
 example/android/app/build.gradle                      |  1 +
 example/android/app/src/main/AndroidManifest.xml      | 11 ++++++++---
 example/android/build.gradle                          |  6 +++---
 example/android/gradle.properties                     |  2 +-
 example/pubspec.yaml                                  |  4 ++--
 pubspec.yaml                                          |  8 ++++----
 9 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2675c79..40f3eb8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Copyright 2023 kuloud
-Copyright <2020> <lbs.amap.com>
+Copyright 2020 lbs.amap.com
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index c56d549..ab02d05 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,16 @@ class _ShowMapPageState extends State<_ShowMapPageBody> {
 
 ```
 
+## 已知问题
+1. [android] app 的 targetSDKVersion >= 30, 地图页返回闪退
+
+  在里的AndroidManifest.xml里的application里增加`android:allowNativeHeapPointerTagging="false"`
+  ```xml
+      <application android:allowNativeHeapPointerTagging="false">
+      ...
+      </application>
+  ```
+  google官方说明地址：https://source.android.com/devices/tech/debug/tagged-pointers
 
 
 
diff --git a/android/src/main/java/com/amap/flutter/map/core/MapController.java b/android/src/main/java/com/amap/flutter/map/core/MapController.java
index 63de932..00849a2 100644
--- a/android/src/main/java/com/amap/flutter/map/core/MapController.java
+++ b/android/src/main/java/com/amap/flutter/map/core/MapController.java
@@ -43,11 +43,9 @@ public class MapController
         AMap.OnMapLongClickListener,
         AMap.OnPOIClickListener {
     private static final String CLASS_NAME = "MapController";
-    private static boolean hasStarted = false;
     private final MethodChannel methodChannel;
     private final AMap amap;
     private final TextureMapView mapView;
-    protected int[] myArray = {};
     private MethodChannel.Result mapReadyResult;
     private boolean mapLoaded = false;
     private boolean myLocationShowing = false;
@@ -147,10 +145,6 @@ public class MapController
         } catch (Throwable e) {
             LogUtil.e(CLASS_NAME, "onMapLoaded", e);
         }
-        if (LogUtil.isDebugMode && !hasStarted) {
-            hasStarted = true;
-            int index = myArray[0];
-        }
     }
 
     @Override
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index c9ffa2d..b3c5c64 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -68,6 +68,7 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
+    ndkVersion '25.1.8937393'
 }
 dependencies {
     //demo中引入高德地图SDK
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 5e223c7..aa7c6f9 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -10,11 +10,15 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+
     <application
+        android:allowNativeHeapPointerTagging="false"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:label="amap_map_example">
@@ -27,7 +31,8 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/example/android/build.gradle b/example/android/build.gradle
index bce512e..0822484 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,18 +1,18 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index a673820..a3f33e5 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
+#android.enableR8=true
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 2ceda47..5bd7f47 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -12,8 +12,8 @@ dependencies:
   flutter:
     sdk: flutter
 
-  permission_handler: ^6.1.3
-  flutter_plugin_android_lifecycle: ^2.0.0
+  permission_handler: ^11.1.0
+  flutter_plugin_android_lifecycle: ^2.0.17
 
   amap_map:
     # When depending on this package from a real application you should use:
diff --git a/pubspec.yaml b/pubspec.yaml
index 79f329f..9fbcc15 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: amap_map
-description: Amap SDK Flutter plugin
+description: Amap SDK Flutter plugin for integrating AMapSDK in iOS and Android applications.
 version: 1.0.0+5
 homepage: https://github.com/kuloud/amap_map
 
@@ -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.17
+  meta: ^1.10.0
   plugin_platform_interface: ^2.0.0
   stream_transform: ^2.0.0
 
@@ -21,7 +21,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  test: ^1.16.5
+  test: ^1.24.9
   pedantic: ^1.11.0
   mockito: ^5.0.0-nullsafety.7