Merge pull request #556 from zapcannon87/master

Release v11.6.1

Author: zapcannon87

AVOS/AVOS.xcodeproj/project.pbxproj

@@ -83,7 +83,7 @@ + (AVQuery *)query
 }
 
 -(NSMutableDictionary *)initialBodyData {
-    return [self.requestManager initialSetAndAddRelationDict];
+    return [self._requestManager initialSetAndAddRelationDict];
 }
 
 -(void)setName:(NSString *)name {

AVOS/AVOSCloud/ACL/AVRole.m

@@ -35,7 +35,6 @@ typedef NS_ENUM(int, AVReportPolicy) {
 } ;
 
 @protocol AVAnalyticsDelegate;
-@class CLLocation;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -316,12 +315,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)setLatitude:(double)latitude longitude:(double)longitude;
 
-/** 为了更精确的统计用户地理位置，可以调用此方法传入经纬度信息
- @param location CLLocation *型的地理信息
- */
-+ (void)setLocation:(CLLocation *)location;
-
-
 /**
  *  设置自定义信息
  *

AVOS/AVOSCloud/Analytics/AVAnalytics.h

@@ -13,7 +13,7 @@
 #import "AVUtils.h"
 
 #import "AVOSCloud_Internal.h"
-#import <CoreLocation/CoreLocation.h>
+//#import <CoreLocation/CoreLocation.h>
 
 static NSString * endPoint = @"statistics";
 
@@ -230,11 +230,6 @@ + (void)setLatitude:(double)latitude longitude:(double)longitude {
     [[AVAnalyticsImpl sharedInstance] setLatitude:latitude longitude:longitude];
 }
 
-+ (void)setLocation:(CLLocation *)location {
-    [[AVAnalyticsImpl sharedInstance] setLatitude:location.coordinate.latitude
-                                        longitude:location.coordinate.longitude];
-}
-
 +(void)startInternally {
     if ([[AVAnalyticsImpl sharedInstance] isLocalEnabled]) {
         [AVAnalytics startInternallyWithChannel:@""];

AVOS/AVOSCloud/Analytics/AVAnalytics.m

@@ -6,8 +6,6 @@
 
 #import <Foundation/Foundation.h>
 
-@class CLLocation;
-
 NS_ASSUME_NONNULL_BEGIN
 
 /*!
@@ -28,14 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (instancetype)geoPoint;
 
-/*!
- Creates a new AVGeoPoint object for the given CLLocation, set to the location's
- coordinates.
- @param location CLLocation object, with set latitude and longitude.
- @return a new AVGeoPoint at specified location.
- */
-+ (instancetype)geoPointWithLocation:(CLLocation *)location;
-
 /*!
  Creates a new AVGeoPoint object with the specified latitude and longitude.
  @param latitude Latitude of point in degrees.
@@ -44,45 +34,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (instancetype)geoPointWithLatitude:(double)latitude longitude:(double)longitude;
 
-/*!
- Fetches the user's current location and returns a new AVGeoPoint object via the
- provided block.
- @param geoPointHandler A block which takes the newly created AVGeoPoint as an
- argument.
- */
-+ (void)geoPointForCurrentLocationInBackground:(void(^)(AVGeoPoint * _Nullable geoPoint, NSError * _Nullable error))geoPointHandler;
-
 /** @name Controlling Position */
 
 /// Latitude of point in degrees.  Valid range (-90.0, 90.0).
 @property (nonatomic) double latitude;
 /// Longitude of point in degrees.  Valid range (-180.0, 180.0).
 @property (nonatomic) double longitude;
 
-/** @name Calculating Distance */
-
-/*!
- Get distance in radians from this point to specified point.
- @param point AVGeoPoint location of other point.
- @return distance in radians
- */
-- (double)distanceInRadiansTo:(AVGeoPoint*)point;
-
-/*!
- Get distance in miles from this point to specified point.
- @param point AVGeoPoint location of other point.
- @return distance in miles
- */
-- (double)distanceInMilesTo:(AVGeoPoint*)point;
-
-/*!
- Get distance in kilometers from this point to specified point.
- @param point AVGeoPoint location of other point.
- @return distance in kilometers
- */
-- (double)distanceInKilometersTo:(AVGeoPoint*)point;
-
-
 @end
 
 NS_ASSUME_NONNULL_END

AVOS/AVOSCloud/Geo/AVGeoPoint.h

@@ -5,8 +5,6 @@
 
 
 #import "AVGeoPoint.h"
-#import "AVLocationManager.h"
-#import <CoreLocation/CoreLocation.h>
 
 @implementation  AVGeoPoint
 
@@ -43,14 +41,6 @@ + (AVGeoPoint *)geoPoint
     return result;
 }
 
-+ (AVGeoPoint *)geoPointWithLocation:(CLLocation *)location
-{
-    AVGeoPoint * point = [AVGeoPoint geoPoint];
-    point.latitude = location.coordinate.latitude;
-    point.longitude = location.coordinate.longitude;
-    return point;
-}
-
 + (AVGeoPoint *)geoPointWithLatitude:(double)latitude longitude:(double)longitude
 {
     AVGeoPoint * point = [AVGeoPoint geoPoint];
@@ -59,31 +49,6 @@ + (AVGeoPoint *)geoPointWithLatitude:(double)latitude longitude:(double)longitud
     return point;
 }
 
-- (CLLocation *)location {
-    return [[CLLocation alloc] initWithLatitude:self.latitude longitude:self.longitude];
-}
-
-+ (void)geoPointForCurrentLocationInBackground:(void(^)(AVGeoPoint *geoPoint, NSError *error))geoPointHandler
-{
-    [[AVLocationManager sharedInstance] updateWithBlock:geoPointHandler];
-}
-
-- (double)distanceInRadiansTo:(AVGeoPoint*)point
-{
-    // 6378.140 is the Radius of the earth 
-    return ([self distanceInKilometersTo:point] / 6378.140);
-}
-
-- (double)distanceInMilesTo:(AVGeoPoint*)point
-{
-    return [self distanceInKilometersTo:point] / 1.609344;
-}
-
-- (double)distanceInKilometersTo:(AVGeoPoint*)point
-{
-    return [[self location] distanceFromLocation:[point location]] / 1000.0;
-}
-
 +(NSDictionary *)dictionaryFromGeoPoint:(AVGeoPoint *)point
 {
     return @{ @"__type": @"GeoPoint", @"latitude": @(point.latitude), @"longitude": @(point.longitude) };