Skip to content

Commit

Permalink
modify
Browse files Browse the repository at this point in the history
  • Loading branch information
Scorpion117git committed May 25, 2021
1 parent 6805195 commit 21693fc
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 5 deletions.
48 changes: 48 additions & 0 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
PODS:
- AlipaySDK-iOS (15.7.9)
- MBProgressHUD (1.2.0)
- RZPayManager (0.1.6):
- AlipaySDK-iOS (~> 15.7.4)
- MBProgressHUD (~> 1.2.0)
- RZPayManager/Category (= 0.1.6)
- RZPayManager/Core (= 0.1.6)
- RZPayManager/UPPay (= 0.1.6)
- WechatOpenSDK (~> 1.8.7.1)
- RZPayManager/Category (0.1.6):
- AlipaySDK-iOS (~> 15.7.4)
- MBProgressHUD (~> 1.2.0)
- WechatOpenSDK (~> 1.8.7.1)
- RZPayManager/Core (0.1.6):
- AlipaySDK-iOS (~> 15.7.4)
- MBProgressHUD (~> 1.2.0)
- RZPayManager/Category
- RZPayManager/UPPay
- WechatOpenSDK (~> 1.8.7.1)
- RZPayManager/UPPay (0.1.6):
- AlipaySDK-iOS (~> 15.7.4)
- MBProgressHUD (~> 1.2.0)
- WechatOpenSDK (~> 1.8.7.1)
- WechatOpenSDK (1.8.7.1)

DEPENDENCIES:
- RZPayManager (from `../`)

SPEC REPOS:
trunk:
- AlipaySDK-iOS
- MBProgressHUD
- WechatOpenSDK

EXTERNAL SOURCES:
RZPayManager:
:path: "../"

SPEC CHECKSUMS:
AlipaySDK-iOS: 94ff4c0e17c5e7d126b8207596d5033006534c25
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
RZPayManager: e359fccaef6f786a0541e1a8dc08e48685fc155d
WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44

PODFILE CHECKSUM: 51fd787c71ce5265ee8cc7ee59538ed1d53830d7

COCOAPODS: 1.10.1
5 changes: 5 additions & 0 deletions Example/RZPayManager.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = "[email protected]";
TargetAttributes = {
6003F589195388D20070C39A = {
DevelopmentTeam = R7THQ5G7MK;
};
6003F5AD195388D20070C39A = {
TestTargetID = 6003F589195388D20070C39A;
};
Expand Down Expand Up @@ -513,6 +516,7 @@
baseConfigurationReference = 159D3D50DC6AE82B7D1153F8 /* Pods-RZPayManager_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = R7THQ5G7MK;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RZPayManager/RZPayManager-Prefix.pch";
INFOPLIST_FILE = "RZPayManager/RZPayManager-Info.plist";
Expand All @@ -529,6 +533,7 @@
baseConfigurationReference = 01B27BDFCC12B246939F0D69 /* Pods-RZPayManager_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = R7THQ5G7MK;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RZPayManager/RZPayManager-Prefix.pch";
INFOPLIST_FILE = "RZPayManager/RZPayManager-Info.plist";
Expand Down
2 changes: 1 addition & 1 deletion RZPayManager.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'RZPayManager'
s.version = '0.1.7'
s.version = '0.1.8'
s.summary = 'RZPayManager 是整合了微信,支付宝等第三方支付的支付组件'

s.description = <<-DESC
Expand Down
10 changes: 6 additions & 4 deletions RZPayManager/Classes/Core/RZPayManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,18 @@ - (void)startPay {
if ([result isKindOfClass:[NSString class]]) { //如果是字符串的情况 银联取TN,支付宝取url
if (self.payType == PayTypeForAlipay ||
self.payType == PayTypeForUPPay) {
self->prepareData = [NSString stringWithFormat:@"%@",data];
self->prepareData = [NSString stringWithFormat:@"%@",result];
}else if (self.payType == PayTypeForWXPay){ //微信的话,需要转成字典
NSString *jsonStr = [NSString stringWithFormat:@"%@",data];
NSString *jsonStr = [NSString stringWithFormat:@"%@",result];
self->prepareData = [jsonStr jsonValueDecoded];
}
}else if ([data isKindOfClass:[NSDictionary class]]) {
self->prepareData = (NSDictionary *)data;
}else if ([result isKindOfClass:[NSDictionary class]]) {
self->prepareData = (NSDictionary *)result;
}

[self beginToPay];
}else {
[self.fromVC showHint:@"获取预支付信息失败"];
}
}];

Expand Down

0 comments on commit 21693fc

Please sign in to comment.