diff --git a/Core SDK/Headers/Constants.h b/Core SDK/Headers/Constants.h index 8d0bf9c..305ae97 100644 --- a/Core SDK/Headers/Constants.h +++ b/Core SDK/Headers/Constants.h @@ -29,7 +29,8 @@ typedef NS_ENUM(NSUInteger, PaymentType) { typedef NS_ENUM(NSUInteger, PaymentResponseCode) { SUCCESSFUL = 0, FAILED = 1, - CANCEL = 2 + CANCEL = 2, + MERCHANT_PROCESSING = 3 }; diff --git a/Core SDK/Headers/PWCoreSDKResponse.h b/Core SDK/Headers/PWCoreSDKResponse.h index ea20a17..e2ed923 100644 --- a/Core SDK/Headers/PWCoreSDKResponse.h +++ b/Core SDK/Headers/PWCoreSDKResponse.h @@ -18,13 +18,13 @@ extern NSString * _Nonnull const PAYMENT_CANCELED; @property (nonatomic, assign) PaymentResponseCode responseCode; @property (nonatomic, assign) PaymentType paymentType; -@property (nonatomic, strong) NSString * _Nullable paymentName; -@property (nonatomic, strong) NSString * _Nullable paymentAmount; -@property (nonatomic, strong) NSString * _Nullable paymentCurrency; -@property (nonatomic, strong) NSString * _Nullable userID; +@property (nonatomic, strong) NSString * _Nonnull paymentName; +@property (nonatomic, strong) NSString * _Nonnull paymentAmount; +@property (nonatomic, strong) NSString * _Nonnull paymentCurrency; +@property (nonatomic, strong) NSString * _Nonnull userID; @property (nonatomic, strong) NSString * _Nonnull message; -@property (nonatomic, strong) NSString * _Nullable productID; -@property (nonatomic, strong) NSString * _Nullable userEmail; +@property (nonatomic, strong) NSString * _Nonnull productID; @property (nonatomic, strong) BrickToken * _Nullable token; +@property (nonatomic, strong) NSDictionary * _Nullable others; @end diff --git a/PWWechatpayPlugin.podspec b/PWWechatpayPlugin.podspec index 30fe5a7..930ff14 100644 --- a/PWWechatpayPlugin.podspec +++ b/PWWechatpayPlugin.podspec @@ -23,6 +23,7 @@ Pod::Spec.new do |s| s.dependency 'PWCoreSDK', '~> 2.0.0' s.subspec 'Wechatpay' do |sp| + sp.source_files = "Plugins/PWWechatpayPlugin/Wechatpay/*.{h,m}" sp.vendored_libraries = "Plugins/PWWechatpayPlugin/Wechatpay/libWeChatSDK.a" sp.libraries = 'z', 'c++', 'sqlite3.0' sp.frameworks = 'UIKit', 'SystemConfiguration', 'Foundation', 'CoreTelephony', 'Security'