expo-gaode-map 1.2.2 → 1.2.3

package/android/build.gradle

@@ -31,6 +31,9 @@ if (useManagedAndroidSdkVersions) {
   }
 }
 
+logger.warn("[expo-gaode-map] Thank you for using expo-gaode-map ❤️")
+logger.warn("[expo-gaode-map] If you enjoy using expo-gaode-map, please consider sponsoring this project: https://github.com/TomWq")
+
 android {
   namespace "expo.modules.gaodemap"
   defaultConfig {

package/android/src/main/cpp/CMakeLists.txt

@@ -22,3 +22,5 @@ find_library(log-lib log)
 target_link_libraries(gaodecluster
     ${log-lib}
 )
+
+target_link_options(gaodecluster PRIVATE "-Wl,-z,max-page-size=16384")

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapModule.kt

@@ -30,42 +30,12 @@ class ExpoGaodeMapModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoGaodeMap")
 
-    // 在模块加载时尝试从本地缓存恢复隐私同意状态，避免每次启动都必须 JS 调用
-    try {
-      val context = appContext.reactContext!!
-      SDKInitializer.restorePrivacyState(context)
-
-      // 初始化预加载管理器（注册内存监听）
-      MapPreloadManager.initialize(context)
-
-      // 尝试从 AndroidManifest.xml 读取并设置 API Key
-      val apiKey = context.packageManager
-          .getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
-          .metaData?.getString("com.amap.api.v2.apikey")
-
-      if (!apiKey.isNullOrEmpty()) {
-          try {
-            MapsInitializer.setApiKey(apiKey)
-            com.amap.api.location.AMapLocationClient.setApiKey(apiKey)
-
-
-            // 只有在 API Key 已设置的情况下才启动预加载
-            android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
-              android.util.Log.i("ExpoGaodeMap", "🚀 自动启动地图预加载")
-              MapPreloadManager.startPreload(context, poolSize = 1)
-            }, 2000)
-          } catch (e: Exception) {
-            android.util.Log.w("ExpoGaodeMap", "设置 API Key 失败: ${e.message}")
-          }
-        } else {
-          android.util.Log.w("ExpoGaodeMap", "⚠️ AndroidManifest.xml 未找到 API Key，跳过自动预加载")
-        }
-
-    } catch (e: Exception) {
-      android.util.Log.w("ExpoGaodeMap", "恢复隐私状态时出现问题: ${e.message}")
+    OnCreate {
+      appContext.reactContext?.let { context ->
+        SDKInitializer.restorePersistedState(context)
+      }
     }
- 
-  
+
     // ==================== SDK 初始化 ====================
     
     /**
@@ -74,26 +44,51 @@ class ExpoGaodeMapModule : Module() {
      */
     Function("initSDK") { config: Map<String, String> ->
       val androidKey = config["androidKey"]
-      if (androidKey != null) {
-        try {
-          SDKInitializer.initSDK(appContext.reactContext!!, androidKey)
-          getLocationManager() // 初始化定位管理器
-          
-          // 打印当前 SDK 版本信息，便于验证依赖来源
-          android.util.Log.i("ExpoGaodeMap", "✅ SDK 初始化完成 - Version: ${MapsInitializer.getVersion()}")
-
-          // 初始化成功后自动触发一次预加载
-          MapPreloadManager.startPreload(appContext.reactContext!!, poolSize = 1)
-        } catch (e: SecurityException) {
-          android.util.Log.e("ExpoGaodeMap", "隐私协议未同意: ${e.message}")
-          throw expo.modules.kotlin.exception.CodedException("PRIVACY_NOT_AGREED", e.message ?: "用户未同意隐私协议", e)
-        } catch (e: Exception) {
-          android.util.Log.e("ExpoGaodeMap", "SDK 初始化失败: ${e.message}")
-          throw expo.modules.kotlin.exception.CodedException("INIT_FAILED", e.message ?: "SDK 初始化失败", e)
+      try {
+        val context = appContext.reactContext!!
+        if (androidKey != null) {
+          SDKInitializer.initSDK(context, androidKey)
+        } else if (!SDKInitializer.isPrivacyReady()) {
+          throw expo.modules.kotlin.exception.CodedException(
+            "PRIVACY_NOT_AGREED",
+            "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree",
+            null
+          )
+        } else {
+          SDKInitializer.applyPrivacyState(context)
         }
+
+        getLocationManager()
+        android.util.Log.i("ExpoGaodeMap", "✅ SDK 初始化完成 - Version: ${MapsInitializer.getVersion()}")
+      } catch (e: SecurityException) {
+        android.util.Log.e("ExpoGaodeMap", "隐私协议未同意: ${e.message}")
+        throw expo.modules.kotlin.exception.CodedException("PRIVACY_NOT_AGREED", e.message ?: "用户未同意隐私协议", e)
+      } catch (e: Exception) {
+        android.util.Log.e("ExpoGaodeMap", "SDK 初始化失败: ${e.message}")
+        throw expo.modules.kotlin.exception.CodedException("INIT_FAILED", e.message ?: "SDK 初始化失败", e)
       }
     }
 
+    Function("setPrivacyShow") { hasShow: Boolean, hasContainsPrivacy: Boolean ->
+      SDKInitializer.setPrivacyShow(appContext.reactContext!!, hasShow, hasContainsPrivacy)
+    }
+
+    Function("setPrivacyAgree") { hasAgree: Boolean ->
+      SDKInitializer.setPrivacyAgree(appContext.reactContext!!, hasAgree)
+    }
+
+    Function("setPrivacyVersion") { version: String ->
+      SDKInitializer.setPrivacyVersion(appContext.reactContext!!, version)
+    }
+
+    Function("resetPrivacyConsent") {
+      SDKInitializer.resetPrivacyConsent(appContext.reactContext!!)
+    }
+
+    Function("getPrivacyStatus") {
+      SDKInitializer.getPrivacyStatus()
+    }
+
     /**
      * 设置是否加载世界向量地图
      * @param enable 是否开启
@@ -777,7 +772,7 @@ class ExpoGaodeMapModule : Module() {
       // 使用 WeakReference 避免内存泄露
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
-      val attempts = 0
+      var attempts = 0
       val maxAttempts = 50 // 增加到 5 秒 / 100ms，给用户足够时间操作
 
       val checkPermission = object : Runnable {
@@ -789,6 +784,7 @@ class ExpoGaodeMapModule : Module() {
           }
 
           val status = PermissionHelper.checkForegroundLocationPermission(context)
+          attempts += 1
 
           // 如果权限已授予或达到最大尝试次数,返回结果并清理 Handler
           if (status.granted || attempts >= maxAttempts) {
@@ -848,7 +844,7 @@ class ExpoGaodeMapModule : Module() {
       // 轮询检查权限状态
       val contextRef = java.lang.ref.WeakReference(appContext.reactContext)
       val handler = android.os.Handler(android.os.Looper.getMainLooper())
-      val attempts = 0
+      var attempts = 0
       val maxAttempts = 30
 
       val checkPermission = object : Runnable {
@@ -860,6 +856,7 @@ class ExpoGaodeMapModule : Module() {
           }
 
           val status = PermissionHelper.checkBackgroundLocationPermission(context)
+          attempts += 1
 
           if (status.granted || attempts >= maxAttempts) {
             handler.removeCallbacks(this)
@@ -893,7 +890,6 @@ class ExpoGaodeMapModule : Module() {
     OnDestroy {
       locationManager?.destroy()
       locationManager = null
-      MapPreloadManager.cleanup()
     }
   }