🔥 feat(*): 添加额外定位数据

张志伟
1 parent 174369d5
Showing 5 changed files with 79 additions and 54 deletions
lib/android/build.gradle
lib/android/src/main/java/cn/feewee/amap3d/modules/AMapGeolocationModule.java
lib/src/amap-geolocation.ts
lib/src/gen-types.ts
package.json
@@ -32,6 +32,6 @@ android {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getExt('kotlinVersion', '1.6.21')}"
-    implementation 'com.amap.api:3dmap:9.5.0'
-    implementation 'com.amap.api:search:9.4.5'
+    implementation 'com.amap.api:3dmap:9.8.2'
+    implementation 'com.amap.api:search:9.7.0'
 }
@@ -30,7 +30,7 @@ import java.util.ArrayList;
 @SuppressWarnings("unused")
 public class AMapGeolocationModule extends ReactContextBaseJavaModule implements AMapLocationListener {
     private final ReactApplicationContext reactContext;
-    private final AMapLocationClientOption option = new AMapLocationClientOption();
+    private final AMapLocationClientOption mLocationOption = new AMapLocationClientOption();
     private DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter;
     private AMapLocationClient client;
     private GeocodeSearch geocodeSearch;
@@ -65,17 +65,22 @@ public class AMapGeolocationModule extends ReactContextBaseJavaModule implements
         AMapLocationClient.setApiKey(key);
         AMapLocationClient.updatePrivacyShow(reactContext, true, true);
         AMapLocationClient.updatePrivacyAgree(reactContext, true);
-        ServiceSettings.updatePrivacyShow(reactContext,true,true);
-        ServiceSettings.updatePrivacyAgree(reactContext,true);
+        ServiceSettings.updatePrivacyShow(reactContext, true, true);
+        ServiceSettings.updatePrivacyAgree(reactContext, true);
         client = new AMapLocationClient(reactContext);
         geocodeSearch = new GeocodeSearch(reactContext);
         client.setLocationListener(this);
+        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
+        mLocationOption.setMockEnable(false);
+        mLocationOption.setLocationCacheEnable(false);
+        client.setLocationOption(mLocationOption);
         eventEmitter = reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
         promise.resolve(null);
     }
  
     @ReactMethod
     public void start() {
+        client.stopLocation();
         client.startLocation();
     }
  
