expo-gaode-map-navigation 1.1.3 → 1.1.5-next.0

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

@@ -106,13 +106,6 @@ export interface NaviViewProps extends ViewProps {
      * @since 6.2.0
      */
     carOverlayVisible?: boolean;
-    /**
-     * 是否显示交通信号灯
-     * @platform android
-     * @default true
-     * @since 7.4.0
-     */
-    trafficLightsVisible?: boolean;
     /**
      * 路线标记点可见性配置
      * @platform android
@@ -152,26 +145,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,31 +175,36 @@ 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;
+    /**
+     * 设置是否为骑步行视图
+     * @platform android
+     * @default false
+     */
+    isNaviTravelView?: boolean;
     /**
      * 是否显示红绿灯图标
-     * @platform ios
      * @default true
      */
     showTrafficLights?: boolean;

package/ios/ExpoGaodeMapNaviView.swift

@@ -5,6 +5,7 @@
 //  
 //
 
+import Foundation
 import ExpoModulesCore
 import AMapNaviKit
 
@@ -84,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 - 通用属性
@@ -136,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 }
@@ -153,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?
@@ -222,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
@@ -366,6 +429,7 @@ public class ExpoGaodeMapNaviView: ExpoView {
 extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
   
   public func driveManager(onCalculateRouteSuccess driveManager: AMapNaviDriveManager) {
+    hasStartedNavi = true
     onRouteCalculated([
       "success": true,
       "naviType": naviType
@@ -377,6 +441,8 @@ extension ExpoGaodeMapNaviView: AMapNaviDriveManagerDelegate {
     } else {
       driveManager.startGPSNavi()
     }
+
+    applyShowUIElementsToDriveViewIfReady()
   }
   
   public func driveManager(_ driveManager: AMapNaviDriveManager, onCalculateRouteFailure error: Error) {
@@ -387,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) {
@@ -404,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,
@@ -413,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 ?? "",
@@ -458,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

@@ -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/package.json

@@ -1,17 +1,11 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "1.1.3",
+  "version": "1.1.5-next.0",
   "description": "高德地图导航功能模块 - 路径规划、导航引导，独立版本包含完整地图功能",
+  "author": "<TomWq> (https://github.com/TomWq)",
+  "repository": "https://github.com/TomWq/expo-gaode-map",
   "main": "build/index.js",
   "types": "build/index.d.ts",
-  "files": [
-    "build",
-    "android",
-    "ios",
-    "app.plugin.js",
-    "expo-module.config.json",
-    "plugin/build"
-  ],
   "scripts": {
     "build": "expo-module build && bun run build:plugin",
     "build:plugin": "tsc --project plugin/tsconfig.json",
@@ -22,6 +16,31 @@
     "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",
+    "ios",
+    "app.plugin.js",
+    "expo-module.config.json",
+    "plugin/build"
+  ],
+  "homepage": "https://github.com/TomWq/expo-gaode-map#readme",
   "keywords": [
     "react-native",
     "expo",
@@ -32,27 +51,5 @@
     "高德地图",
     "导航"
   ],
-  "repository": "https://github.com/TomWq/expo-gaode-map",
-  "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",
-  "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": "*"
-  }
+  "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