Skip to content

Commit

Permalink
Merge pull request react-native-component#1 from colincodesh/master
Browse files Browse the repository at this point in the history
ios 审核适配
  • Loading branch information
JoshYuJump authored May 22, 2017
2 parents 62cb399 + a2fc9c1 commit 5b2e2cc
Show file tree
Hide file tree
Showing 21 changed files with 589 additions and 289 deletions.
1 change: 0 additions & 1 deletion ios/Frameworks/AMapFoundationKit.framework/1.3.2.d4e0936

This file was deleted.

Binary file modified ios/Frameworks/AMapFoundationKit.framework/AMapFoundationKit
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// AMapFoundationKit
//
// Created by xiaoming han on 15/10/28.
// Copyright © 2015年 AutoNavi. All rights reserved.
// Copyright © 2015年 Amap. All rights reserved.
//

#import <AMapFoundationKit/AMapFoundationVersion.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
// AMapFoundation
//
// Created by xiaoming han on 15/10/26.
// Copyright © 2015年 AutoNavi. All rights reserved.
// Copyright © 2015年 Amap. All rights reserved.
//

#import <Foundation/Foundation.h>

#ifndef AMapFoundationVersion_h
#define AMapFoundationVersion_h

#define AMapFoundationVersionNumber 10302
#define AMapFoundationVersionNumber 10400

FOUNDATION_EXTERN NSString * const AMapFoundationVersion;
FOUNDATION_EXTERN NSString * const AMapFoundationName;
Expand Down
19 changes: 7 additions & 12 deletions ios/Frameworks/AMapFoundationKit.framework/Headers/AMapServices.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,21 @@

#import <Foundation/Foundation.h>

///高德SDK服务类
@interface AMapServices : NSObject

+ (AMapServices *)sharedServices;

/**
* APIkey。设置key,需要绑定对应的bundle id。
* @brief 获取单例
*/
+ (AMapServices *)sharedServices;

///APIkey。设置key,需要绑定对应的bundle id。
@property (nonatomic, copy) NSString *apiKey;

/**
* 是否开启HTTPS,默认为NO。
* 目前已支持服务:key鉴权、云图、搜索。
*/
///是否开启HTTPS,从1.3.3版本开始默认为YES。
@property (nonatomic, assign) BOOL enableHTTPS;

/**
* 是否启用崩溃日志上传。默认为YES, 只有在真机上设置有效。
* 开启崩溃日志上传有助于我们更好的了解SDK的状况,可以帮助我们持续优化和改进SDK。
* 需要注意的是,我是通过设置NSUncaughtExceptionHandler来捕获异常的,如果您的APP中使用了其他收集崩溃日志的SDK,或者自己有设置NSUncaughtExceptionHandler的话,请保证 AMapServices 的初始化是在其他设置NSUncaughtExceptionHandler操作之后进行的,我们的handler会再处理完异常后调用前一次设置的handler,保证之前设置的handler会被执行。
*/
///是否启用崩溃日志上传。默认为YES, 只有在真机上设置有效。\n开启崩溃日志上传有助于我们更好的了解SDK的状况,可以帮助我们持续优化和改进SDK。需要注意的是,SDK内部是通过设置NSUncaughtExceptionHandler来捕获异常的,如果您的APP中使用了其他收集崩溃日志的SDK,或者自己有设置NSUncaughtExceptionHandler的话,请保证 AMapServices 的初始化是在其他设置NSUncaughtExceptionHandler操作之后进行的,我们的handler会再处理完异常后调用前一次设置的handler,保证之前设置的handler会被执行。
@property (nonatomic, assign) BOOL crashReportEnabled;

@end
32 changes: 14 additions & 18 deletions ios/Frameworks/AMapFoundationKit.framework/Headers/AMapURLSearch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,38 @@
// AMapFoundation
//
// Created by xiaoming han on 15/10/28.
// Copyright © 2015年 AutoNavi. All rights reserved.
// Copyright © 2015年 Amap. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "AMapURLSearchConfig.h"

/// 调起高德地图URL进行搜索,若是调起失败,可使用`+ (void)getLatestAMapApp;`方法获取最新版高德地图app.
///调起高德地图URL进行搜索,若是调起失败,可使用`+ (void)getLatestAMapApp;`方法获取最新版高德地图app.
@interface AMapURLSearch : NSObject

/// 打开高德地图AppStore页面
/**
* @brief 打开高德地图AppStore页面
*/
+ (void)getLatestAMapApp;

/**
* 调起高德地图app驾车导航.
*
* @param config 配置参数.
*
* @return 是否成功.若为YES则成功调起,若为NO则无法调起.
* @brief 调起高德地图app驾车导航.
* @param config 配置参数.
* @return 是否成功.若为YES则成功调起,若为NO则无法调起.
*/
+ (BOOL)openAMapNavigation:(AMapNaviConfig *)config;

