expo-gaode-map 2.2.11-next.0 → 2.2.11

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

@@ -575,7 +575,7 @@ class ExpoGaodeMapModule : Module() {
      */
     AsyncFunction("calculatePolygonArea") { polygon: List<Map<String, Double>>, promise: expo.modules.kotlin.Promise ->
       try {
-        android.util.Log.d("ExpoGaodeMap", "📐 calculatePolygonArea 被调用，参数: $polygon")
+        
         
         if (polygon.size < 3) {
           return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Polygon must have at least 3 vertices", null)
@@ -591,7 +591,7 @@ class ExpoGaodeMapModule : Module() {
           }
         }
 
-        android.util.Log.d("ExpoGaodeMap", "📐 转换后的坐标数: ${polygonPoints.size}")
+     
         
         if (polygonPoints.size < 3) {
           return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid polygon coordinates", null)
@@ -599,7 +599,7 @@ class ExpoGaodeMapModule : Module() {
 
         // 使用高德官方 API 计算多边形面积
         val area = AMapUtils.calculateArea(polygonPoints)
-        android.util.Log.d("ExpoGaodeMap", "📐 AMapUtils.calculateArea 结果: $area")
+       
         promise.resolve(area)
       } catch (e: Exception) {
         android.util.Log.e("ExpoGaodeMap", "📐 calculatePolygonArea 错误: ${e.message}", e)
@@ -615,7 +615,6 @@ class ExpoGaodeMapModule : Module() {
      */
     AsyncFunction("calculateRectangleArea") { southWest: Map<String, Double>, northEast: Map<String, Double>, promise: expo.modules.kotlin.Promise ->
       try {
-        android.util.Log.d("ExpoGaodeMap", "📐 calculateRectangleArea 被调用，参数: sw=$southWest, ne=$northEast")
         
         val swLat = southWest["latitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid southWest latitude", null)
         val swLon = southWest["longitude"] ?: return@AsyncFunction promise.reject("INVALID_ARGUMENT", "Invalid southWest longitude", null)
@@ -631,7 +630,7 @@ class ExpoGaodeMapModule : Module() {
         )
 
         val area = AMapUtils.calculateArea(rectangle)
-        android.util.Log.d("ExpoGaodeMap", "📐 calculateRectangleArea 结果: $area")
+        
         promise.resolve(area)
       } catch (e: Exception) {
         android.util.Log.e("ExpoGaodeMap", "📐 calculateRectangleArea 错误: ${e.message}", e)

package/ios/ExpoGaodeMapModule.swift

@@ -51,7 +51,7 @@ public class ExpoGaodeMapModule: Module {
                 let isPreloading = (status["isPreloading"] as? Bool) ?? false
                 
                 if !MapPreloadManager.shared.hasPreloadedMapView() && !isPreloading {
-                    print("🚀 ExpoGaodeMap: 自动启动地图预加载")
+                   
                     MapPreloadManager.shared.startPreload(poolSize: poolSize)
                 }
             }
@@ -569,7 +569,7 @@ public class ExpoGaodeMapModule: Module {
          * @returns 面积（单位：平方米）
          */
         AsyncFunction("calculatePolygonArea") { (polygon: [[String: Double]], promise: Promise) in
-            print("📐 calculatePolygonArea 被调用，参数: \(polygon)")
+         
             
             let polygonCoords = polygon.compactMap { coord -> CLLocationCoordinate2D? in
                 guard let lat = coord["latitude"],
@@ -579,7 +579,7 @@ public class ExpoGaodeMapModule: Module {
                 return CLLocationCoordinate2D(latitude: lat, longitude: lon)
             }
             
-            print("📐 转换后的坐标数: \(polygonCoords.count)")
+   
             
             guard polygonCoords.count >= 3 else {
                 promise.reject("INVALID_ARGUMENT", "多边形至少需要3个顶点")
@@ -590,10 +590,10 @@ public class ExpoGaodeMapModule: Module {
             let area = polygonCoords.withUnsafeBufferPointer { buffer in
                 let mutablePointer = UnsafeMutablePointer<CLLocationCoordinate2D>(mutating: buffer.baseAddress!)
                 let result = MAAreaForPolygon(mutablePointer, Int32(polygonCoords.count))
-                print("📐 MAAreaForPolygon 结果: \(result)")
+              
                 return result
             }
-            print("📐 最终面积: \(area)")
+          
             promise.resolve(area)
         }
         
@@ -604,7 +604,7 @@ public class ExpoGaodeMapModule: Module {
          * @returns 面积（单位：平方米）
          */
         AsyncFunction("calculateRectangleArea") { (southWest: [String: Double], northEast: [String: Double], promise: Promise) in
-            print("📐 calculateRectangleArea 被调用，参数: sw=\(southWest), ne=\(northEast)")
+          
             
             guard let swLat = southWest["latitude"],
                   let swLon = southWest["longitude"],
@@ -624,9 +624,9 @@ public class ExpoGaodeMapModule: Module {
                 MAMapPointForCoordinate(CLLocationCoordinate2D(latitude: neLat, longitude: swLon))
             )
             
-            print("📐 宽: \(width), 高: \(height)")
+            
             let area = width * height
-            print("📐 最终面积: \(area)")
+            
             promise.resolve(area)
         }
         

package/ios/MapPreloadManager.swift

@@ -43,7 +43,7 @@ class MapPreloadManager {
     private var cleanupTimer: Timer?
 
     private init() {
-        print("🔧 [MapPreload] 初始化预加载管理器（自适应版本）")
+     
         
         // 注册内存警告监听
         NotificationCenter.default.addObserver(
@@ -79,13 +79,12 @@ class MapPreloadManager {
         }
         
         if expiredCount > 0 {
-            print("🧹 [MapPreload] 清理了 \(expiredCount) 个过期实例（当前TTL: \(Int(currentTTL))秒）")
         }
     }
     
     /// 处理内存警告
     @objc private func handleMemoryWarning() {
-        print("⚠️ [MapPreload] 收到内存警告，自动清理预加载池")
+      
         clearPool()
     }
     
@@ -93,7 +92,7 @@ class MapPreloadManager {
     /// - Parameter poolSize: 预加载的地图实例数量（会根据内存自适应调整）
     func startPreload(poolSize: Int) {
         guard !isPreloading else {
-            print("⚠️ [MapPreload] 预加载已在进行中")
+         
             return
         }
         
@@ -106,13 +105,12 @@ class MapPreloadManager {
         
         // 检查内存是否充足
         guard hasEnoughMemory() else {
-            print("⚠️ [MapPreload] 内存不足，跳过预加载")
+           
             return
         }
         
         isPreloading = true
         let targetSize = min(poolSize, adaptiveMaxPoolSize)
-        print("🚀 [MapPreload] 开始预加载 \(targetSize) 个地图实例 (自适应池大小: \(adaptiveMaxPoolSize), TTL: \(Int(currentTTL))秒)")
         
         for i in 0..<targetSize {
             preloadGroup.enter()  // 进入预加载队列
@@ -127,7 +125,6 @@ class MapPreloadManager {
                     DispatchQueue.main.async {
                         let instance = PreloadedMapInstance(mapView: mapView, timestamp: Date())
                         self.preloadedMapInstances.append(instance)
-                        print("✅ [MapPreload] 预加载实例 \(i + 1)/\(targetSize) 完成")
                         self.preloadGroup.leave()
                     }
                 }
@@ -137,7 +134,6 @@ class MapPreloadManager {
         // 等待所有实例加载完成
         preloadGroup.notify(queue: DispatchQueue.main) {
             self.isPreloading = false
-            print("🎉 [MapPreload] 所有实例预加载完成")
         }
     }
     
@@ -191,16 +187,12 @@ class MapPreloadManager {
         
         switch availableMB {
         case 500...:
-            print("📊 [MapPreload] 高内存设备 (\(availableMB)MB)，池大小: \(maxPoolSizeHighMemory)")
             return maxPoolSizeHighMemory
         case 300..<500:
-            print("📊 [MapPreload] 中等内存设备 (\(availableMB)MB)，池大小: \(maxPoolSizeMediumMemory)")
             return maxPoolSizeMediumMemory
         case 150..<300:
-            print("📊 [MapPreload] 低内存设备 (\(availableMB)MB)，池大小: \(maxPoolSizeLowMemory)")
             return maxPoolSizeLowMemory
         default:
-            print("⚠️ [MapPreload] 内存极低 (\(availableMB)MB)，禁用预加载")
             return 0
         }
     }
@@ -215,15 +207,12 @@ class MapPreloadManager {
         switch usagePercent {
         case 0..<60:
             memoryPressureLevel = 0
-            print("📊 [MapPreload] 内存充足 (使用率: \(usagePercent)%)，TTL: \(Int(ttlNormal))秒")
             return ttlNormal
         case 60..<80:
             memoryPressureLevel = 1
-            print("📊 [MapPreload] 内存压力 (使用率: \(usagePercent)%)，TTL: \(Int(ttlMemoryPressure))秒")
             return ttlMemoryPressure
         default:
             memoryPressureLevel = 2
-            print("⚠️ [MapPreload] 内存严重不足 (使用率: \(usagePercent)%)，TTL: \(Int(ttlLowMemory))秒")
             return ttlLowMemory
         }
     }
@@ -266,18 +255,15 @@ class MapPreloadManager {
         preloadedMapInstances.removeAll { instance in
             let isExpired = now.timeIntervalSince(instance.timestamp) > currentTTL
             if isExpired {
-                print("🗑️ [MapPreload] 预加载实例已过期（TTL: \(Int(currentTTL))秒），已删除")
             }
             return isExpired
         }
         
         if let instance = preloadedMapInstances.first {
             preloadedMapInstances.removeFirst()
-            print("📤 [MapPreload] 使用预加载实例，剩余: \(preloadedMapInstances.count)")
             return instance.mapView
         }
         
-        print("⚠️ [MapPreload] 预加载池为空，返回 nil")
         return nil
     }
     
@@ -285,7 +271,6 @@ class MapPreloadManager {
     func clearPool() {
         let count = preloadedMapInstances.count
         preloadedMapInstances.removeAll()
-        print("🗑️ [MapPreload] 预加载池已清空，清理了 \(count) 个实例")
     }
     
     /// 获取预加载状态（包含动态配置信息）
@@ -328,7 +313,6 @@ class MapPreloadManager {
         cleanupTimer?.invalidate()
         cleanupTimer = nil
         clearPool()
-        print("🧹 [MapPreload] 预加载管理器已清理")
     }
     
     deinit {

package/ios/overlays/MarkerView.swift

@@ -320,22 +320,18 @@ class MarkerView: ExpoView {
                 guard let self = self, let annotationView = annotationView else { return }
                 // 再次检查缓存（避免重复渲染）
                 if let cached = IconBitmapCache.shared.image(forKey: key) {
-                    print("🔄 iOS Marker: 使用缓存图片, key: \(key)")
                     annotationView.image = cached
                     annotationView.centerOffset = CGPoint(x: 0, y: 0)
                     return
                 }
                 
-                print("⏰ iOS Marker: 0.5秒后开始渲染, key: \(key)")
                 // 调用你的原生渲染逻辑（保留空白检测、多次 layout）
                 if let generated = self.createImageFromSubviews() {
                     // 写入缓存（仅当用户传了 cacheKey 才缓存；否则建议仍缓存由 fingerprint 决定）
                     IconBitmapCache.shared.setImage(generated, forKey: key)
                     annotationView.image = generated
                     annotationView.centerOffset = CGPoint(x: 0, y: 0)
-                    print("✅ iOS Marker: 渲染成功并显示, size: \(generated.size)")
                 } else {
-                    print("⚠️ iOS Marker: 渲染失败,图片为空")
                 }
             }
 
@@ -503,33 +499,7 @@ class MarkerView: ExpoView {
             return nil
         }
         
-        // 🔑 检查图片是否真的有内容（不是空白图片）
-        // 暂时禁用空白检测,因为 React Native Image 可能需要额外的渲染时间
-        // guard let cgImage = image.cgImage else {
-        //     print("⚠️ iOS Marker: cgImage 为 nil")
-        //     return nil
-        // }
-        
-        // let dataProvider = cgImage.dataProvider
-        // let data = dataProvider?.data
-        // let buffer = CFDataGetBytePtr(data)
-        
-        // var isBlank = true
-        // if let buffer = buffer {
-        //     let length = CFDataGetLength(data)
-        //     let checkLength = min(100, length)
-        //     for i in 0..<checkLength {
-        //         if buffer[i] != 0 {
-        //             isBlank = false
-        //             break
-        //         }
-        //     }
-        // }
-        
-        // if isBlank {
-        //     print("⚠️ iOS Marker: 渲染的图片是空白的")
-        //     return nil
-        // }
+   
         
         // 🔑 写入缓存
         if let key = cacheKey {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.11-next.0",
+  "version": "2.2.11",
   "description": "一个功能完整的高德地图 React Native 组件库，基于 Expo Modules 开发，提供地图显示、定位、覆盖物等功能。",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -12,6 +12,9 @@
     "expo-module.config.json",
     "plugin/build"
   ],
+  "jest": {
+    "preset": "expo-module-scripts"
+  },
   "keywords": [
     "react-native",
     "expo",
@@ -21,26 +24,23 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/TomWq/expo-gaode-map"
+    "url": "https://github.com/TomWq/expo-gaode-map",
+    "directory": "packages/core"
   },
   "bugs": {
     "url": "https://github.com/TomWq/expo-gaode-map/issues"
   },
   "author": "<TomWq>(https://github.com/TomWq)",
   "license": "MIT",
-  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
+  "homepage": "https://tomwq.github.io/expo-gaode-map/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "dependencies": {
-    "supercluster": "^8.0.1"
-  },
   "devDependencies": {
     "@expo/config-plugins": "^9.1.7",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.14",
     "@types/react": "~19.1.0",
-    "@types/supercluster": "^7.1.3",
     "babel-preset-expo": "^54.0.8",
     "expo": "^54.0.18",
     "expo-module-scripts": "^5.0.7",

package/android/build/.transforms/208bd9f808f1f1f823d416898f12bb3e/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/408dc727325ebceb189147897a578d69/results.bin

@@ -1 +0,0 @@
-o/bundleLibRuntimeToDirRelease