iOS Team / CNLivePayCostModule · Commits

Commit 7e89f32e695e177161c2d3144c40ecf5c5eb101b

Authored by liushiyu
1 parent 7f714c83

0.0.8

Inline Side-by-side
Showing 3 changed files with 6 additions and 4 deletions
CNLivePayCostModule.podspec
  View file @7e89f32
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLivePayCostModule' 10 s.name = 'CNLivePayCostModule'
11 - s.version = '0.0.7' 11 + s.version = '0.0.8'
12 s.summary = 'A short description of CNLivePayCostModule.' 12 s.summary = 'A short description of CNLivePayCostModule.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.m
  View file @7e89f32
@@ -55,8 +55,10 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @"CN @@ -55,8 +55,10 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @"CN
55 PassWord:(NSString *)password 55 PassWord:(NSString *)password
56 CompleterBlcok:(void(^)(NSInteger statue))completerBlock 56 CompleterBlcok:(void(^)(NSInteger statue))completerBlock
57 { 57 {
58 - NSString * notifyUrls = threeType == CNLivePayCostThreePayTypeTicke ? CNJSFYNotifyUrl: (type == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : type == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl); 58 + NSString * notifyUrls = threeType == CNLivePayCostThreePayTypeTicke ? CNJSFYNotifyUrl: cn_API_Host(@"/Daren/pay/newNotifyPay.action");
59 59
  60 +// (type == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : type == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
  61 +
60 //上海电商 & 电商 需要特殊的回调地址 62 //上海电商 & 电商 需要特殊的回调地址
61 if (!CNLiveStringIsEmpty(notify_url) 63 if (!CNLiveStringIsEmpty(notify_url)
62 && (threeType == CNLivePayCostThreePayTypeSHSop || threeType == CNLivePayCostThreePayTypeShop)) notifyUrls = notify_url; 64 && (threeType == CNLivePayCostThreePayTypeSHSop || threeType == CNLivePayCostThreePayTypeShop)) notifyUrls = notify_url;
@@ -67,7 +69,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @"CN @@ -67,7 +69,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @"CN
67 WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object]; 69 WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
68 launchMiniProgramReq.userName = @"gh_061b347b32c1"; //拉起的小程序的username 70 launchMiniProgramReq.userName = @"gh_061b347b32c1"; //拉起的小程序的username
69 launchMiniProgramReq.path = path; 71 launchMiniProgramReq.path = path;
70 - launchMiniProgramReq.miniProgramType = WXMiniProgramTypePreview; 72 + launchMiniProgramReq.miniProgramType = [CNLiveEnvironmentManager manager].isTestEnvironment?WXMiniProgramTypePreview:WXMiniProgramTypeRelease;
71 [WXApi sendReq:launchMiniProgramReq completion:^(BOOL success) { 73 [WXApi sendReq:launchMiniProgramReq completion:^(BOOL success) {
72 74
73 }]; 75 }];
Example/CNLivePayCostModule/main.m
  View file @7e89f32
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 int main(int argc, char * argv[]) 12 int main(int argc, char * argv[])
13 { 13 {
14 @autoreleasepool { 14 @autoreleasepool {
15 - [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore]; 15 + [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveProductionAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
16 return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class])); 16 return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
17 } 17 }
18 } 18 }