/**
* 调起高德地图app进行路径规划.
*
* @param config 配置参数.
*
* @return 是否成功.
* @brief 调起高德地图app进行路径规划.
* @param config 配置参数.
* @return 是否成功.
*/
+ (BOOL)openAMapRouteSearch:(AMapRouteConfig *)config;

/**
* 调起高德地图app进行POI搜索.
*
* @param config 配置参数.
*
* @return 是否成功.
* @brief 调起高德地图app进行POI搜索.
* @param config 配置参数.
* @return 是否成功.
*/
+ (BOOL)openAMapPOISearch:(AMapPOIConfig *)config;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,69 +10,69 @@
#import <CoreLocation/CoreLocation.h>
#import "AMapURLSearchType.h"

/// 导航配置信息
///导航配置信息
@interface AMapNaviConfig : NSObject

/// 应用返回的Scheme
///应用返回的Scheme
@property (nonatomic, copy) NSString *appScheme;

/// 应用名称
///应用名称
@property (nonatomic, copy) NSString *appName;

/// 终点
///终点
@property (nonatomic, assign) CLLocationCoordinate2D destination;

/// 导航策略
///导航策略
@property (nonatomic, assign) AMapDrivingStrategy strategy;

@end

#pragma mark -

/// 路径搜索配置信息
///路径搜索配置信息
@interface AMapRouteConfig : NSObject

/// 应用返回的Scheme
///应用返回的Scheme
@property (nonatomic, copy) NSString *appScheme;

/// 应用名称
///应用名称
@property (nonatomic, copy) NSString *appName;

/// 起点坐标
///起点坐标
@property (nonatomic, assign) CLLocationCoordinate2D startCoordinate;

/// 终点坐标
///终点坐标
@property (nonatomic, assign) CLLocationCoordinate2D destinationCoordinate;

/// 驾车策略
///驾车策略
@property (nonatomic, assign) AMapDrivingStrategy drivingStrategy;

/// 公交策略
///公交策略
@property (nonatomic, assign) AMapTransitStrategy transitStrategy;

/// 路径规划类型
///路径规划类型
@property (nonatomic, assign) AMapRouteSearchType routeType;

@end

#pragma mark -

/// POI搜索配置信息
///POI搜索配置信息
@interface AMapPOIConfig : NSObject

/// 应用返回的Scheme
///应用返回的Scheme
@property (nonatomic, copy) NSString *appScheme;

/// 应用名称
///应用名称
@property (nonatomic, copy) NSString *appName;

/// 搜索关键字
///搜索关键字
@property (nonatomic, copy) NSString *keywords;

/// 左上角坐标
///左上角坐标
@property (nonatomic, assign) CLLocationCoordinate2D leftTopCoordinate;

/// 右下角坐标
///右下角坐标
@property (nonatomic, assign) CLLocationCoordinate2D rightBottomCoordinate;

@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@
// Copyright (c) 2015年 xiaoming han. All rights reserved.
//

/// 驾车策略
///驾车策略
typedef NS_ENUM(NSInteger, AMapDrivingStrategy)
{
AMapDrivingStrategyFastest = 0, //速度最快
AMapDrivingStrategyMinFare = 1, //避免收费
AMapDrivingStrategyShortest = 2, //距离最短
AMapDrivingStrategyFastest = 0, ///<速度最快
AMapDrivingStrategyMinFare = 1, ///<避免收费
AMapDrivingStrategyShortest = 2, ///<距离最短

AMapDrivingStrategyNoHighways = 3, //不走高速
AMapDrivingStrategyAvoidCongestion = 4, //躲避拥堵
AMapDrivingStrategyNoHighways = 3, ///<不走高速
AMapDrivingStrategyAvoidCongestion = 4, ///<躲避拥堵

AMapDrivingStrategyAvoidHighwaysAndFare = 5, //不走高速且避免收费
AMapDrivingStrategyAvoidHighwaysAndCongestion = 6, //不走高速且躲避拥堵
AMapDrivingStrategyAvoidFareAndCongestion = 7, //躲避收费和拥堵
AMapDrivingStrategyAvoidHighwaysAndFareAndCongestion = 8 //不走高速躲避收费和拥堵
AMapDrivingStrategyAvoidHighwaysAndFare = 5, ///<不走高速且避免收费
AMapDrivingStrategyAvoidHighwaysAndCongestion = 6, ///<不走高速且躲避拥堵
AMapDrivingStrategyAvoidFareAndCongestion = 7, ///<躲避收费和拥堵
AMapDrivingStrategyAvoidHighwaysAndFareAndCongestion = 8 ///<不走高速躲避收费和拥堵
};

/// 公交策略
///公交策略
typedef NS_ENUM(NSInteger, AMapTransitStrategy)
{
AMapTransitStrategyFastest = 0,//最快捷
AMapTransitStrategyMinFare = 1,//最经济
AMapTransitStrategyMinTransfer = 2,//最少换乘
AMapTransitStrategyMinWalk = 3,//最少步行
AMapTransitStrategyMostComfortable = 4,//最舒适
AMapTransitStrategyAvoidSubway = 5,//不乘地铁
AMapTransitStrategyFastest = 0,///<最快捷
AMapTransitStrategyMinFare = 1,///<最经济
AMapTransitStrategyMinTransfer = 2,///<最少换乘
AMapTransitStrategyMinWalk = 3,///<最少步行
AMapTransitStrategyMostComfortable = 4,///<最舒适
AMapTransitStrategyAvoidSubway = 5,///<不乘地铁
};

