chore(ios): 升级 iOS 依赖 AMapLocation 2.6.7 to ~> 2.9.0

Author: jaywcjlove

README.md

@@ -2,6 +2,8 @@
 ----
 
 [![NPM Version](https://img.shields.io/npm/v/@uiw/react-native-amap-geolocation.svg)](https://npmjs.org/package/@uiw/react-native-amap-geolocation)
+![SDK-6.2.0](https://shields.io/badge/SDK-6.2.0-green?logo=android&style=flat)
+![AMapLocation-2.9.0](https://shields.io/badge/AMapLocation-2.9.0-green?logo=apple&style=flat)
 ![David](https://img.shields.io/david/peer/uiwjs/react-native-amap-geolocation)
 
 React Native 高德地图定位模块，支持 Android/iOS。提供尽可能完善的原生接口，同时提供符合 Web 标准的 Geolocation API 以及 [完整的接口文档](https://uiwjs.github.io/react-native-amap-geolocation/)。
@@ -81,6 +83,44 @@ nehelper sent invalid result code [1] for Wi-Fi information request
 
 </details>
 
+<details>
+<summary>Android：获取 apikey 失败 errorCode : 10001</summary>
+
+```bash
+原因：***确保调用SDK任何接口前先调用更新隐私合规updatePrivacyShow、updatePrivacyAgree两个接口并且参数值都为true，若未正确设置有崩溃风险***
+使用loc SDK 功能使用前请确保已经正确设置apiKey，如有疑问请在高德开放平台官网中搜索【INVALID_USER_KEY】相关内容进行解决。
+```
+
+解决方法：重新申请 `apikey`
+
+</details>
+
+
+<details>
+<summary>Android：new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method</summary>
+
+```bash
+WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `addListener` method.
+WARN  `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method.
+```
+
+解决方法：重新申请 `apikey`
+
+</details>
+
+<details>
+<summary>Android：请在高德开放平台官网中搜索"SERVICE_NOT_EXIST"相关内容进行解决</summary>
+
+```bash
+请在高德开放平台官网中搜索"SERVICE_NOT_EXIST"相关内容进行解决
+```
+
+解决方法：[重新申请 `apikey`](https://lbs.amap.com/cooperation/technical_advisory/?tab=4)
+
+![](./imgs/SERVICE_NOT_EXIST.png)
+
+</details>
+
 ## 安装依赖
 
 ```bash
@@ -92,9 +132,15 @@ $ cd ios && pod install
 ## 基本用法
 
 ```javascript
+import { PermissionsAndroid } from "react-native";
 import { Platform } from 'react-native';
 import AMapGeolocation from '@uiw/react-native-amap-geolocation';
 
+await PermissionsAndroid.requestMultiple([
+  PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION,
+  PermissionsAndroid.PERMISSIONS.ACCESS_COARSE_LOCATION,
+]);
+
 let apiKey = '';
 
 if (Platform.OS === 'ios') {
@@ -152,8 +198,11 @@ const listener = AMapGeolocation.addLocationListener((location) => {
   this.setState({
     location: JSON.stringify(location, null, 2), 
   });
-  listener.remove();
 });
+// 移除监听事件
+listener.remove();
+// 开启监听
+AMapGeolocation.start();
 ```
 
 ## 逆地理编码
@@ -511,7 +560,7 @@ nehelper sent invalid result code [1] for Wi-Fi information request
 当前工程基于 [@brodybits/create-react-native-module](https://github.com/brodybits/create-react-native-module) 初始化。
 
 ```bash
-npx create-react-native-module --package-identifier com.uiwjs.react.geolocation --object-class-name RNAMapGeolocation --generate-example AMapGeolocation --example-react-native-version 0.63.0 --module-name @uiw/react-native-amap-geolocation --github-account uiwjs --author-name "Kenny Wong" --author-email "wowohoo@qq.com"
+npx create-react-native-module --package-identifier com.uiwjs.example.geolocation --object-class-name RNAMapGeolocation --generate-example AMapGeolocation --example-react-native-version 0.63.0 --module-name @uiw/react-native-amap-geolocation --github-account uiwjs --author-name "Kenny Wong" --author-email "wowohoo@qq.com"
 ```
 
 ## 开发

imgs/SERVICE_NOT_EXIST.png

@@ -1,6 +1,8 @@
 import { NativeModules, NativeEventEmitter } from 'react-native';
 
-const eventEmitter = new NativeEventEmitter(NativeModules.RNAMapGeolocation);
+const { RNAMapGeolocation } = NativeModules;
+
+const eventEmitter = new NativeEventEmitter(RNAMapGeolocation);
 
 export default class AMapGeolocation {
   /**
@@ -267,7 +269,7 @@ export default class AMapGeolocation {
   static addLocationListener(listener) {
     return eventEmitter.addListener('AMapGeolocation', (info) => {
       let errorInfo = undefined;
-      if (info.errorCode || info.errorInfo) {
+      if (info && (info.errorCode || info.errorInfo)) {
         errorInfo = {
           code: info.errorCode,
           message: info.errorInfo
@@ -276,6 +278,12 @@ export default class AMapGeolocation {
       listener && listener(info, errorInfo);
     });
   }
+  /**
+   * 要删除其注册侦听器的事件的名称
+   */
+  static removeAllListeners() {
+    return eventEmitter.removeAllListeners('AMapGeolocation');
+  }
   /**
    * 设置是否gps优先-wx
    * @default false

index.js

@@ -20,6 +20,9 @@ + (BOOL)requiresMainQueueSetup {
 - (instancetype)init {
     self = [super init];
     if (self) {
+        // https://lbs.amap.com/api/ios-location-sdk/guide/create-project/ios-location-privacy
+        [AMapLocationManager updatePrivacyAgree:AMapPrivacyAgreeStatusDidAgree];
+        [AMapLocationManager updatePrivacyShow:AMapPrivacyShowStatusDidShow privacyInfo:AMapPrivacyInfoStatusDidContain];
         _manager = [[AMapLocationManager alloc] init];
         _manager.delegate = self;
         // https://lbs.amap.com/api/ios-location-sdk/guide/get-location/singlelocation
@@ -196,6 +199,7 @@ - (instancetype)init {
 RCT_EXPORT_METHOD(getCurrentLocation: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     [_clManager requestWhenInUseAuthorization];
+    NSLog(@"reGeocode:逆地理信息");
     // - kCLAuthorizationStatusAuthorizedWhenInUse 用户已授权仅在使用您的应用程序时使用其位置。
     // - kCLAuthorizationStatusAuthorizedAlways 用户已授权在任何时间使用其位置。
     // - kCLAuthorizationStatusNotDetermined 用户尚未对此应用做出选择

ios/RNAMapGeolocation.m

@@ -6,7 +6,6 @@
   "main": "index.js",
   "typings": "index.d.ts",
   "files": [
-    "android/libs",
     "android/src",
     "android/build.gradle",
     "ios/RNAMapGeolocation.xcodeproj/project.pbxproj",
@@ -44,9 +43,9 @@
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
-    "react": "16.13.1",
-    "react-native": "0.63.0",
-    "typedoc": "0.18.0",
-    "typescript": "3.9.7"
+    "react": "18.2.0",
+    "react-native": "0.71.4",
+    "typedoc": "0.23.26",
+    "typescript": "4.8.4"
   }
 }

package.json

@@ -1,9 +1,10 @@
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
-  s.name         = "RNAMapGeolocation"
+  # s.name         = package["name"]
+  s.name         = "react-native-amap-geolocation"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = "https://github.com/uiwjs/react-native-amap-geolocation"
@@ -16,11 +17,11 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "9.0" }
   s.source       = { :git => "https://github.com/uiwjs/react-native-amap-geolocation.git", :tag => "#{s.version}" }
 
-  s.source_files = "**/*.{h,c,m,swift}"
+  s.source_files = "*.{h,m,mm}"
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "AMapLocation", "2.6.7"
+  s.dependency "AMapLocation", "~> 2.9.0"
   # ...
   # s.dependency "..."
 end