expo-gaode-map-navigation 1.1.1 → 1.1.2-next.1

package/build/types/naviview.types.d.ts

@@ -152,26 +152,25 @@ export interface NaviViewProps extends ViewProps {
      */
     showTrafficLightView?: boolean;
     /**
-     * 是否显示路线
-     * @platform ios
-     * @default true
+     * 导航界面顶部与状态栏的间距（单位：dp）
+     * @platform android
+     * @default 状态栏高度（单位：dp）
      */
-    showRoute?: boolean;
+    androidStatusBarPaddingTop?: number;
     /**
-     * 是否显示转向箭头
+     * 是否显示路线
      * @platform ios
      * @default true
      */
-    showTurnArrow?: boolean;
+    showRoute?: boolean;
     /**
      * 是否显示路况光柱
-     * @platform ios
      * @default true
      */
     showTrafficBar?: boolean;
     /**
      * 是否显示全览按钮
-     * @platform ios
+     *
      * @default true
      */
     showBrowseRouteButton?: boolean;
@@ -183,25 +182,25 @@ export interface NaviViewProps extends ViewProps {
     showMoreButton?: boolean;
     /**
      * 是否显示实时交通按钮
-     * @platform ios
+     *
      * @default true
      */
     showTrafficButton?: boolean;
     /**
      * 是否显示界面元素（设为false可完全自定义界面）
-     * @platform ios
+     * 提示：ios 暂时无效，android 有效
      * @default true
      */
     showUIElements?: boolean;
     /**
      * 走过的路线是否置灰
-     * @platform ios
+     *
      * @default false
      */
     showGreyAfterPass?: boolean;
     /**
      * 是否显示牵引线（起点到终点的飞线）
-     * @platform ios
+     *
      * @default true
      */
     showVectorline?: boolean;

package/ios/ExpoGaodeMapNaviView.swift

@@ -2,9 +2,10 @@
 //  ExpoGaodeMapNaviView.swift
 //  expo-gaode-map-navigation
 //
-//  Created by 王强 on 2025/12/05.
+//  
 //
 
+import Foundation
 import ExpoModulesCore
 import AMapNaviKit
 
@@ -24,7 +25,6 @@ public class ExpoGaodeMapNaviView: ExpoView {
         // 从 Info.plist 读取到了 Key,设置到 SDK
         AMapServices.shared().apiKey = infoPlistKey
         apiKey = infoPlistKey
-        print("✅ [ExpoGaodeMapNaviView] 已从 Info.plist 读取并设置高德地图 API Key")
       }
     }
     
@@ -85,6 +85,11 @@ public class ExpoGaodeMapNaviView: ExpoView {
   
   // MARK: - Properties
   private var driveView: AMapNaviDriveView?
+  private var driveViewLoaded: Bool = false
+  private var pendingShowUIElements: Bool?
+  private var pendingShowUIElementsWorkItem: DispatchWorkItem?
+  private var hasStartedNavi: Bool = false
+  private var hasReceivedFirstNaviData: Bool = false
   private var driveManager: AMapNaviDriveManager?
   
   // Props - 通用属性
@@ -137,7 +142,7 @@ public class ExpoGaodeMapNaviView: ExpoView {
     didSet { driveView?.showTrafficButton = showTrafficButton }
   }
   var showUIElements: Bool = true {
-    didSet { driveView?.showUIElements = showUIElements }
+    didSet { applyShowUIElementsToDriveViewIfReady() }
   }
   var showGreyAfterPass: Bool = false {
     didSet { driveView?.showGreyAfterPass = showGreyAfterPass }
@@ -154,6 +159,10 @@ public class ExpoGaodeMapNaviView: ExpoView {
   var lineWidth: CGFloat = 0 {
     didSet { driveView?.lineWidth = lineWidth }
   }
+
+  func applyShowUIElements(_ visible: Bool) {
+    showUIElements = visible
+  }
   
   // 坐标
   private var startCoordinate: AMapNaviPoint?
@@ -176,7 +185,6 @@ public class ExpoGaodeMapNaviView: ExpoView {
       try checkAMapInitialization()
     } catch {
       let errorMessage = formatError(error)
-      print("⚠️ [ExpoGaodeMapNaviView] 初始化失败: \(errorMessage)")
       // 触发初始化失败事件
       DispatchQueue.main.async {
         self.onNavigationFailed([
@@ -224,15 +232,68 @@ public class ExpoGaodeMapNaviView: ExpoView {
     driveView?.showBrowseRouteButton = showBrowseRouteButton
     driveView?.showMoreButton = showMoreButton
     driveView?.showTrafficButton = showTrafficButton
-    driveView?.showUIElements = showUIElements
     driveView?.showGreyAfterPass = showGreyAfterPass
     driveView?.showVectorline = showVectorline
     driveView?.showTrafficLights = showTrafficLights
     if lineWidth > 0 {
       driveView?.lineWidth = lineWidth
     }
+
+    applyShowUIElementsToDriveViewIfReady()
   }
-  
+
+  private func applyShowUIElementsToDriveViewIfReady() {
+    guard driveView != nil else {
+      pendingShowUIElements = showUIElements
+      return
+    }
+
+    guard driveViewLoaded else {
+      pendingShowUIElements = showUIElements
+      return
+    }
+
+    let value = pendingShowUIElements ?? showUIElements
+    pendingShowUIElements = nil
+
+    if value == false && (!hasStartedNavi || !hasReceivedFirstNaviData) {
+      pendingShowUIElements = false
+      pendingShowUIElementsWorkItem?.cancel()
+      let workItem = DispatchWorkItem { [weak self] in
+        guard let self else { return }
+        self.applyDriveViewShowUIElements(true, remainingAttempts: 20)
+      }
+      pendingShowUIElementsWorkItem = workItem
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: workItem)
+      return
+    }
+
+    pendingShowUIElementsWorkItem?.cancel()
+    let workItem = DispatchWorkItem { [weak self] in
+      guard let self else { return }
+      self.applyDriveViewShowUIElements(value, remainingAttempts: 20)
+    }
+    pendingShowUIElementsWorkItem = workItem
+
+    DispatchQueue.main.asyncAfter(deadline: .now() + 0.08, execute: workItem)
+  }
+
+  private func applyDriveViewShowUIElements(_ value: Bool, remainingAttempts: Int) {
+    guard let driveView else { return }
+
+    if driveView.bounds.isEmpty {
+      if remainingAttempts <= 0 {
+        return
+      }
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) { [weak self] in
+        self?.applyDriveViewShowUIElements(value, remainingAttempts: remainingAttempts - 1)
+      }
+      return
+    }
+
+    driveView.showUIElements = value
+  }
+
   // MARK: - Prop Setters
   private func applyShowCamera(_ show: Bool) {
     driveView?.showCamera = show
@@ -368,6 +429,7 @@ public class ExpoGaodeMapNaviView: ExpoView {
 extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   
   public func driveManager(onCalculateRouteSuccess driveManager: AMapNaviDriveManager) {
+    hasStartedNavi = true
     onRouteCalculated([
       "success": true,
       "naviType": naviType
@@ -379,6 +441,8 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
     } else {
       driveManager.startGPSNavi()
     }
+
+    applyShowUIElementsToDriveViewIfReady()
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, onCalculateRouteFailure error: Error) {
@@ -389,10 +453,13 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didStartNavi naviMode: AMapNaviMode) {
+    hasStartedNavi = true
     onNavigationStarted([
       "type": naviMode == .emulator ? 1 : 0,
       "isEmulator": naviMode == .emulator
     ])
+
+    applyShowUIElementsToDriveViewIfReady()
   }
   
   public func driveManagerNavi(_ driveManager: AMapNaviDriveManager, didArrive wayPoint: AMapNaviPoint) {
@@ -406,6 +473,10 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didUpdate naviLocation: AMapNaviLocation) {
+    if !hasReceivedFirstNaviData {
+      hasReceivedFirstNaviData = true
+      applyShowUIElementsToDriveViewIfReady()
+    }
     onLocationUpdate([
       "latitude": naviLocation.coordinate.latitude,
       "longitude": naviLocation.coordinate.longitude,
@@ -415,6 +486,10 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, didUpdate naviInfo: AMapNaviInfo) {
+    if !hasReceivedFirstNaviData {
+      hasReceivedFirstNaviData = true
+      applyShowUIElementsToDriveViewIfReady()
+    }
     onNavigationInfoUpdate([
       "currentRoadName": naviInfo.currentRoadName ?? "",
       "nextRoadName": naviInfo.nextRoadName ?? "",
@@ -460,6 +535,13 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
 extension ExpoGaodeMapNaviView: AMapNaviDriveViewDelegate {
   
   public func driveViewDidLoad(_ driveView: AMapNaviDriveView) {
+    driveViewLoaded = true
+    applyViewOptions()
+    applyShowUIElementsToDriveViewIfReady()
     onNavigationReady([:])
   }
+
+  public func driveViewEdgePadding(_ driveView: AMapNaviDriveView) -> UIEdgeInsets {
+    return .zero
+  }
 }

package/ios/ExpoGaodeMapNaviViewModule.swift

@@ -2,7 +2,7 @@
 //  ExpoGaodeMapNaviViewModule.swift
 //  expo-gaode-map-navigation
 //
-//  Created by 王强 on 2025/12/05.
+//  
 //
 
 import ExpoModulesCore
@@ -76,7 +76,7 @@ public class ExpoGaodeMapNaviViewModule: Module {
         view.showRoute = value
       }
       
-      Prop("showTurnArrow") { (view: ExpoGaodeMapNaviView, value: Bool) in
+      Prop("naviArrowVisible") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showTurnArrow = value
       }
       
@@ -97,7 +97,7 @@ public class ExpoGaodeMapNaviViewModule: Module {
       }
       
       Prop("showUIElements") { (view: ExpoGaodeMapNaviView, value: Bool) in
-        view.showUIElements = value
+        view.applyShowUIElements(value)
       }
       
       Prop("showGreyAfterPass") { (view: ExpoGaodeMapNaviView, value: Bool) in

package/ios/ExpoGaodeMapNavigationModule.swift

@@ -37,7 +37,6 @@ public class ExpoGaodeMapNavigationModule: Module {
         // 从 Info.plist 读取到了 Key,设置到 SDK
         AMapServices.shared().apiKey = infoPlistKey
         apiKey = infoPlistKey
-        print("✅ [ExpoGaodeMapNavigation] 已从 Info.plist 读取并设置高德地图 API Key")
       }
     }
     
@@ -96,7 +95,6 @@ public class ExpoGaodeMapNavigationModule: Module {
         return true
       } catch {
         let errorMessage = self.formatError(error)
-        print("⚠️ [ExpoGaodeMapNavigation] 初始化失败: \(errorMessage)")
         throw error
       }
     }
@@ -109,7 +107,6 @@ public class ExpoGaodeMapNavigationModule: Module {
       self.walkRideCalculator = nil
       self.independentRouteService = nil
       self.independentRouteManager.clearAll()
-      print("✅ [ExpoGaodeMapNavigation] 已清理所有路径计算器实例")
     }
     
     // ---------------- 1. 驾车/货车 路线规划 ----------------

package/ios/map/ExpoGaodeMapModule.swift

@@ -35,9 +35,7 @@ public class NaviMapModule: Module {
             if saved {
                 // 同步到 SDK
                 MAMapView.updatePrivacyAgree(AMapPrivacyAgreeStatus.didAgree)
-                print("🔁 ExpoGaodeMap: 已从缓存恢复隐私同意状态: true")
             } else {
-                print("ℹ️ ExpoGaodeMap: 未发现已同意记录，等待用户同意后再使用 SDK")
             }
         }
         
@@ -56,21 +54,17 @@ public class NaviMapModule: Module {
             if hasAgreed {
                 // 同步到 SDK
                 MAMapView.updatePrivacyAgree(AMapPrivacyAgreeStatus.didAgree)
-                print("✅ ExpoGaodeMap: 用户已同意隐私协议，可以使用 SDK（状态已持久化）")
                 
                 // 在用户同意后，如果尚未设置 API Key，则尝试从 Info.plist 读取并设置
                 if AMapServices.shared().apiKey == nil || AMapServices.shared().apiKey?.isEmpty == true {
                     if let plistKey = Bundle.main.infoDictionary?["AMapApiKey"] as? String, !plistKey.isEmpty {
                         AMapServices.shared().apiKey = plistKey
                         AMapServices.shared().enableHTTPS = true
-                        print("✅ ExpoGaodeMap: 从 Info.plist 读取并设置 AMapApiKey 成功")
                     } else {
-                        print("⚠️ ExpoGaodeMap: Info.plist 未找到 AMapApiKey，后续需通过 initSDK 提供 iosKey")
                     }
                 }
             } else {
                 MAMapView.updatePrivacyAgree(AMapPrivacyAgreeStatus.notAgree)
-                print("⚠️ ExpoGaodeMap: 用户未同意隐私协议，SDK 功能将受限（状态已持久化）")
             }
         }
         
@@ -83,7 +77,6 @@ public class NaviMapModule: Module {
         Function("initSDK") { (config: [String: String]) in
             // 检查是否已同意隐私协议
             if !NaviMapModule.privacyAgreed {
-                print("⚠️ ExpoGaodeMap: 用户未同意隐私协议，无法初始化 SDK")
                 return
             }
             
@@ -93,12 +86,10 @@ public class NaviMapModule: Module {
             if finalKey == nil {
                 if let plistKey = Bundle.main.infoDictionary?["AMapApiKey"] as? String, !plistKey.isEmpty {
                     finalKey = plistKey
-                    print("ℹ️ ExpoGaodeMap: initSDK 未提供 iosKey，已从 Info.plist 使用 AMapApiKey")
                 }
             }
             
             guard let keyToUse = finalKey, !keyToUse.isEmpty else {
-                print("⚠️ ExpoGaodeMap: 未提供 iosKey 且 Info.plist 中也无 AMapApiKey，无法初始化 SDK")
                 return
             }
             
@@ -111,7 +102,6 @@ public class NaviMapModule: Module {
             // 初始化定位管理器（触发原生侧懒加载）
             self.getLocationManager()
             
-            print("✅ ExpoGaodeMap: 已设置 API Key 并完成初始化（来源：\(providedKey != nil ? "入参 iosKey" : "Info.plist")）")
         }
         
         /**
@@ -129,13 +119,11 @@ public class NaviMapModule: Module {
         Function("start") {
             // 检查隐私协议状态
             if !NaviMapModule.privacyAgreed {
-                print("⚠️ ExpoGaodeMap: 用户未同意隐私协议，无法开始定位")
                 return
             }
             
             // 检查是否已设置 API Key
             if AMapServices.shared().apiKey == nil || AMapServices.shared().apiKey?.isEmpty == true {
-                print("⚠️ ExpoGaodeMap: 未设置 API Key，无法开始定位")
                 return
             }
             

package/package.json

@@ -1,9 +1,37 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "1.1.1",
+  "version": "1.1.2-next.1",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
+  "author": "<TomWq> (https://github.com/TomWq)",
+  "repository": "https://github.com/TomWq/expo-gaode-map",
   "main": "build/index.js",
   "types": "build/index.d.ts",
+  "scripts": {
+    "build": "expo-module build && bun run build:plugin",
+    "build:plugin": "tsc --project plugin/tsconfig.json",
+    "clean": "expo-module clean",
+    "lint": "expo-module lint",
+    "test": "expo-module test",
+    "prepare": "expo-module prepare && bun run build:plugin",
+    "prepublishOnly": "expo-module prepublishOnly",
+    "expo-module": "expo-module"
+  },
+  "devDependencies": {
+    "@expo/config-plugins": "~54.0.4",
+    "@types/react": "~19.1.0",
+    "expo": "^54.0.31",
+    "expo-module-scripts": "^5.0.8",
+    "react-native": "0.81.5",
+    "typescript": "^5.9.3"
+  },
+  "peerDependencies": {
+    "expo": "*",
+    "react": "*",
+    "react-native": "*"
+  },
+  "bugs": {
+    "url": "https://github.com/TomWq/expo-gaode-map/issues"
+  },
   "files": [
     "build",
     "android",
@@ -12,6 +40,7 @@
     "expo-module.config.json",
     "plugin/build"
   ],
+  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
   "keywords": [
     "react-native",
     "expo",
@@ -22,35 +51,5 @@
     "高德地图",
     "导航"
   ],
-  "repository": "https://github.com/TomWq/expo-gaode-map",
-  "bugs": {
-    "url": "https://github.com/TomWq/expo-gaode-map/issues"
-  },
-  "author": "尚博信_王强 <wangqiang03@sunboxsoft.com> (https://github.com/TomWq)",
-  "license": "MIT",
-  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
-  "dependencies": {
-    "supercluster": "^8.0.1"
-  },
-  "devDependencies": {
-    "@expo/config-plugins": "^9.1.7",
-    "@types/react": "~19.1.0",
-    "expo": "^54.0.18",
-    "expo-module-scripts": "^5.0.7",
-    "react-native": "0.81.5",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "expo": "*",
-    "react": "*",
-    "react-native": "*"
-  },
-  "scripts": {
-    "build": "expo-module build && pnpm run build:plugin",
-    "build:plugin": "tsc --project plugin/tsconfig.json",
-    "clean": "expo-module clean",
-    "lint": "expo-module lint",
-    "test": "expo-module test",
-    "expo-module": "expo-module"
-  }
-}
+  "license": "MIT"
+}

package/plugin/build/withGaodeMap.d.ts

@@ -4,9 +4,9 @@ import { ConfigPlugin } from '@expo/config-plugins';
  */
 export type GaodeMapPluginProps = {
     /** iOS 平台 API Key */
-    iosApiKey?: string;
+    iosKey?: string;
     /** Android 平台 API Key */
-    androidApiKey?: string;
+    androidKey?: string;
     /** 是否启用定位功能 */
     enableLocation?: boolean;
     /** iOS 定位权限描述 */

package/plugin/build/withGaodeMap.js

@@ -7,8 +7,8 @@ const config_plugins_1 = require("@expo/config-plugins");
 const withGaodeMapInfoPlist = (config, props) => {
     return (0, config_plugins_1.withInfoPlist)(config, (config) => {
         // 添加高德地图 API Key
-        if (props.iosApiKey) {
-            config.modResults.AMapApiKey = props.iosApiKey;
+        if (props.iosKey) {
+            config.modResults.AMapApiKey = props.iosKey;
         }
         // 添加定位相关权限
         if (props.enableLocation !== false) {
@@ -106,7 +106,7 @@ const withGaodeMapAndroidManifest = (config, props) => {
             }
         }
         // 添加 API Key 到 application 标签
-        if (mainApplication && props.androidApiKey) {
+        if (mainApplication && props.androidKey) {
             if (!mainApplication['meta-data']) {
                 mainApplication['meta-data'] = [];
             }
@@ -116,7 +116,7 @@ const withGaodeMapAndroidManifest = (config, props) => {
                 mainApplication['meta-data'].push({
                     $: {
                         'android:name': 'com.amap.api.v2.apikey',
-                        'android:value': props.androidApiKey,
+                        'android:value': props.androidKey,
                     },
                 });
             }
@@ -126,7 +126,7 @@ const withGaodeMapAndroidManifest = (config, props) => {
                 if (apiKeyIndex !== -1) {
                     mainApplication['meta-data'][apiKeyIndex].$ = {
                         'android:name': 'com.amap.api.v2.apikey',
-                        'android:value': props.androidApiKey,
+                        'android:value': props.androidKey,
                     };
                 }
             }
@@ -149,8 +149,8 @@ const withGaodeMapAppBuildGradle = (config, props) => {
  */
 const withGaodeMap = (config, props = {}) => {
     // 验证配置
-    if (!props.iosApiKey && !props.androidApiKey) {
-        config_plugins_1.WarningAggregator.addWarningIOS('expo-gaode-map-navigation', '未配置 API Key。请在 app.json 的 plugins 中配置 iosApiKey 和 androidApiKey');
+    if (!props.iosKey && !props.androidKey) {
+        config_plugins_1.WarningAggregator.addWarningIOS('expo-gaode-map-navigation', '未配置 API Key。请在 app.json 的 plugins 中配置 iosKey 和 androidKey');
     }
     // 应用 iOS 配置
     config = withGaodeMapInfoPlist(config, props);

package/android/build/.transforms/28c8bb4190ff49e3a0347690e1f4950a/results.bin

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