修改

王军波
1 parent c7912647
Showing 13 changed files with 236 additions and 434 deletions
CNLivePaySDKDemo.xcodeproj/project.pbxproj
CNLivePaySDKDemo/AppDelegate.m
CNLivePaySDKDemo/CNLiveNetworking/CNLivePayNetworkManager.h
CNLivePaySDKDemo/CNLiveNetworking/CNLivePayNetworkManager.m
CNLivePaySDKDemo/CNLiveNetworking/CNLivePayURLRequestSerialization.h
CNLivePaySDKDemo/CNLiveNetworking/CNLivePayURLRequestSerialization.m
CNLivePaySDKDemo/CNLivePaySDK.framework/CNLivePaySDK
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePayArg.h
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePayResult.h
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePaySDK.h
CNLivePaySDKDemo/CNLivePaySDK.framework/Info.plist
CNLivePaySDKDemo/CNLivePaySDK.framework/Modules/module.modulemap
CNLivePaySDKDemo/ViewController.m
@@ -8,10 +8,6 @@
 /* Begin PBXBuildFile section */
 		D2362F8D1EB3299300823BF5 /* PayMoneyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2362F8C1EB3299300823BF5 /* PayMoneyTableViewCell.m */; };
-		D2362FBD1EB8267F00823BF5 /* CNLivePaySDK.m in Sources */ = {isa = PBXBuildFile; fileRef = D2362FBA1EB8267F00823BF5 /* CNLivePaySDK.m */; };
-		D2362FBE1EB8267F00823BF5 /* CNLivePayArg.m in Sources */ = {isa = PBXBuildFile; fileRef = D2362FBC1EB8267F00823BF5 /* CNLivePayArg.m */; };
-		D2362FC41EB8269E00823BF5 /* CNLivePayNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2362FC11EB8269E00823BF5 /* CNLivePayNetworkManager.m */; };
-		D2362FC51EB8269E00823BF5 /* CNLivePayURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D2362FC31EB8269E00823BF5 /* CNLivePayURLRequestSerialization.m */; };
 		D2362FDF1EB827B500823BF5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D2362FDE1EB827B500823BF5 /* libc++.tbd */; };
 		D2362FE11EB827C000823BF5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D2362FE01EB827C000823BF5 /* libz.tbd */; };
 		D2362FE31EB827C700823BF5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2362FE21EB827C700823BF5 /* SystemConfiguration.framework */; };
@@ -29,7 +25,7 @@
 		D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D23630081EB8817400823BF5 /* libWeChatSDK.a */; };
 		D236300E1EB8817400823BF5 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = D23630091EB8817400823BF5 /* README.txt */; };
 		D265E5321ECAFA88006AE8B6 /* PayTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */; };
-		D27934AD1EC1A3940028F26F /* CNLivePayResult.m in Sources */ = {isa = PBXBuildFile; fileRef = D27934AC1EC1A3940028F26F /* CNLivePayResult.m */; };
+		D2868FE01EE8F6260037DECF /* CNLivePaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */; };
 		D28B45AE1EB1CC1000ED24B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45AD1EB1CC1000ED24B5 /* main.m */; };
 		D28B45B11EB1CC1000ED24B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B01EB1CC1000ED24B5 /* AppDelegate.m */; };
 		D28B45B41EB1CC1000ED24B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B31EB1CC1000ED24B5 /* ViewController.m */; };