/// 路径规划类型
///路径规划类型
typedef NS_ENUM(NSInteger, AMapRouteSearchType)
{
AMapRouteSearchTypeDriving = 0, //驾车
AMapRouteSearchTypeTransit = 1, //公交
AMapRouteSearchTypeWalking = 2, //步行
AMapRouteSearchTypeDriving = 0, ///<驾车
AMapRouteSearchTypeTransit = 1, ///<公交
AMapRouteSearchTypeWalking = 2, ///<步行
};


41 changes: 19 additions & 22 deletions ios/Frameworks/AMapFoundationKit.framework/Headers/AMapUtility.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,46 @@
// AMapFoundation
//
// Created by xiaoming han on 15/10/27.
// Copyright © 2015年 AutoNavi. All rights reserved.
// Copyright © 2015年 Amap. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>

//工具方法

/**
* 工具方法
* @brief 如果字符串为nil则返回空字符串
*/

FOUNDATION_STATIC_INLINE NSString * AMapEmptyStringIfNil(NSString *s)
{
return s ? s : @"";
}


/// 坐标类型枚举
///坐标类型枚举
typedef NS_ENUM(NSUInteger, AMapCoordinateType)
{
AMapCoordinateTypeBaidu = 0, // Baidu
AMapCoordinateTypeMapBar, // MapBar
AMapCoordinateTypeMapABC, // MapABC
AMapCoordinateTypeSoSoMap, // SoSoMap
AMapCoordinateTypeAliYun, // AliYun
AMapCoordinateTypeGoogle, // Google
AMapCoordinateTypeGPS, // GPS
AMapCoordinateTypeBaidu = 0, ///<Baidu
AMapCoordinateTypeMapBar, ///<MapBar
AMapCoordinateTypeMapABC, ///<MapABC
AMapCoordinateTypeSoSoMap, ///<SoSoMap
AMapCoordinateTypeAliYun, ///<AliYun
AMapCoordinateTypeGoogle, ///<Google
AMapCoordinateTypeGPS, ///<GPS
};

/**
* 转换目标经纬度为高德坐标系
*
* @param coordinate 待转换的经纬度
* @param type 坐标系类型
*
* @return 高德坐标系经纬度
* @brief 转换目标经纬度为高德坐标系
* @param coordinate 待转换的经纬度
* @param type 坐标系类型
* @return 高德坐标系经纬度
*/
FOUNDATION_EXTERN CLLocationCoordinate2D AMapCoordinateConvert(CLLocationCoordinate2D coordinate, AMapCoordinateType type);

/**
* 判断目标经纬度是否在大陆以及港、澳地区。输入参数为高德坐标系。
*
* @param coordinate 待判断的目标经纬度
* @return 是否在大陆以及港、澳地区
* @brief 判断目标经纬度是否在大陆以及港、澳地区。输入参数为高德坐标系。
* @param coordinate 待判断的目标经纬度
* @return 是否在大陆以及港、澳地区
*/
FOUNDATION_EXTERN BOOL AMapDataAvailableForCoordinate(CLLocationCoordinate2D coordinate);

Expand Down
1 change: 1 addition & 0 deletions ios/Frameworks/AMapFoundationKit.framework/version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.4.0+foundation.e669e61
1 change: 0 additions & 1 deletion ios/Frameworks/AMapLocationKit.framework/2.2.0.3c0ed2d

This file was deleted.

Binary file modified ios/Frameworks/AMapLocationKit.framework/AMapLocationKit
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// AMapGeoFenceError.h
// AMapLocationKit
//
// Created by eidan on 16/12/15.
// Copyright © 2016年 Amap. All rights reserved.
//

#ifndef AMapGeoFenceError_h
#define AMapGeoFenceError_h


///AMapGeoFence errorDomain
extern NSString * const AMapGeoFenceErrorDomain;

///地理围栏错误码
typedef NS_ENUM(NSInteger, AMapGeoFenceErrorCode) {
AMapGeoFenceErrorUnknown = 1, ///< 未知错误
AMapGeoFenceErrorInvalidParameter = 2, ///< 参数错误
AMapGeoFenceErrorFailureConnection = 3, ///< 网络连接异常
AMapGeoFenceErrorFailureAuth = 4, ///< 鉴权失败
AMapGeoFenceErrorNoValidFence = 5, ///< 无可用围栏
AMapGeoFenceErroFailureLocating = 6, ///< 定位错误
};

#endif /* AMapGeoFenceError_h */
Loading

0 comments on commit 5b2e2cc

Please sign in to comment.