iOS Team / DSCnliveShopSDK · Commits

Commit 49c8a9ff9b8c8dbeb2fc543f0fcb768a8087a4ed

Authored by 毕珂
1 parent 11113e8d

修改刷新方法 暴露礼物列表 修改礼物流程

Inline Side-by-side
Showing 25 changed files with 36 additions and 4 deletions
DSCnliveShopSDK.podspec
  View file @49c8a9f
1 1
2 Pod::Spec.new do |s| 2 Pod::Spec.new do |s|
3 s.name = 'DSCnliveShopSDK' 3 s.name = 'DSCnliveShopSDK'
4 - s.version = '0.3.4.005' 4 + s.version = '0.3.4.006'
5 s.summary = 'cnlive电商SDK' 5 s.summary = 'cnlive电商SDK'
6 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK' 6 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/DSCnliveShopSDK'
7 s.license = { :type => 'MIT', :file => 'LICENSE' } 7 s.license = { :type => 'MIT', :file => 'LICENSE' }
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSCnliveShopSDK
View file @49c8a9f
No preview for this file type
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_0.png 0 → 100644
View file @49c8a9f

573 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_1.png 0 → 100644
View file @49c8a9f

622 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_2.png 0 → 100644
View file @49c8a9f

612 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_3.png 0 → 100644
View file @49c8a9f

627 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_4.png 0 → 100644
View file @49c8a9f

625 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_5.png 0 → 100644
View file @49c8a9f

613 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_6.png 0 → 100644
View file @49c8a9f

605 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_7.png 0 → 100644
View file @49c8a9f

601 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSLoading_8.png 0 → 100644
View file @49c8a9f

573 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_0.png 0 → 100644
View file @49c8a9f

505 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_1.png 0 → 100644
View file @49c8a9f

581 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_2.png 0 → 100644
View file @49c8a9f

568 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_3.png 0 → 100644
View file @49c8a9f

554 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_4.png 0 → 100644
View file @49c8a9f

577 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_5.png 0 → 100644
View file @49c8a9f

599 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_6.png 0 → 100644
View file @49c8a9f

570 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_7.png 0 → 100644
View file @49c8a9f

583 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/DSResource.bundle/Refresh/DSWhiteLoad_8.png 0 → 100644
View file @49c8a9f

505 Bytes
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDK.h
  View file @49c8a9f
@@ -28,6 +28,7 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[]; @@ -28,6 +28,7 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
28 #import <DSCnliveShopSDK/DSHappHPParentViewController.h> 28 #import <DSCnliveShopSDK/DSHappHPParentViewController.h>
29 #import <DSCnliveShopSDK/DSROrderListViewController.h> 29 #import <DSCnliveShopSDK/DSROrderListViewController.h>
30 #import <DSCnliveShopSDK/DSServiceHPViewController.h> 30 #import <DSCnliveShopSDK/DSServiceHPViewController.h>
  31 +#import <DSCnliveShopSDK/DSOMyGivingGiftsListViewController.h>
31 32
32 #import <DSCnliveShopSDK/DSAddressRequest.h> 33 #import <DSCnliveShopSDK/DSAddressRequest.h>
33 #import <DSCnliveShopSDK/DSAddressEnum.h> 34 #import <DSCnliveShopSDK/DSAddressEnum.h>
@@ -56,6 +57,7 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[]; @@ -56,6 +57,7 @@ FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKVersionString[];
56 #import "DSHappHPParentViewController.h" 57 #import "DSHappHPParentViewController.h"
57 #import "DSROrderListViewController.h" 58 #import "DSROrderListViewController.h"
58 #import "DSServiceHPViewController.h" 59 #import "DSServiceHPViewController.h"
  60 +#import "DSOMyGivingGiftsListViewController.h"
59 61
60 #import "DSAddressRequest.h" 62 #import "DSAddressRequest.h"
61 #import "DSAddressEnum.h" 63 #import "DSAddressEnum.h"
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSCnliveShopSDKSkip.h
  View file @49c8a9f
