修改CNLiveUserURLRequestSerialization

张旭
1 parent 6a5ab4f2
Showing 5 changed files with 13 additions and 13 deletions
CNLiveUserSystemDemo/CNLiveNetworking/CNLiveURLRequestSerialization.h
CNLiveUserSystemDemo/CNLiveNetworking/CNLiveURLRequestSerialization.m
CNLiveUserSystemDemo/CNLiveNetworking/CNLiveUserNetworkManager.m
Products/CNLiveUserSystemSDK.framework/CNLiveUserSystemSDK
Products/CNLiveUserSystemSDK.framework/Info.plist
@@ -10,6 +10,6 @@
 @interface CNLiveUserURLRequestSerialization : NSObject
-+ (nullable NSString *)CNQueryStringFromParameters:(nullable NSDictionary *)parameters;
++ (nullable NSString *)CNUserQueryStringFromParameters:(nullable NSDictionary *)parameters;
 @end
@@ -35,27 +35,27 @@
 #pragma mark -
-FOUNDATION_EXPORT NSArray * CNQueryStringPairsFromDictionary(NSDictionary *dictionary);
-FOUNDATION_EXPORT NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value);
+FOUNDATION_EXPORT NSArray * CNUserQueryStringPairsFromDictionary(NSDictionary *dictionary);
+FOUNDATION_EXPORT NSArray * CNUserQueryStringPairsFromKeyAndValue(NSString *key, id value);
-+ (NSString *)CNQueryStringFromParameters:(NSDictionary *)parameters
++ (NSString *)CNUserQueryStringFromParameters:(NSDictionary *)parameters
 {
     NSMutableArray *mutablePairs = [NSMutableArray array];
-    for (CNLiveUserURLRequestSerialization *pair in CNQueryStringPairsFromDictionary(parameters)) {
+    for (CNLiveUserURLRequestSerialization *pair in CNUserQueryStringPairsFromDictionary(parameters)) {
         [mutablePairs addObject:[pair URLEncodedStringValue]];
     }
     return [mutablePairs componentsJoinedByString:@"&"];
 }
-NSArray * CNQueryStringPairsFromDictionary(NSDictionary *dictionary)
+NSArray * CNUserQueryStringPairsFromDictionary(NSDictionary *dictionary)
 {
-    return CNQueryStringPairsFromKeyAndValue(nil, dictionary);
+    return CNUserQueryStringPairsFromKeyAndValue(nil, dictionary);
 }
 /**
  *  处理上传参数
  */
-NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value)
+NSArray * CNUserQueryStringPairsFromKeyAndValue(NSString *key, id value)
 {
     NSMutableArray *mutableQueryStringComponents = [NSMutableArray array];
@@ -67,7 +67,7 @@ NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value)
         for (id nestedKey in [dictionary.allKeys sortedArrayUsingDescriptors:@[sortDescriptor]]) {
             id nestedValue = dictionary[nestedKey];
             if (nestedKey) {
-                [mutableQueryStringComponents addObjectsFromArray:CNQueryStringPairsFromKeyAndValue((key ? [NSString stringWithFormat:@"%@[%@]", key, nestedKey] : nestedKey), nestedValue)];
+                [mutableQueryStringComponents addObjectsFromArray:CNUserQueryStringPairsFromKeyAndValue((key ? [NSString stringWithFormat:@"%@[%@]", key, nestedKey] : nestedKey), nestedValue)];
             }
         }
     }
@@ -75,12 +75,12 @@ NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value)
     else if ([value isKindOfClass:[NSArray class]]){   //数组
         NSArray *array = value;
         for (id nestedValue in array) {
-            [mutableQueryStringComponents addObjectsFromArray:CNQueryStringPairsFromKeyAndValue([NSString stringWithFormat:@"%@[]", key], nestedValue)];
+            [mutableQueryStringComponents addObjectsFromArray:CNUserQueryStringPairsFromKeyAndValue([NSString stringWithFormat:@"%@[]", key], nestedValue)];
         }
     }else if ([value isKindOfClass:[NSSet class]]){   //集合
         NSSet *set = value;
         for (id obj in [set sortedArrayUsingDescriptors:@[ sortDescriptor ]]) {
-            [mutableQueryStringComponents addObjectsFromArray:CNQueryStringPairsFromKeyAndValue(key, obj)];
+            [mutableQueryStringComponents addObjectsFromArray:CNUserQueryStringPairsFromKeyAndValue(key, obj)];
         }
     }else{  //其他类型
         [mutableQueryStringComponents addObject:[[CNLiveUserURLRequestSerialization alloc] initWithField:key value:value]];
@@ -89,7 +89,7 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
     NSString *newURLString;
     if ([method isEqualToString:@"GET"]) {
         if (parameters) {
-            newURLString = [[URLString stringByAppendingString:@"?"] stringByAppendingString:[CNLiveUserURLRequestSerialization CNQueryStringFromParameters:parameters]];
+            newURLString = [[URLString stringByAppendingString:@"?"] stringByAppendingString:[CNLiveUserURLRequestSerialization CNUserQueryStringFromParameters:parameters]];
         }else{
             newURLString = URLString;
         }
@@ -104,7 +104,7 @@ static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
     if([method isEqual:@"POST"]){
         if (!data) {
             [request addValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
-            request.HTTPBody =[[CNLiveUserURLRequestSerialization CNQueryStringFromParameters:parameters] dataUsingEncoding:NSUTF8StringEncoding];
+            request.HTTPBody =[[CNLiveUserURLRequestSerialization CNUserQueryStringFromParameters:parameters] dataUsingEncoding:NSUTF8StringEncoding];
         } else {
             //设置HTTPHeader中Content-Type的值
             NSString *content=[[NSString alloc]initWithFormat:@"multipart/form-data; boundary=%@",boundary];