iOS Team / CNLivePaySDKDemo · Commits

Commit 559eaf75169f94fee9f513e5d0cdd6ce775a2507

Authored by 王军波
1 parent bae4a781

更新

Inline Side-by-side
Showing 7 changed files with 29 additions and 8 deletions
CNLivePaySDKDemo/CNLivePaySDK.framework/CNLivePaySDK renamed to CNLivePaySDK.framework/CNLivePaySDK
View file @559eaf7
No preview for this file type
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePayArg.h renamed to CNLivePaySDK.framework/Headers/CNLivePayArg.h
  View file @559eaf7
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePayResult.h renamed to CNLivePaySDK.framework/Headers/CNLivePayResult.h
  View file @559eaf7
CNLivePaySDKDemo/CNLivePaySDK.framework/Headers/CNLivePaySDK.h renamed to CNLivePaySDK.framework/Headers/CNLivePaySDK.h
  View file @559eaf7
@@ -15,6 +15,11 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult); @@ -15,6 +15,11 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult);
15 @interface CNLivePaySDK : NSObject 15 @interface CNLivePaySDK : NSObject
16 16
17 /** 17 /**
  18 + 是否测试环境
  19 + */
  20 +@property (nonatomic, readonly, assign) BOOL isTestEnvironment;
  21 +
  22 +/**
18 获取SDK当前版本号 23 获取SDK当前版本号
19 24
20 @return 返回SDK当前版本号 25 @return 返回SDK当前版本号
@@ -31,7 +36,7 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult); @@ -31,7 +36,7 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult);
31 36
32 37
33 /** 38 /**
34 - 注册支付SDK 39 + 注册支付SDK(所以支付都必须注册,默认上线环境)
35 40
36 @param appid 从视讯云平台获取到的appId 41 @param appid 从视讯云平台获取到的appId
37 @param appkey 从视讯云平台获取到的appKey 42 @param appkey 从视讯云平台获取到的appKey
@@ -40,17 +45,31 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult); @@ -40,17 +45,31 @@ typedef void(^CNLCompletionBlock)(CNLivePayResult *cnlivePayResult);
40 45
41 @return 是否注册成功 46 @return 是否注册成功
42 */ 47 */
43 -- (BOOL) registerApp:(NSString *)appid AppKey:(NSString *)appkey; 48 +- (BOOL)registerApp:(NSString *)appid AppKey:(NSString *)appkey;
  49 +
  50 +
  51 +/**
  52 + 注册支付SDK(所以支付都必须注册,同上,区别:可选择测试环境还是上线环境)
  53 +
  54 + @param appid 从视讯云平台获取到的appId
  55 + @param appkey 从视讯云平台获取到的appKey
  56 + @param isTestEnvironment 是否是测试环境,YES为测试环境,NO为上线环境;
  57 + @warning 必须传参数 appid appkey
  58 + @discussion 您在使用支付SDK所有功能之前，您必须先调用此方法初始化SDK。在App整个生命周期中，您只需要执行一次初始化。
  59 +
  60 + @return 是否注册成功
  61 + */
  62 +- (BOOL)registerApp:(NSString *)appid AppKey:(NSString *)appkey isTestEnvironment:(BOOL)isTestEnvironment;
44 63
45 64
46 /** 65 /**
47 - 注册微信支付(只有使用了微信支付才会使用到此方法) 66 + 注册微信支付(只有使用了微信支付才会使用到此方法,上方的注册方法也得调用)
48 67
49 @param wxAppId 微信平台申请到的appId 68 @param wxAppId 微信平台申请到的appId
50 69
51 @return 是否注册成功 70 @return 是否注册成功
52 */ 71 */
53 -- (BOOL) registerWXApiWithWXAppId:(NSString *)wxAppId; 72 +- (BOOL)registerWXApiWithWXAppId:(NSString *)wxAppId;
54 73
55 74
56 /** 75 /**
CNLivePaySDKDemo/CNLivePaySDK.framework/Info.plist renamed to CNLivePaySDK.framework/Info.plist
View file @559eaf7
No preview for this file type
CNLivePaySDKDemo/CNLivePaySDK.framework/Modules/module.modulemap renamed to CNLivePaySDK.framework/Modules/module.modulemap
  View file @559eaf7
CNLivePaySDKDemo.xcodeproj/project.pbxproj
  View file @559eaf7
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 D23630071EB8725500823BF5 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D23630061EB8725500823BF5 /* libsqlite3.0.tbd */; }; 24 D23630071EB8725500823BF5 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D23630061EB8725500823BF5 /* libsqlite3.0.tbd */; };
25 D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D23630081EB8817400823BF5 /* libWeChatSDK.a */; }; 25 D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D23630081EB8817400823BF5 /* libWeChatSDK.a */; };
26 D236300E1EB8817400823BF5 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = D23630091EB8817400823BF5 /* README.txt */; }; 26 D236300E1EB8817400823BF5 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = D23630091EB8817400823BF5 /* README.txt */; };
  27 + D23BBDC91EF92384002FE0B8 /* CNLivePaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D23BBDC81EF92384002FE0B8 /* CNLivePaySDK.framework */; };
