Merge pull request #543 from zapcannon87/master

Release v11.5.0
leancloud · Jan 29, 2019 · 4bd7203 · 4bd7203
2 parents 4fe2512 + f32a314
commit 4bd7203
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/AVOS/AVOSCloud/Push/AVPush.h b/AVOS/AVOSCloud/Push/AVPush.h
@@ -41,6 +41,13 @@ extern NSString *const kAVPushTargetPlatformWindowsPhone;
  */
 + (void)setProductionMode:(BOOL)isProduction;
 
+/**
+ Default is false, if set true, AVPush will remove 'prod' Key-Value.
+
+ @param isIgnoreProd trigger.
+ */
++ (void)setIgnoreProdParameterEnabled:(BOOL)isIgnoreProd;
+
 /*! @name Configuring a Push Notification */
 
 /*!

diff --git a/AVOS/AVOSCloud/Push/AVPush.m b/AVOS/AVOSCloud/Push/AVPush.m
@@ -27,6 +27,7 @@
  */
 
 static BOOL _isProduction = YES;
+static BOOL _isIgnoreProd = false;
 
 NSString *const kAVPushTargetPlatformIOS = @"ios";
 NSString *const kAVPushTargetPlatformAndroid = @"android";
@@ -154,6 +155,10 @@ + (void)setProductionMode:(BOOL)isProduction {
     _isProduction = isProduction;
 }
 
++ (void)setIgnoreProdParameterEnabled:(BOOL)isIgnoreProd {
+    _isIgnoreProd = isIgnoreProd;
+}
+
 + (BOOL)sendPushMessage:(AVPush *)push
                    wait:(BOOL)wait
                   block:(AVBooleanResultBlock)block
@@ -291,7 +296,9 @@ -(NSMutableDictionary *)postData
     if (!_isProduction) {
         prod = @"dev";
     }
-    [data setObject:prod forKey:@"prod"];
+    if (!_isIgnoreProd) {
+        [data setObject:prod forKey:@"prod"];
+    }
     if (self.pushQuery)
     {
         [data addEntriesFromDictionary:[self queryData]];
@@ -333,7 +340,7 @@ - (void)sendPushInBackgroundWithBlock:(AVBooleanResultBlock)block
     NSString *path = [AVPush myObjectPath];
     [[AVPaasClient sharedInstance] postObject:path
                                withParameters:[self postData]
-                                   eventually:YES
+                                   eventually:false
                                         block:^(id object, NSError *error) {
                                                 [AVUtils callBooleanResultBlock:block error:error];
     }];

diff --git a/AVOS/AVOSCloud/UserAgent.h b/AVOS/AVOSCloud/UserAgent.h
@@ -1 +1 @@
-#define SDK_VERSION @"v11.4.9"
+#define SDK_VERSION @"v11.5.0"
diff --git a/AVOSCloud.podspec b/AVOSCloud.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloud'
-  s.version  = '11.4.9'
+  s.version  = '11.5.0'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud Objective-C SDK'
   s.authors  = 'LeanCloud'

diff --git a/AVOSCloudIM.podspec b/AVOSCloudIM.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudIM'
-  s.version  = '11.4.9'
+  s.version  = '11.5.0'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud IM Objective-C SDK'
   s.authors  = 'LeanCloud'

diff --git a/AVOSCloudLiveQuery.podspec b/AVOSCloudLiveQuery.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'AVOSCloudLiveQuery'
-  s.version  = '11.4.9'
+  s.version  = '11.5.0'
   s.homepage = 'https://leancloud.cn/'
   s.summary  = 'LeanCloud LiveQuery Objective-C SDK'
   s.authors  = 'LeanCloud'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define SDK_VERSION @"v11.4.9"
		#define SDK_VERSION @"v11.5.0"