@@ -104,95 +109,95 @@ public class AMapGeolocationModule extends ReactContextBaseJavaModule implements
  
     @ReactMethod
     public void setOnceLocation(boolean value) {
-        option.setOnceLocation(value);
-        client.setLocationOption(option);
+        mLocationOption.setOnceLocation(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setWifiScan(boolean value) {
-        option.setWifiScan(value);
-        client.setLocationOption(option);
+        mLocationOption.setWifiScan(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setInterval(int interval) {
-        option.setInterval(interval);
-        client.setLocationOption(option);
+        mLocationOption.setInterval(interval);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setSensorEnable(boolean value) {
-        option.setSensorEnable(value);
-        client.setLocationOption(option);
+        mLocationOption.setSensorEnable(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setOpenAlwaysScanWifi(boolean value) {
         AMapLocationClientOption.setOpenAlwaysScanWifi(value);
-        client.setLocationOption(option);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setNeedAddress(boolean value) {
-        option.setNeedAddress(value);
-        client.setLocationOption(option);
+        mLocationOption.setNeedAddress(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setOnceLocationLatest(boolean value) {
-        option.setOnceLocationLatest(value);
-        client.setLocationOption(option);
+        mLocationOption.setOnceLocationLatest(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setMockEnable(boolean value) {
-        option.setMockEnable(value);
-        client.setLocationOption(option);
+        mLocationOption.setMockEnable(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setLocationCacheEnable(boolean value) {
-        option.setLocationCacheEnable(value);
-        client.setLocationOption(option);
+        mLocationOption.setLocationCacheEnable(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setGpsFirst(boolean value) {
-        option.setGpsFirst(value);
-        client.setLocationOption(option);
+        mLocationOption.setGpsFirst(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setHttpTimeout(int value) {
-        option.setHttpTimeOut(value);
-        client.setLocationOption(option);
+        mLocationOption.setHttpTimeOut(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setGpsFirstTimeout(int value) {
-        option.setGpsFirstTimeout(value);
-        client.setLocationOption(option);
+        mLocationOption.setGpsFirstTimeout(value);
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setLocationMode(String mode) {
-        option.setLocationMode(AMapLocationClientOption.AMapLocationMode.valueOf(mode));
-        client.setLocationOption(option);
+        mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.valueOf(mode));
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setLocationPurpose(String purpose) {
-        option.setLocationPurpose(AMapLocationClientOption.AMapLocationPurpose.valueOf(purpose));
-        client.setLocationOption(option);
+        mLocationOption.setLocationPurpose(AMapLocationClientOption.AMapLocationPurpose.valueOf(purpose));
+        client.setLocationOption(mLocationOption);
     }
  
     @ReactMethod
     public void setGeoLanguage(String language) {
-        option.setGeoLanguage(AMapLocationClientOption.GeoLanguage.valueOf(language));
-        client.setLocationOption(option);
+        mLocationOption.setGeoLanguage(AMapLocationClientOption.GeoLanguage.valueOf(language));
+        client.setLocationOption(mLocationOption);
     }
  
-     @ReactMethod
+    @ReactMethod
     public void reverseGeoCode(double lat, double lng, Float radius, Promise promise) {
         if (lat <= 0 || lng <= 0) {
             promise.reject(String.valueOf(-2), "无效的经纬度");
@@ -289,6 +294,8 @@ public class AMapGeolocationModule extends ReactContextBaseJavaModule implements
         WritableMap map = Arguments.createMap();
         map.putInt("errorCode", location.getErrorCode());
         map.putString("errorInfo", location.getErrorInfo());
+        map.putString("deviceId", AMapLocationClient.getDeviceId(reactContext));
+        map.putString("sdkVersion", client.getVersion());
         map.putString("locationDetail", location.getLocationDetail());
         if (location.getErrorCode() == AMapLocation.LOCATION_SUCCESS) {
             map.putDouble("timestamp", location.getTime());
@@ -302,6 +309,10 @@ public class AMapGeolocationModule extends ReactContextBaseJavaModule implements
             map.putString("coordinateType", location.getCoordType());
             map.putInt("gpsAccuracy", location.getGpsAccuracyStatus());
             map.putInt("trustedLevel", location.getTrustedLevel());
+            map.putString("aoiName", location.getAoiName());
+            map.putString("buildingId", location.getBuildingId());
+            map.putString("floor", location.getFloor());
+
             if (!location.getAddress().isEmpty()) {
                 map.putString("address", location.getAddress());
                 map.putString("description", location.getDescription());
@@ -77,6 +77,22 @@ export function setOnceLocation(isOnceLocation: boolean) {
   }
 }
  
+
+/**
+ * 获取最近3s内精度最高的一次定位结果
+ *
+ * 定位精度会更高，但是定位速度会变慢 1-3 秒，
+ * 当设置为 `true` 时，连续定位会自动变为单次定位。
+ *
+ * @default false
+ * @platform android
+ */
+export function setOnceLocationLatest(isOnceLocationLatest: boolean) {
+  if (Platform.OS === "android") {
+    AMapGeolocation.setOnceLocationLatest(isOnceLocationLatest);
+  }
+}
+
 /**
  * 设置是否允许调用 WiFi 刷新
  *
@@ -121,21 +137,6 @@ export function setOpenAlwaysScanWifi(isOpen: boolean) {
 }
  
 /**
- * 设置定位是否等待 WiFi 列表刷新
- *
- * 定位精度会更高，但是定位速度会变慢 1-3 秒，
- * 当设置为 `true` 时，连续定位会自动变为单次定位。
- *
- * @default false
- * @platform android
- */
-export function setOnceLocationLatest(isOnceLocationLatest: boolean) {
-  if (Platform.OS === "android") {
-    AMapGeolocation.setOnceLocationLatest(isOnceLocationLatest);
-  }
-}
-
-/**
  * 设置是否返回地址信息，默认返回地址信息
  *
  * GPS 定位时也可以返回地址信息，但需要网络通畅，第一次有可能没有地址信息返回。
@@ -152,7 +153,7 @@ export function setNeedAddress(isNeedAddress: boolean) {
 /**
  * 设置是否允许模拟位置
  *
- * @default true
+ * @default false
  * @platform android
  */
 export function setMockEnable(enable: boolean) {
@@ -164,7 +165,7 @@ export function setMockEnable(enable: boolean) {
 /**
  * 设置是否使用缓存策略
  *
- * @default true
+ * @default false
  * @platform android
  */
 export function setLocationCacheEnable(enable: boolean) {
@@ -216,7 +217,8 @@ export function setGpsFirst(isGpsFirst: boolean) {
  
 /**
  * 设置定位模式
- *
+ * 
+ * @default LocationMode.Hight_Accuracy
  * @platform android
  */
 export function setLocationMode(mode: LocationMode) {
@@ -345,6 +345,18 @@ export interface ILocation {
    * @platform android
    */
   trustedLevel?: TrustedLevel;
+  /**
+   * 当前定位点的AOI信息
+   */
+  aoiName?: string;
+  /**
+   * 当前室内定位的建筑物Id
+   */
+  buildingId?: string;
+  /**
+   * 当前室内定位的楼层
+   */
+  floor?: string;
 }
  
 /**
 {
   "name": "@cqfw/react-native-amap3d",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "react-native 高德地图组件，支持 Android + iOS",
   "author": "feewee",
   "license": "MIT",