@@ -93,10 +93,11 @@ NS_ASSUME_NONNULL_BEGIN @@ -93,10 +93,11 @@ NS_ASSUME_NONNULL_BEGIN
93 -(void)successLoggedSkipTargetVCWithCurrentVC:(nonnull UIViewController*)currentVC animated:(BOOL)animated; 93 -(void)successLoggedSkipTargetVCWithCurrentVC:(nonnull UIViewController*)currentVC animated:(BOOL)animated;
94 94
95 /// 跳转收礼界面 95 /// 跳转收礼界面
96 -/// @param giftOrderId 礼物订单id 如果没传会自行获取没有填写地址订单的id,此为已登录的前提 96 +/// @param giftOrderId 礼物订单id (如果没传会自行获取没有填写地址订单的id,此为已登录的前提)
  97 +/// @param receivingValidTime 礼物有效时间（收礼前需要）
97 /// @param currentVC 当前控制器 98 /// @param currentVC 当前控制器
98 /// @return YES成功跳转 NO跳转失败,没有查到礼物订单id 99 /// @return YES成功跳转 NO跳转失败,没有查到礼物订单id
99 --(BOOL)skipReceivingGiftsVCWithGiftOrderId:(nullable NSString*)giftOrderId currentVC:(nonnull UIViewController*)currentVC; 100 +-(BOOL)skipReceivingGiftsVCWithGiftOrderId:(nullable NSString*)giftOrderId receivingValidTime:(NSTimeInterval)receivingValidTime currentVC:(nonnull UIViewController*)currentVC;
100 101
101 @end 102 @end
102 103
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Headers/DSOMyGivingGiftsListViewController.h 0 → 100644
  View file @49c8a9f
  1 +//
  2 +// DSOMyGivingGiftsListViewController.h
  3 +// DSCnliveShopSDK
  4 +//
  5 +// Created by zhaolin on 2019/9/21.
  6 +// Copyright © 2019 BIKE. All rights reserved.
  7 +//
  8 +
  9 +#import "DSCnliveShopSDKPBaseViewController.h"
  10 +
  11 +typedef NS_ENUM(NSUInteger, DSOMyGivingGiftsListDisplayType) {
  12 + DSOMyGivingGiftsListDisplayTypeReceiving = 0, //收礼
  13 + DSOMyGivingGiftsListDisplayTypeGiving //送礼
  14 +};
  15 +
  16 +NS_ASSUME_NONNULL_BEGIN
  17 +
  18 +@interface DSOMyGivingGiftsListViewController : DSCnliveShopSDKPBaseViewController
  19 +
  20 +/**
  21 + 显示类型
  22 + */
  23 +@property (nonatomic,assign) DSOMyGivingGiftsListDisplayType displayType;
  24 +
  25 +@end
  26 +
  27 +NS_ASSUME_NONNULL_END
DSCnliveShopSDK/Classes/DSCnliveShopSDK.framework/Info.plist
View file @49c8a9f
No preview for this file type
Example/Podfile
  View file @49c8a9f
@@ -20,13 +20,15 @@ target &#39;DSCnliveShopSDK_Example&#39; do @@ -20,13 +20,15 @@ target &#39;DSCnliveShopSDK_Example&#39; do
20 pod 'Masonry', '1.1.0' 20 pod 'Masonry', '1.1.0'
21 pod 'PLPlayerKit', '~> 3.4.3' 21 pod 'PLPlayerKit', '~> 3.4.3'
22 pod 'CNLiveRequestBastKit' 22 pod 'CNLiveRequestBastKit'
  23 + pod 'CNLiveSDKs/CNLiveEncryptSDK'
  24 + pod 'CNLiveSDKs/CNLivePaySDK'
23 25
24 pod 'QMUIKit', ' 4.0.2' 26 pod 'QMUIKit', ' 4.0.2'
25 pod 'YYKit', '1.0.9' 27 pod 'YYKit', '1.0.9'
26 pod 'SDAutoLayout', '2.2.1' 28 pod 'SDAutoLayout', '2.2.1'
27 29
28 pod 'BKTimer', '~> 1.0.1' 30 pod 'BKTimer', '~> 1.0.1'
29 - pod 'BKCycleScrollView', '~> 2.0.4' 31 + pod 'BKCycleScrollView', '~> 2.0.6'
30 pod 'BKPickerView', '~> 1.1.1' 32 pod 'BKPickerView', '~> 1.1.1'
31 33
32 target 'DSCnliveShopSDK_Tests' do 34 target 'DSCnliveShopSDK_Tests' do