@@ -41,14 +37,6 @@
 /* Begin PBXFileReference section */
 		D2362F8B1EB3299300823BF5 /* PayMoneyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayMoneyTableViewCell.h; sourceTree = "<group>"; };
 		D2362F8C1EB3299300823BF5 /* PayMoneyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayMoneyTableViewCell.m; sourceTree = "<group>"; };
-		D2362FB91EB8267F00823BF5 /* CNLivePaySDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CNLivePaySDK.h; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePaySDK.h; sourceTree = "<group>"; };
-		D2362FBA1EB8267F00823BF5 /* CNLivePaySDK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CNLivePaySDK.m; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePaySDK.m; sourceTree = "<group>"; };
-		D2362FBB1EB8267F00823BF5 /* CNLivePayArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CNLivePayArg.h; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePayArg.h; sourceTree = "<group>"; };
-		D2362FBC1EB8267F00823BF5 /* CNLivePayArg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CNLivePayArg.m; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePayArg.m; sourceTree = "<group>"; };
-		D2362FC01EB8269E00823BF5 /* CNLivePayNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLivePayNetworkManager.h; sourceTree = "<group>"; };
-		D2362FC11EB8269E00823BF5 /* CNLivePayNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLivePayNetworkManager.m; sourceTree = "<group>"; };
-		D2362FC21EB8269E00823BF5 /* CNLivePayURLRequestSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLivePayURLRequestSerialization.h; sourceTree = "<group>"; };
-		D2362FC31EB8269E00823BF5 /* CNLivePayURLRequestSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLivePayURLRequestSerialization.m; sourceTree = "<group>"; };
 		D2362FDE1EB827B500823BF5 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		D2362FE01EB827C000823BF5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		D2362FE21EB827C700823BF5 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -70,8 +58,7 @@
 		D236300C1EB8817400823BF5 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; };
 		D265E5301ECAFA88006AE8B6 /* PayTypeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayTypeTableViewCell.h; sourceTree = "<group>"; };
 		D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayTypeTableViewCell.m; sourceTree = "<group>"; };
-		D27934AB1EC1A3940028F26F /* CNLivePayResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CNLivePayResult.h; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePayResult.h; sourceTree = "<group>"; };
-		D27934AC1EC1A3940028F26F /* CNLivePayResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CNLivePayResult.m; path = ../../CNLivePaySDK/CNLivePaySDK/CNLivePayResult.m; sourceTree = "<group>"; };
+		D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePaySDK.framework; sourceTree = "<group>"; };
 		D28B45A91EB1CC1000ED24B5 /* CNLivePaySDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLivePaySDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D28B45AD1EB1CC1000ED24B5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -89,6 +76,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D2868FE01EE8F6260037DECF /* CNLivePaySDK.framework in Frameworks */,
 				D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */,
 				D23630071EB8725500823BF5 /* libsqlite3.0.tbd in Frameworks */,
 				D2362FF31EB8280400823BF5 /* CoreMotion.framework in Frameworks */,
@@ -109,17 +97,6 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
-		D2362FBF1EB8269E00823BF5 /* CNLiveNetworking */ = {
-			isa = PBXGroup;
-			children = (
-				D2362FC01EB8269E00823BF5 /* CNLivePayNetworkManager.h */,
-				D2362FC11EB8269E00823BF5 /* CNLivePayNetworkManager.m */,
-				D2362FC21EB8269E00823BF5 /* CNLivePayURLRequestSerialization.h */,
-				D2362FC31EB8269E00823BF5 /* CNLivePayURLRequestSerialization.m */,
-			);
-			path = CNLiveNetworking;
-			sourceTree = "<group>";
-		};
 		D2362FDD1EB827B500823BF5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -180,7 +157,7 @@
 		D28B45AB1EB1CC1000ED24B5 /* CNLivePaySDKDemo */ = {
 			isa = PBXGroup;
 			children = (
-				D2362FBF1EB8269E00823BF5 /* CNLiveNetworking */,
+				D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */,
 				D2362FF91EB8516500823BF5 /* Alipay */,
 				D2362FFE1EB85BB800823BF5 /* WXApi */,
 				D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */,
@@ -191,12 +168,6 @@
 				D2362F8C1EB3299300823BF5 /* PayMoneyTableViewCell.m */,
 				D265E5301ECAFA88006AE8B6 /* PayTypeTableViewCell.h */,
 				D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */,
-				D2362FB91EB8267F00823BF5 /* CNLivePaySDK.h */,
-				D2362FBA1EB8267F00823BF5 /* CNLivePaySDK.m */,
-				D2362FBB1EB8267F00823BF5 /* CNLivePayArg.h */,
-				D2362FBC1EB8267F00823BF5 /* CNLivePayArg.m */,
-				D27934AB1EC1A3940028F26F /* CNLivePayResult.h */,
-				D27934AC1EC1A3940028F26F /* CNLivePayResult.m */,
 				D28B45B51EB1CC1000ED24B5 /* Main.storyboard */,
 				D28B45B81EB1CC1000ED24B5 /* Assets.xcassets */,
 				D28B45BA1EB1CC1000ED24B5 /* LaunchScreen.storyboard */,
@@ -288,14 +259,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D2362FBE1EB8267F00823BF5 /* CNLivePayArg.m in Sources */,
-				D27934AD1EC1A3940028F26F /* CNLivePayResult.m in Sources */,
-				D2362FBD1EB8267F00823BF5 /* CNLivePaySDK.m in Sources */,
 				D28B45B41EB1CC1000ED24B5 /* ViewController.m in Sources */,
 				D265E5321ECAFA88006AE8B6 /* PayTypeTableViewCell.m in Sources */,
-				D2362FC41EB8269E00823BF5 /* CNLivePayNetworkManager.m in Sources */,
 				D28B45B11EB1CC1000ED24B5 /* AppDelegate.m in Sources */,
-				D2362FC51EB8269E00823BF5 /* CNLivePayURLRequestSerialization.m in Sources */,
 				D28B45AE1EB1CC1000ED24B5 /* main.m in Sources */,
 				D2362F8D1EB3299300823BF5 /* PayMoneyTableViewCell.m in Sources */,
 			);
@@ -421,6 +387,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay",
+					"$(PROJECT_DIR)/CNLivePaySDKDemo",
 				);
 				INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -444,6 +411,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay",