27 D265E5321ECAFA88006AE8B6 /* PayTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */; }; 28 D265E5321ECAFA88006AE8B6 /* PayTypeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */; };
28 - D2868FE01EE8F6260037DECF /* CNLivePaySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */; };  
29 D28B45AE1EB1CC1000ED24B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45AD1EB1CC1000ED24B5 /* main.m */; }; 29 D28B45AE1EB1CC1000ED24B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45AD1EB1CC1000ED24B5 /* main.m */; };
30 D28B45B11EB1CC1000ED24B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B01EB1CC1000ED24B5 /* AppDelegate.m */; }; 30 D28B45B11EB1CC1000ED24B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B01EB1CC1000ED24B5 /* AppDelegate.m */; };
31 D28B45B41EB1CC1000ED24B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B31EB1CC1000ED24B5 /* ViewController.m */; }; 31 D28B45B41EB1CC1000ED24B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B45B31EB1CC1000ED24B5 /* ViewController.m */; };
@@ -56,9 +56,9 @@ @@ -56,9 +56,9 @@
56 D236300A1EB8817400823BF5 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; }; 56 D236300A1EB8817400823BF5 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
57 D236300B1EB8817400823BF5 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; }; 57 D236300B1EB8817400823BF5 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; };
58 D236300C1EB8817400823BF5 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; }; 58 D236300C1EB8817400823BF5 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; };
  59 + D23BBDC81EF92384002FE0B8 /* CNLivePaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePaySDK.framework; sourceTree = "<group>"; };
59 D265E5301ECAFA88006AE8B6 /* PayTypeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayTypeTableViewCell.h; sourceTree = "<group>"; }; 60 D265E5301ECAFA88006AE8B6 /* PayTypeTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayTypeTableViewCell.h; sourceTree = "<group>"; };
60 D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayTypeTableViewCell.m; sourceTree = "<group>"; }; 61 D265E5311ECAFA88006AE8B6 /* PayTypeTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayTypeTableViewCell.m; sourceTree = "<group>"; };
61 - D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePaySDK.framework; sourceTree = "<group>"; };  
62 D28B45A91EB1CC1000ED24B5 /* CNLivePaySDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLivePaySDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 62 D28B45A91EB1CC1000ED24B5 /* CNLivePaySDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLivePaySDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
63 D28B45AD1EB1CC1000ED24B5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 63 D28B45AD1EB1CC1000ED24B5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
64 D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 64 D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 isa = PBXFrameworksBuildPhase; 76 isa = PBXFrameworksBuildPhase;
77 buildActionMask = 2147483647; 77 buildActionMask = 2147483647;
78 files = ( 78 files = (
79 - D2868FE01EE8F6260037DECF /* CNLivePaySDK.framework in Frameworks */, 79 + D23BBDC91EF92384002FE0B8 /* CNLivePaySDK.framework in Frameworks */,
80 D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */, 80 D236300D1EB8817400823BF5 /* libWeChatSDK.a in Frameworks */,
81 D23630071EB8725500823BF5 /* libsqlite3.0.tbd in Frameworks */, 81 D23630071EB8725500823BF5 /* libsqlite3.0.tbd in Frameworks */,
82 D2362FF31EB8280400823BF5 /* CoreMotion.framework in Frameworks */, 82 D2362FF31EB8280400823BF5 /* CoreMotion.framework in Frameworks */,
@@ -140,6 +140,7 @@ @@ -140,6 +140,7 @@
140 D28B45A01EB1CC1000ED24B5 = { 140 D28B45A01EB1CC1000ED24B5 = {
141 isa = PBXGroup; 141 isa = PBXGroup;
142 children = ( 142 children = (
  143 + D23BBDC81EF92384002FE0B8 /* CNLivePaySDK.framework */,
143 D28B45AB1EB1CC1000ED24B5 /* CNLivePaySDKDemo */, 144 D28B45AB1EB1CC1000ED24B5 /* CNLivePaySDKDemo */,
144 D28B45AA1EB1CC1000ED24B5 /* Products */, 145 D28B45AA1EB1CC1000ED24B5 /* Products */,
145 D2362FDD1EB827B500823BF5 /* Frameworks */, 146 D2362FDD1EB827B500823BF5 /* Frameworks */,
@@ -157,7 +158,6 @@ @@ -157,7 +158,6 @@
157 D28B45AB1EB1CC1000ED24B5 /* CNLivePaySDKDemo */ = { 158 D28B45AB1EB1CC1000ED24B5 /* CNLivePaySDKDemo */ = {
158 isa = PBXGroup; 159 isa = PBXGroup;
159 children = ( 160 children = (
160 - D2868FDF1EE8F6260037DECF /* CNLivePaySDK.framework */,  
161 D2362FF91EB8516500823BF5 /* Alipay */, 161 D2362FF91EB8516500823BF5 /* Alipay */,
162 D2362FFE1EB85BB800823BF5 /* WXApi */, 162 D2362FFE1EB85BB800823BF5 /* WXApi */,
163 D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */, 163 D28B45AF1EB1CC1000ED24B5 /* AppDelegate.h */,
@@ -388,6 +388,7 @@ @@ -388,6 +388,7 @@
388 "$(inherited)", 388 "$(inherited)",
389 "$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay", 389 "$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay",
390 "$(PROJECT_DIR)/CNLivePaySDKDemo", 390 "$(PROJECT_DIR)/CNLivePaySDKDemo",
  391 + "$(PROJECT_DIR)",
391 ); 392 );
392 INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist; 393 INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist;
393 IPHONEOS_DEPLOYMENT_TARGET = 8.0; 394 IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -412,6 +413,7 @@ @@ -412,6 +413,7 @@
412 "$(inherited)", 413 "$(inherited)",
413 "$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay", 414 "$(PROJECT_DIR)/CNLivePaySDKDemo/Alipay",
414 "$(PROJECT_DIR)/CNLivePaySDKDemo", 415 "$(PROJECT_DIR)/CNLivePaySDKDemo",
  416 + "$(PROJECT_DIR)",
415 ); 417 );
416 INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist; 418 INFOPLIST_FILE = CNLivePaySDKDemo/Info.plist;
417 IPHONEOS_DEPLOYMENT_TARGET = 8.0; 419 IPHONEOS_DEPLOYMENT_TARGET = 8.0;