iOS Team / DSCnliveShopSDK · Commits

Commit 6e88db0bec6dc60bd355ad71b697908c4ef4a0a5

Authored by 毕珂
1 parent 5bb598a0

0.3.8.011 支付模块移出

Inline Side-by-side
Showing 24 changed files with 5 additions and 278 deletions
DSCnliveShopSDK.podspec
  View file @6e88db0
1 1  
2 2 Pod::Spec.new do |s|
3 3 s.name = 'DSCnliveShopSDK'
4   - s.version = '0.3.8.010'
  4 + s.version = '0.3.8.011'
5 5 s.summary = 'cnlive电商SDK'
6 6 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
7 7 s.license = { :type => 'MIT', :file => 'LICENSE' }
... ... @@ -33,8 +33,6 @@ Pod::Spec.new do |s|
33 33 s.dependency 'SDAutoLayout', '2.2.1'
34 34  
35 35 s.dependency 'CNLiveRequestBastKit'
36   - s.dependency 'CNLiveSDKs/CNLiveEncryptSDK'
37   - s.dependency 'CNLiveSDKs/CNLivePaySDK'
38 36  
39 37 s.dependency 'DSBaseModuleF', '>=0.0.0', '<1.0.0'
40 38 s.dependency 'DSExtensionModuleF', '>=0.0.0', '<1.0.0'
... ... @@ -42,5 +40,7 @@ Pod::Spec.new do |s|
42 40 s.dependency 'DSToolsModuleF', '>=0.0.0', '<1.0.0'
43 41 s.dependency 'DSCnliveShopSDKToolsModuleF', '>=0.0.0', '<1.0.0'
44 42 s.dependency 'YBImageBrowser_DSCnliveShop'
45   -
  43 +
  44 + s.dependency 'DSPayModuleF', '>=0.0.0', '<1.0.0'
  45 +
46 46 end
... ...
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSCnliveShopSDK
View file @6e88db0
No preview for this file type
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_alipay@2x.png deleted 100644 → 0
View file @5bb598a

1.62 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_alipay@3x.png deleted 100644 → 0
View file @5bb598a

2.38 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_close@2x.png deleted 100644 → 0
View file @5bb598a

970 Bytes
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_close@3x.png deleted 100644 → 0
View file @5bb598a

2.03 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_select@2x.png deleted 100644 → 0
View file @5bb598a

888 Bytes
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_select@3x.png deleted 100644 → 0
View file @5bb598a

1.28 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_unionpay@2x.png deleted 100644 → 0
View file @5bb598a

2.03 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_unionpay@3x.png deleted 100644 → 0
View file @5bb598a

3.23 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_wallet@2x.png deleted 100644 → 0
View file @5bb598a

2.96 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_wallet@3x.png deleted 100644 → 0
View file @5bb598a

4.99 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_wang++@2x.png deleted 100755 → 0
View file @5bb598a

2.44 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_wang++@3x.png deleted 100755 → 0
View file @5bb598a

4.67 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_weChat@2x.png deleted 100644 → 0
View file @5bb598a

1.65 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/DSShopResource.bundle/DS_payType_weChat@3x.png deleted 100644 → 0
View file @5bb598a

2.49 KB
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/BKShopPayResultViewController.h
  View file @6e88db0
... ... @@ -7,9 +7,8 @@
7 7 //
8 8  
9 9 #import <DSCnliveShopSDKToolsModule/DSCnliveShopSDKToolsModule.h>
10   -#import "DSPayOrderInfoModel.h"
11 10 #import "DSAddressModel.h"
12   -#import "DSSelectPayTypeView.h"
  11 +#import <DSPayModule/DSSelectPayTypeView.h>
13 12  
14 13 @interface BKShopPayResultViewController : DSBaseViewController
15 14  
... ...
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK-umbrella.h
  View file @6e88db0
... ... @@ -79,11 +79,6 @@
79 79 #import "DSESelectCompanyViewController.h"
80 80 #import "DSESelectCompanyModel.h"
81 81 #import "DSESelectCompanyTableViewCell.h"
82   -#import "DSPayRequest.h"
83   -#import "DSPayOrderInfoModel.h"
84   -#import "DSSelectPayTypeTableViewCell.h"
85   -#import "DSSelectPayTypeView.h"
86   -#import "DSSPTInputPasswordView.h"
87 82 #import "DSRefundRequest.h"
88 83 #import "DSRefundApplyViewController.h"
89 84 #import "DSRefundApplyModel.h"
... ...
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKConstantP.h
  View file @6e88db0
... ... @@ -15,7 +15,6 @@ UIKIT_EXTERN NSString * const kDSSaveShopSearchHistroyData;//储存商城历å²æ
15 15  
16 16 #pragma mark - 通知
17 17 #pragma mark - 商城订å•
18   -UIKIT_EXTERN NSString * const kDSSuccessPayOrderNotification;//支付订å•æˆåŠŸé€šçŸ¥ object为订å•id
19 18 UIKIT_EXTERN NSString * const kDSDeleteOrderNotification;//删除订å•é€šçŸ¥
20 19 UIKIT_EXTERN NSString * const kDSFinishOrderNotification;//完æˆè®¢å•é€šçŸ¥
21 20 UIKIT_EXTERN NSString * const kDSCancelOrderNotification;//å–消订å•é€šçŸ¥ object为订å•id
... ...
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSPayOrderInfoModel.h deleted 100644 → 0
  View file @5bb598a