+					"$(PROJECT_DIR)/CNLivePaySDKDemo",
 				);
 				INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -8,7 +8,7 @@
 #import "AppDelegate.h"
 #import "ViewController.h"
-#import "CNLivePaySDK.h"
+#import <CNLivePaySDK/CNLivePaySDK.h>
 #define WXAppId @"wxbcb43c2700c2e6b3"
 #define BundleId @"com.cnlive.shipinzhongguo"
-//
-//  CNLiveNetworkManager.h
-//  CNLiveHttpRequestDemo
-//
-//  Created by Android on 16/7/26.
-//  Copyright © 2016年 Android. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface CNLivePayNetworkManager : NSObject
-
-/**
- *  设置超时时间
- */
-@property (nonatomic, assign) NSTimeInterval timeoutInterval;
-
-/**
- *  缓存策略
- */
-@property (nonatomic, assign) NSURLRequestCachePolicy cachePolicy;
-
-+ (nonnull CNLivePayNetworkManager *)manager;
-
-/**
- *  GET 请求
- *  @param URL url
- *  @param parameters 上传参数
- *  @param success 请求成功回调
- *  @param failure 请求失败回调
- */
-- (void)requestGetURL:(nullable NSString *)URL
-           parameters:(nullable NSDictionary *)parameters
-              success:(nullable void (^)(NSURLResponse *_Nullable response, id _Nullable responseObject))success
-             failure :(nullable void (^)(NSURLResponse *_Nullable response, NSError *_Nullable  error))failure;
-
-/**
- *  POST 请求
- *  @param URL url
- *  @param parameters 上传参数
- *  @param success 请求成功回调
- *  @param failure 请求失败回调
- */
-- (void)requestPostURL:(nullable NSString *)URL
-           parameters:(nullable NSDictionary *)parameters
-              success:(nullable void (^)(NSURLResponse *_Nullable response, id _Nullable responseObject))success
-             failure :(nullable void (^)(NSURLResponse *_Nullable response, NSError *_Nullable  error))failure;
-
-
-
-@end
-//
-//  CNLiveNetworkManager.m
-//  CNLiveHttpRequestDemo
-//
-//  Created by Android on 16/7/26.
-//  Copyright © 2016年 Android. All rights reserved.
-//
-
-#import "CNLivePayNetworkManager.h"
-#import "CNLivePayURLRequestSerialization.h"
-
-/**
- *  网络超时时间 默认 60
- */
-static  NSTimeInterval TimeoutInterval = 30.0 ;
-
-/**
- *  缓存策略
- *  NSURLRequestUseProtocolCachePolicy // 默认的缓存策略（取决于协议）
- *  NSURLRequestReloadIgnoringLocalCacheData // 忽略缓存，重新请求
- *  NSURLRequestReloadIgnoringLocalAndRemoteCacheData // 未实现
- *  NSURLRequestReloadIgnoringCacheData = NSURLRequestReloadIgnoringLocalCacheData // 忽略缓存，重新请求
- *  NSURLRequestReturnCacheDataElseLoad// 有缓存就用缓存，忽略过期时间！没有缓存就重新请求
- *  NSURLRequestReturnCacheDataDontLoad// 有缓存就用缓存，没有缓存就不发请求，当做请求出错处理（用于离线模式）
- *  NSURLRequestReloadRevalidatingCacheData // 未实现
- */
-static NSURLRequestCachePolicy CachePolicy = NSURLRequestUseProtocolCachePolicy;
-
-@implementation CNLivePayNetworkManager
-
-+ (CNLivePayNetworkManager *)manager
-{
-    static CNLivePayNetworkManager *manager = nil;
-    
-    static dispatch_once_t predicate;
-    
-    dispatch_once(&predicate, ^{
-        
-        manager = [[CNLivePayNetworkManager alloc] init];
-        
-    });
-    
-    manager.cachePolicy = CachePolicy;
-    
-    manager.timeoutInterval = TimeoutInterval;
-    
-    return manager;
-}
-
--(void)requestGetURL:(NSString *)URL
-          parameters:(NSDictionary *)parameters
-             success:(void (^)(NSURLResponse * _Nullable, id _Nullable))success
-             failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure
-{
-    NSURLSessionDataTask *task = [self dataTaskWithRequestMethod:@"GET" URLString:URL parameters:parameters success:success failure:failure];
-    [task resume];
-}
-
-- (void)requestPostURL:(NSString *)URL
-            parameters:(NSDictionary *)parameters
-               success:(void (^)(NSURLResponse * _Nullable, id _Nullable))success
-               failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure
-{
-    NSURLSessionDataTask *task = [self dataTaskWithRequestMethod:@"POST" URLString:URL parameters:parameters success:success failure:failure];
-    [task resume];
-}
-
-- (NSURLSessionDataTask *)dataTaskWithRequestMethod:(NSString *)method
-                                          URLString:(NSString *)URLString
-                                         parameters:(NSDictionary *)parameters
-                                            success:(void (^)(NSURLResponse * _Nullable, id _Nullable))success
-                                            failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure
-{
-    
-    if (![URLString isKindOfClass:[NSString class]]) {
-        NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"please enter a valid url"}];
-        failure(nil, error);
-        return nil;
-    }
-    
-    NSString *newURLString;
-    if ([method isEqualToString:@"GET"]) {
-        if (parameters) {
-            newURLString = [[URLString stringByAppendingString:@"?"] stringByAppendingString:[CNLivePayURLRequestSerialization
-                                                                                              CNQueryStringFromParameters:parameters]];
-        }else{
-            newURLString = URLString;
-        }
-    }else{
-        newURLString = URLString;
-    }
-    
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:newURLString] cachePolicy:self.cachePolicy timeoutInterval:self.timeoutInterval];
-    
-    request.HTTPMethod = method;
-    
-    if([method isEqual:@"POST"]){
-        [request addValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
-        request.HTTPBody =[[CNLivePayURLRequestSerialization CNQueryStringFromParameters:parameters] dataUsingEncoding:NSUTF8StringEncoding];
-    }
-    
-    NSURLSessionDataTask *task = [self dataTaskWithRequest:request success:success failure:failure];
-    
-    return task;
-}
-
-- (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request
-                                      success:(void (^)(NSURLResponse * _Nullable, id _Nullable))success
-                                      failure:(void (^)(NSURLResponse * _Nullable, NSError * _Nullable))failure
-{
-    NSURLSession *session = [NSURLSession sharedSession];
-    NSURLSessionDataTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if (error) {
-                failure(response,error);
-            }else{
-                if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
-                    NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
-                    if (httpResponse.statusCode < 400) {
-                        id jsonObj = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
-                        success(httpResponse,jsonObj);
-                    } else {
-                         NSError *failureError = [NSError errorWithDomain:NSURLErrorDomain code:httpResponse.statusCode userInfo:httpResponse.allHeaderFields];
-                        failure(httpResponse,failureError);
-                    }
-                } else {
-                    failure(response,error);
-                }
-            }
-        });
-    }];
-    
-    return task;
-}
-
-- (NSURL *)formatURLString:(NSString *)url
-{
-    NSURL *urlString = [NSURL URLWithString:[url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
-    return urlString;
-}
-
-@end
-//
-//  CNLiveURLRequestSerialization.h
-//  CNLiveHttpRequestDemo
-//
-//  Created by Android on 16/7/26.
-//  Copyright © 2016年 Android. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface CNLivePayURLRequestSerialization : NSObject
-
-+ (nullable NSString *)CNQueryStringFromParameters:(nullable NSDictionary *)parameters;
-
-@end
-//
-//  CNLiveURLRequestSerialization.m
-//  CNLiveHttpRequestDemo
-//
-//  Created by Android on 16/7/26.
-//  Copyright © 2016年 Android. All rights reserved.
-//
-
-#import "CNLivePayURLRequestSerialization.h"
-
-@interface CNLivePayURLRequestSerialization ()
-
-@property (readwrite, nonatomic, strong) id value;
-
-@property (readwrite, nonatomic, strong) id field;
-
-@end
-
-@implementation CNLivePayURLRequestSerialization
-
-- (id)initWithField:(id)field value:(id)value
-{
-    self = [super init];
-    
-    if (self) {
-        
-        self.field = field;
-        
-        self.value = value;
-    }
-    
-    return self;
-    
-}
-
-#pragma mark -
-
-FOUNDATION_EXPORT NSArray * CNQueryStringPairsFromDictionary(NSDictionary *dictionary);
-FOUNDATION_EXPORT NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value);
-
-+ (NSString *)CNQueryStringFromParameters:(NSDictionary *)parameters
-{
-    NSMutableArray *mutablePairs = [NSMutableArray array];
-    for (CNLivePayURLRequestSerialization *pair in CNQueryStringPairsFromDictionary(parameters)) {
-        [mutablePairs addObject:[pair URLEncodedStringValue]];
-    }
-    return [mutablePairs componentsJoinedByString:@"&"];
-}
-
-NSArray * CNQueryStringPairsFromDictionary(NSDictionary *dictionary)
-{
-    return CNQueryStringPairsFromKeyAndValue(nil, dictionary);
-}
-
-/**
- *  处理上传参数
- */
-NSArray * CNQueryStringPairsFromKeyAndValue(NSString *key, id value)
-{
-    NSMutableArray *mutableQueryStringComponents = [NSMutableArray array];
-    
-    //排序方式
-    NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"description" ascending:YES selector:@selector(compare:)];
-    
-    if ([value isKindOfClass:[NSDictionary class]]) {   //字典
-        NSDictionary *dictionary = 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)];
-            }
-        }
-    }
-    
-    else if ([value isKindOfClass:[NSArray class]]){   //数组
-        NSArray *array = value;
-        for (id nestedValue in array) {
-            [mutableQueryStringComponents addObjectsFromArray:CNQueryStringPairsFromKeyAndValue([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)];
-        }
-    }else{  //其他类型
-        [mutableQueryStringComponents addObject:[[CNLivePayURLRequestSerialization alloc] initWithField:key value:value]];
-    }
-    
-    return mutableQueryStringComponents;
-}
-
-static NSString * CNPercentEscapedStringFromString(NSString *string) {
-    static NSString * const kCNCharactersGeneralDelimitersToEncode = @":#[]@"; // does not include "?" or "/" due to RFC 3986 - Section 3.4
-    static NSString * const kCNCharactersSubDelimitersToEncode = @"!$&'()*+,;=";
-    
-    NSMutableCharacterSet * allowedCharacterSet = [[NSCharacterSet URLQueryAllowedCharacterSet] mutableCopy];
-    [allowedCharacterSet removeCharactersInString:[kCNCharactersGeneralDelimitersToEncode stringByAppendingString:kCNCharactersSubDelimitersToEncode]];
-    
-    
-    static NSUInteger const batchSize = 50;
-    
-    NSUInteger index = 0;
-    NSMutableString *escaped = @"".mutableCopy;
-    
-    while (index < string.length) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wgnu"
-        NSUInteger length = MIN(string.length - index, batchSize);
-#pragma GCC diagnostic pop
-        NSRange range = NSMakeRange(index, length);
-        
-        range = [string rangeOfComposedCharacterSequencesForRange:range];
-        
-        NSString *substring = [string substringWithRange:range];
-        NSString *encoded = [substring stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet];
-        [escaped appendString:encoded];
-        
-        index += range.length;
-    }
-    
-    return escaped;
-}
-
-- (NSString *)URLEncodedStringValue {
-    if (!self.value || [self.value isEqual:[NSNull null]]) {
-        return CNPercentEscapedStringFromString([self.field description]);
-    } else {
-        return [NSString stringWithFormat:@"%@=%@", CNPercentEscapedStringFromString([self.field description]), CNPercentEscapedStringFromString([self.value description])];
-    }
-}
-
-
-@end
+//
+//  CNLivePayArg.h
+//  CNLivePaySDK
+//
+//  Created by cnliveJunBo on 17/5/2.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef enum {
+    CNLivePayTypeWeChatPay = 1,
+    CNLivePayTypeAliPay    = 3,
+    CNLivePayTypeInAppPurchase  = 1001
+} CNLivePayType;
+
+@interface CNLivePayArg : NSObject
+
+/**
+ 视讯云平台获得的第三方平台帐号;
+ */
+@property (nonatomic, copy) NSString * account;
+
+
+/**
+ 支付类型(微信, 支付宝, 内购)
+ */
+@property (nonatomic, assign) CNLivePayType type;
+
+
+/**
+ 唯一业务系统中的订单号
+ */
+@property (nonatomic, copy) NSString *out_trade_no;
+
+
+/**
+ 商品价格,以分为单位,只能是整数;
+ */
+@property (nonatomic, assign) int total_fee;
+
+
+/**
+ 用户付款通知业务系统接收地址;不能有参数;
+ */
+@property (nonatomic, copy) NSString *notify_url;
+
+
+/**
+ 订单信息
+ */
+@property (nonatomic, copy) NSString *body;
+
+
+/**
+ 业务回传参数,传递参数用于给 notify_url 用户付款通知业务系统接收地址拼接参数;
+ 业务回传参数可以使用多个参数,由业务系统自行使用。但有长度限制，所有attach 的总字符长度不能超过300。 例如： attach.phone=13523455432 attach.others=o …
+ */
+@property (nonatomic, strong) NSDictionary *attach;
+
+
+/**
+ 业务系统用户ID
+ */
+@property (nonatomic, copy) NSString *user_id;
+
+@end
+//
+//  CNLivePayResult.h
+//  CNLivePaySDKDemo
+//
+//  Created by cnliveJunBo on 17/5/3.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ *  返回值详解
+ */
+typedef NS_ENUM(NSUInteger, CNLiveBackExplain) {
+    
+    CNLive_CODE_SUCCESS = 2000,                      /**< 成功*/
+    CNLive_CODE_FAIL_CANCEL = 4004,                  /**< 用户取消支付*/
+    CNLive_CODE_ERROR_DEAL = 4201,                   /**< 处理中*/
+    CNLive_CODE_Failure = 4005,                      /**< 失败*/
+    CNLive_CODE_ERROR_CONNECT = 4202,                /**< 网络错误*/
+    CNLive_CODE_ERROR_INSIDE = 4006,                 /**< SDK内部错误*/
+    CNLive_CODE_ERROR_NOTADDSDK = 4007,              /**< 缺少相关SDK*/
+    CNLive_CODE_ERROR_WX_NOT_INSTALL = 4101,         /**< 未安装微信*/
+    CNLive_CODE_ERROR_WX_NOT_SUPPORT_PAY = 4102,     /**< 微信不支持OpenApi*/
+    CNLive_CODE_ERROR_WX_SENTFAIL = 4103,            /**< 微信发送失败*/
+    CNLive_CODE_ERROR_WX_AUTHDENY = 4104,            /**< 微信授权失败*/
+    CNLive_CODE_ChannelWrong = 4003,                 /**< 渠道信息错误*/
+    CNLive_CODE_ERROR_CHARGE_PARAMETER = 4002        /**< 参数信息错误*/
+};
+
+@interface CNLivePayResult : NSObject
+
+/**
+ *  枚举详解
+ */
+@property (assign, nonatomic) CNLiveBackExplain explain;
+/**
+ *  错误描述
+ */
+@property (copy, nonatomic) NSString *backDescription;
+/**
+ *  支付渠道返回的错误码
+ */
+@property (copy, nonatomic) NSString *channelBackCode;
+/**
+ *  支付渠道
+ */
+@property (copy, nonatomic) NSString *channel;
+/**
+ *  支付渠道返回的信息
+ */
+@property (strong, nonatomic) NSString *channelBackInfo;
+
+@end
+//
+//  CNLivePaySDK.h
+//  CNLivePaySDK
+//
+//  Created by cnliveJunBo on 17/5/1.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNLivePayArg.h"
+#import "CNLivePayResult.h"
+
+typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult);
+
+@interface CNLivePaySDK : NSObject
+
+/**
+ 获取SDK当前版本号
+
+ @return 返回SDK当前版本号
+ */
++ (NSString *)getVersion;
+
+
+/**
+ 获取支付核心类单例
+
+ @return 返回支付核心类单例
+ */
++ (instancetype)sharedCNLivePayManager;
+
+
+/**
+ 注册支付SDK
+
+ @param appid  从视讯云平台获取到的appId
+ @param appkey 从视讯云平台获取到的appKey
+ @warning      必须传参数 appid appkey
+ @discussion   您在使用支付SDK所有功能之前，您必须先调用此方法初始化SDK。在App整个生命周期中，您只需要执行一次初始化。
+
+ @return 是否注册成功
+ */
+- (BOOL) registerApp:(NSString *)appid AppKey:(NSString *)appkey;
+
+
+/**
+ 注册微信支付(只有使用了微信支付才会使用到此方法)
+
+ @param wxAppId 微信平台申请到的appId
+
+ @return 是否注册成功
+ */
+- (BOOL) registerWXApiWithWXAppId:(NSString *)wxAppId;
+
+
+/**
+ 支付方法(微信, 支付宝)
+
+ @param payArg          支付所需参数结构体;
+ @param schemeStr       支付宝支付时需要的appScheme,需要与info配置的scheme对应;其他支付不需要可填nil;
+ @param completionBlock 支付结果回调;
+ @discussion            支付宝 客户端, 网页 支付结果回调都在此方法中的block回调中;
+                        微信客户端支付结果回调在此方法中的block回调中;
+ */
+- (void)pay:(CNLivePayArg *)payArg appScheme:(NSString *)schemeStr completion:(CNLCompletionBlock)completionBlock;
+
+
+/**
+ 支付方法(内购)
+ 
+ @param payArg          支付所需参数结构体;
+ @param isDebug         是否是测试环境,上线时务必改成NO;开发环境请填YES,内购支付会到沙盒环境下验证支付结果,验证成功才算支付成功,并且会给用户付款通知业务系统接收地址异步通知时返回参数 sandbox=1 后台可以此作为标记判断加不加商品;真实环境请填NO,内购支付会到真实环境下验证支付结果,验证成功才算支付成功;
+ @param productId       内购时商品的ID,只有内购时用到,其他支付可传nil;
+ @param completionBlock 支付结果回调;
+ @discussion            内购支付结果回调在此方法中的block回调中;
+ */
+- (void)pay:(CNLivePayArg *)payArg isDebug:(BOOL)isDebug productId:(NSString *)productId completion:(CNLCompletionBlock)completionBlock;
+
+
+/**
+ 处理支付渠道通过URL启动App时传递的数据
+ 在 appdelegate
+ iOS 8.0 以前
+ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation;
+ iOS 9.0及以后
+ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options;
+ 中实现此方法,否则支付结果回调无法实现;
+
+ @param url             支付渠道在启动第三方应用时传递过来的URL
+
+ @return                成功返回YES，失败返回NO;
+ */
+- (BOOL)handleOpenURL:(NSURL *)url;
+
+@end
+framework module CNLivePaySDK {
+  umbrella header "CNLivePaySDK.h"
+
+  export *
+  module * { export * }
+}
@@ -7,11 +7,9 @@
 //
 #import "ViewController.h"
