expo-gaode-map-search 1.1.1-next.0 → 1.1.2-next.1

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Wed Dec 03 11:22:57 CST 2025
+#Tue Dec 09 10:50:17 CST 2025

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-2
+1
 0

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,16 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml:2:13-83
-INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml:2:13-83
+ADDED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml:2:13-83
+INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml:2:13-83
 	package
-		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml
+		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml
 	xmlns:android
-		ADDED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml:2:23-81
+		ADDED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml:2:23-81
 uses-sdk
-INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml reason: use-sdk injection requested
-INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml
-INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml
+INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml reason: use-sdk injection requested
+INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml
+INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml
 	android:targetSdkVersion
-		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml
+		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml
 	android:minSdkVersion
-		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest15964660991960810611.xml
+		INJECTED from /Users/wangqiang/Desktop/expo-gaode-map/packages/search/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest8133282779697147590.xml

package/android/build.gradle

@@ -41,9 +41,10 @@ android {
 }
 
 dependencies {
-    //不要升级 升级会导致无法使用
-    implementation('com.amap.api:search:9.4.0') {
 
-  }
+    // 引入搜索 SDK
+    // 不要升级 升级会导致无法使用
+    implementation('com.amap.api:search:9.4.0') {
 
+    }
 }

package/build/ExpoGaodeMapSearchModule.js

@@ -1,6 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const expo_modules_core_1 = require("expo-modules-core");
+/**
+ * 在加载原生搜索模块前，强制校验基础地图组件是否已安装。
+ * 支持两种“基础地图提供者”：expo-gaode-map 或 expo-gaode-map-navigation（导航内置地图）。
+ * 这样可避免导航与核心包的 SDK 冲突时无法使用搜索模块的问题。
+ */
+function ensureBaseInstalled() {
+    let installed = false;
+    try {
+        // 优先检测核心地图包
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        require('expo-gaode-map');
+        installed = true;
+    }
+    catch (_) {
+        // 再尝试导航包（内置地图能力）
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            require('expo-gaode-map-navigation');
+            installed = true;
+        }
+        catch (_) {
+            installed = false;
+        }
+    }
+    if (!installed) {
+        const msg = '[expo-gaode-map-search] 需要先安装基础地图组件，支持以下任一包：\n' +
+            '  - expo-gaode-map（核心地图包），或\n' +
+            '  - expo-gaode-map-navigation（导航包，内置地图能力）\n' +
+            '请先安装并完成原生配置后再重试。';
+        throw new Error(msg);
+    }
+}
+ensureBaseInstalled();
 /**
  * 高德地图搜索模块
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-search",
-  "version": "1.1.1-next.0",
+  "version": "1.1.2-next.1",
   "description": "高德地图搜索功能模块 - POI搜索、关键词搜索、周边搜索，需先安装expo-gaode-map",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -22,7 +22,7 @@
   "license": "MIT",
   "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
   "dependencies": {
-    "expo-gaode-map": "^2.2.1-next.0"
+    "expo-gaode-map": "^2.2.4-next.0"
   },
   "devDependencies": {
     "@types/react": "~19.1.0",
@@ -33,20 +33,15 @@
   },
   "peerDependencies": {
     "expo": "*",
-    "expo-gaode-map": ">=2.0.0",
     "react": "*",
     "react-native": "*"
   },
-  "peerDependenciesMeta": {
-    "expo-gaode-map": {
-      "optional": false
-    }
-  },
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",
     "lint": "expo-module lint",
     "test": "expo-module test",
-    "expo-module": "expo-module"
+    "expo-module": "expo-module",
+    "postinstall": "node -e \"try{require.resolve('expo-gaode-map');process.exit(0)}catch(e1){try{require.resolve('expo-gaode-map-navigation');process.exit(0)}catch(e2){console.error('[expo-gaode-map-search] 需要安装基础地图组件：expo-gaode-map 或 expo-gaode-map-navigation 中的任意一个。\\n请执行：pnpm add expo-gaode-map 或 pnpm add expo-gaode-map-navigation');process.exit(1)}}\""
   }
 }

package/package.json.backup

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-search",
-  "version": "1.1.0-beta.0",
+  "version": "1.1.1-next.0",
   "description": "高德地图搜索功能模块 - POI搜索、关键词搜索、周边搜索，需先安装expo-gaode-map",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -11,7 +11,8 @@
     "test": "expo-module test",
     "prepare": "expo-module prepare",
     "prepublishOnly": "expo-module prepublishOnly",
-    "expo-module": "expo-module"
+    "expo-module": "expo-module",
+    "postinstall": "node -e \"try{require.resolve('expo-gaode-map');process.exit(0)}catch(e1){try{require.resolve('expo-gaode-map-navigation');process.exit(0)}catch(e2){console.error('[expo-gaode-map-search] 需要安装基础地图组件：expo-gaode-map 或 expo-gaode-map-navigation 中的任意一个。\\n请执行：pnpm add expo-gaode-map 或 pnpm add expo-gaode-map-navigation');process.exit(1)}}\""
   },
   "keywords": [
     "react-native",
@@ -31,7 +32,7 @@
   "license": "MIT",
   "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
   "dependencies": {
-    "expo-gaode-map": "^2.1.0-beta.0"
+    "expo-gaode-map": "^2.2.2-next.0"
   },
   "devDependencies": {
     "@types/react": "~19.1.0",
@@ -42,13 +43,7 @@
   },
   "peerDependencies": {
     "expo": "*",
-    "expo-gaode-map": ">=2.0.0",
     "react": "*",
     "react-native": "*"
-  },
-  "peerDependenciesMeta": {
-    "expo-gaode-map": {
-      "optional": false
-    }
   }
 }