1   -//
2   -// DSPayOrderInfoModel.h
3   -// DSCnliveShopSDK
4   -//
5   -// Created by 毕珂 on 2018/11/3.
6   -//
7   -
8   -#import <Foundation/Foundation.h>
9   -
10   -NS_ASSUME_NONNULL_BEGIN
11   -
12   -@interface DSPayOrderInfoModel : NSObject
13   -
14   -/**
15   - 订单id
16   - */
17   -@property (nonatomic,copy) NSString * id;
18   -/**
19   - 订单号
20   - */
21   -@property (nonatomic,copy) NSString * orderId;
22   -/**
23   - 订单信息
24   - */
25   -@property (nonatomic,copy) NSString * body;
26   -/**
27   - 总价(分)
28   - */
29   -@property (nonatomic,copy) NSString * totalMoney;
30   -/**
31   - 回调地址
32   - */
33   -@property (nonatomic,copy) NSString * notify_url;
34   -/**
35   - 用户id
36   - */
37   -@property (nonatomic,copy) NSString * user_id;
38   -/**
39   - 收款人id
40   - */
41   -@property (nonatomic,copy) NSString * toId;
42   -/**
43   - 收款人类型(1个人 2群组 3达人)
44   - */
45   -@property (nonatomic,copy) NSString * toType;
46   -/**
47   - 支付人类型(1个人 2群组 3达人)
48   - */
49   -@property (nonatomic,copy) NSString * fromType;
50   -/**
51   - 支付类型 foods_order餐厅订单 mall_order商城订单
52   - */
53   -@property (nonatomic,copy) NSString * sourceType;
54   -
55   -
56   -@end
57   -
58   -NS_ASSUME_NONNULL_END
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSPayRequest.h deleted 100644 → 0
  View file @5bb598a
1   -//
2   -// DSPayRequest.h
3   -// DSCnliveShopSDK
4   -//
5   -// Created by zhaolin on 2019/2/20.
6   -//
7   -
8   -#import <Foundation/Foundation.h>
9   -#import "DSPayOrderInfoModel.h"
10   -
11   -NS_ASSUME_NONNULL_BEGIN
12   -
13   -@interface DSPayRequest : NSObject
14   -
15   -/*
16   - 支付订单信息
17   - 参数 orderId 订单号
18   - */
19   -+(void)postOrderPayWithParams:(NSDictionary*)params result:(void (^)(DSPayOrderInfoModel * model, NSString * errorMessage))result;
20   -
21   -/**
22   - 0元支付
23   -
24   - @param orderId 订单id
25   - @param result 结果
26   - */
27   -+(void)postZeroPayWithOrderId:(NSString*)orderId result:(void (^)(NSString * errorMessage))result;
28   -
29   -/**
30   - 请求订单是否支付成功
31   -
32   - @param orderId 订单号
33   - @param result 结果
34   - */
35   -+(void)postIsOrderPayWithOrderId:(NSString*)orderId result:(void (^)(BOOL isSuccess, NSString * score, NSString * desc))result;
36   -
37   -/**
38   - 检测是否有支付密码
39   -
40   - @param userId 用户id
41   - @param result 结果 balance(已经转化成分)
42   - */
43   -+(void)postIsPayPasswordWithUserId:(NSString*)userId result:(void (^)(NSString * balance, BOOL isHavePassword, NSString * errorMessage))result;
44   -
45   -/**
46   - 请求网家家支付公钥和随机参数
47   -
48   - @param result 结果
49   - */
50   -+(void)postPasswordIsExistingWithUserId:(NSString*)userId result:(void (^)(NSString * publicKey, NSString * randomAesKey, NSString * errorMessage))result;
51   -
52   -/**
53   - 验证订单
54   -
55   - @param sourceId 订单id
56   - @param sourceType 订单格式
57   - @param fromType 支付人类型
58   - @param fromId 支付人id
59   - @param toType 收款人类型
60   - @param toId 收款人id
61   - @param price 价格
62   - @param publicKey 公钥
63   - @param randomAesKey 随机参数
64   - @param result 结果
65   - */
66   -+(void)postUnifiedOrderWithSourceId:(NSString*)sourceId sourceType:(NSString*)sourceType fromType:(NSString*)fromType fromId:(NSString*)fromId toType:(NSString*)toType toId:(NSString*)toId price:(NSString*)price publicKey:(NSString*)publicKey randomAesKey:(NSString*)randomAesKey result:(void (^)(NSString * preId, NSString * errorMessage))result;
67   -
68   -/**
69   - 验证支付
70   -
71   - @param preId 预订单id
72   - @param userId 用户id
73   - @param publicKey 公钥
74   - @param randomAesKey 随机数
75   - @param password 密码
76   - @param result 结果
77   - */
78   -+(void)postUnifiedPayWithPreId:(NSString*)preId userId:(NSString*)userId publicKey:(NSString*)publicKey randomAesKey:(NSString*)randomAesKey password:(NSString*)password result:(void (^)(BOOL isPasswordMistake, NSString * errorMessage))result;
79   -
80   -@end
81   -
82   -NS_ASSUME_NONNULL_END
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSSPTInputPasswordView.h deleted 100644 → 0
  View file @5bb598a