-#import "CNLivePaySDK.h"
+#import <CNLivePaySDK/CNLivePaySDK.h>
 #import "PayMoneyTableViewCell.h"
 #import "PayTypeTableViewCell.h"
-#import <CommonCrypto/CommonDigest.h>
-#import "CNLivePayNetworkManager.h"
 #define bSWidth self.view.bounds.size.width
 #define bSheight self.view.bounds.size.height
@@ -50,66 +48,22 @@ static NSString *payTypeCellId = @&quot;payTypeCellId&quot;;
     self.automaticallyAdjustsScrollViewInsets = NO;
 }
-#pragma mark - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#pragma mark 签名机制
-
-- (NSString *)sortParameters:(NSDictionary*)parameters
-{
-    //对所有传入参数按照字段名的 ASCII 码从小到大排序
-    NSArray *keyArr=[parameters allKeys];
-    NSArray *arr = [keyArr sortedArrayUsingSelector:@selector(compare:)];
-    
-    NSMutableString *string1 = [[NSMutableString alloc]init];
-    for (int i=0; i<arr.count; i++) {
-        
-        NSString *parametersString = parameters[[arr objectAtIndex:i]];
-        if (parametersString.length > 0) {
-            [string1 appendString:[NSString stringWithFormat:@"%@=%@&",[arr objectAtIndex:i],parameters[[arr objectAtIndex:i]]]];
-        }
-    }
-    
-    if (string1.length > 0) {
-        [string1 deleteCharactersInRange:NSMakeRange(string1.length-1, 1)];
-    }
-    
-    return string1;
-}
-
-
-#pragma mark SHA1加密 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-- (NSString*)sha1:(NSString *)string
-{
-    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
-    
-    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-    
-    CC_SHA1(data.bytes, (unsigned int)data.length, digest);
-    
-    NSMutableString* output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
-    
-    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
-        [output appendFormat:@"%02x", digest[i]];
-    
-    while ([[output substringToIndex:1] isEqualToString:@"0"]) {
-        output = [[NSMutableString alloc] initWithString:[output substringFromIndex:1]];
-    }
-    
-    return output;
-}
-
 #pragma mark - Pay !!!!!!!!!!!!!!!!!!!!!!
 - (void)pay {
     self.button.selected = YES;
     [_button setUserInteractionEnabled:NO];
+    int total_fee = [_moneyCell.textField.text floatValue] * 100;
+    if (total_fee == 0) {
+        total_fee = 1;
+    }
         if (_payType == 0) {
             CNLivePayArg *arg = [[CNLivePayArg alloc] init];
             arg.account = @"ztsx";
             arg.type = CNLivePayTypeAliPay;
             arg.out_trade_no = [self produceRandomNumber];
-            arg.total_fee = [_moneyCell.textField.text floatValue] * 100;
+            arg.total_fee = total_fee;
             arg.notify_url = @"http://unifypay.cnlive.com/test/notify_url";
             arg.body = @"您购买了一头猪";
             NSDictionary *dict = @{@"a":@"1",@"b":@"2",@"c":@"3"};
@@ -130,7 +84,7 @@ static NSString *payTypeCellId = @&quot;payTypeCellId&quot;;
             arg.account = @"liveshow";
             arg.type = CNLivePayTypeWeChatPay;
             arg.out_trade_no = [self produceRandomNumber];
-            arg.total_fee = [_moneyCell.textField.text floatValue] * 100;
+            arg.total_fee = total_fee;
             arg.notify_url = @"http://unifypay.cnlive.com/test/notify_url";
             arg.body = @"您购买了一头牛";