1   -//
2   -// DSSPTInputPasswordView.h
3   -// DSCnliveShopSDK
4   -//
5   -// Created by zhaolin on 2019/2/16.
6   -//
7   -
8   -#import <UIKit/UIKit.h>
9   -
10   -NS_ASSUME_NONNULL_BEGIN
11   -
12   -@interface DSSPTInputPasswordView : UIView
13   -// <UIKeyInput> 废弃这种写法是因为三方键盘
14   -
15   -/**
16   - 是否可以输入
17   - */
18   -@property (nonatomic,assign) BOOL enble;
19   -/**
20   - 点击关闭回调
21   - */
22   -@property (nonatomic,copy) void (^clickCloseCallBack)(void);
23   -/**
24   - 点击忘记密码回调
25   - */
26   -@property (nonatomic,copy) void (^clickForgerPasswordCallBack)(void);
27   -/**
28   - 成功输入6位密码回调
29   - */
30   -@property (nonatomic,copy) void (^finishWriteCallBack)(NSString * password);
31   -
32   -/**
33   - 清空输入
34   - */
35   --(void)clear;
36   -
37   -#pragma mark - 第一响应
38   -
39   --(void)becomeFirstResponder;
40   --(void)resignFirstResponder;
41   -
42   -@end
43   -
44   -NS_ASSUME_NONNULL_END
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSSelectPayTypeTableViewCell.h deleted 100644 → 0
  View file @5bb598a
1   -//
2   -// DSSelectPayTypeTableViewCell.h
3   -// DSCnliveShopSDK
4   -//
5   -// Created by zhaolin on 2018/11/5.
6   -//
7   -
8   -#import <UIKit/UIKit.h>
9   -
10   -
11   -NS_ASSUME_NONNULL_BEGIN
12   -
13   -@interface DSSelectPayTypeTableViewCell : UITableViewCell
14   -
15   -@property (nonatomic,strong) DSImageView * topLine;
16   -@property (nonatomic,strong) DSImageView * bottomLine;
17   -
18   -@property (nonatomic,strong) DSImageView * iconImageView;
19   -@property (nonatomic,strong) UILabel * titleLab;
20   -@property (nonatomic,strong) DSImageView * selectImageView;
21   -
22   -@end
23   -
24   -NS_ASSUME_NONNULL_END
DSCnliveShopSDK/Frameworks/DSCnliveShopSDK.framework/Headers/DSSelectPayTypeView.h deleted 100644 → 0
  View file @5bb598a
1   -//
2   -// DSSelectPayTypeView.h
3   -// DSCnliveShopSDK
4   -//
5   -// Created by zhaolin on 2018/11/5.
6   -//
7   -
8   -#import <UIKit/UIKit.h>
9   -
10   -#import "DSPayRequest.h"
11   -
12   -typedef NS_ENUM(NSUInteger, DSSelectPayTypeFrom) {
13   - DSSelectPayTypeFromNormal = 0, //来自普通订单支付
14   - DSSelectPayTypeFromGift, //来自礼物订单特殊支付
15   -};
16   -
17   -typedef NS_ENUM(NSUInteger, DSPayType) {//支付类型
18   - DSPayTypeAlipay = 0, //支付宝
19   - DSPayTypeWeChat, //微信
20   - DSPayTypeUnionpay, //银联
21   - DSPayTypeWallet, //网家家钱包
22   -};
23   -
24   -typedef NS_ENUM(NSUInteger, DSPayResult) {//支付状态
25   - DSPayResultSuccess = 0, //成功
26   - DSPayResultFailure, //失败
27   - DSPayResultCancel, //取消支付
28   -};
29   -
30   -NS_ASSUME_NONNULL_BEGIN
31   -
32   -@interface DSSelectPayTypeView : UIView
33   -
34   -#pragma mark - 初始化
35   -
36   -/**
37   - 初始化界面
38   -
39   - @param orderNumber 订单号
40   - @return 选取支付界面
41   - */
42   --(instancetype)initWithOrderNumber:(NSString*)orderNumber;
43   -
44   -#pragma mark - 属性
45   -
46   -/// 来自哪的订单支付
47   -@property (nonatomic,assign) DSSelectPayTypeFrom from;
48   -
49   -#pragma mark - 回调
50   -
51   -/**
52   - 完成支付 成功通知(kDSSuccessPayOrderNotification)在此回调之后
53   - */
54   -@property (nonatomic,copy) void (^finishPayCallBack)(DSPayOrderInfoModel * orderInfoModel, DSPayType payType, DSPayResult payResult);
55   -
56   -@end
57   -
58   -NS_ASSUME_NONNULL_END