Commit 959b3c64498f82871c49ac0fe6e15aced4cc6047

Authored by 毕珂
1 parent eb8b02b3

0.0.9

Showing 15 changed files with 26 additions and 104 deletions
DSCnliveShopSDKToolsModuleF.podspec
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 2
3 s.name = "DSCnliveShopSDKToolsModuleF" 3 s.name = "DSCnliveShopSDKToolsModuleF"
4 - s.version = "0.0.8" 4 + s.version = "0.0.9"
5 s.summary = "DSCnliveShopSDKToolsModuleF" 5 s.summary = "DSCnliveShopSDKToolsModuleF"
6 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam" 6 s.homepage = "http://bj.gitlab.cnlive.com/DSIOSTeam"
7 s.authors = { "DSIOSTeam" => "694092596@qq.com" } 7 s.authors = { "DSIOSTeam" => "694092596@qq.com" }
@@ -22,8 +22,6 @@ Pod::Spec.new do |s| @@ -22,8 +22,6 @@ Pod::Spec.new do |s|
22 s.dependency 'QMUIKit', ' 4.0.2' 22 s.dependency 'QMUIKit', ' 4.0.2'
23 s.dependency 'YYKit', '1.0.9' 23 s.dependency 'YYKit', '1.0.9'
24 24
25 - s.dependency 'CNLiveRequestBastKit'  
26 -  
27 s.dependency 'DSBaseModuleF', '>=0.0.0', '<1.0.0' 25 s.dependency 'DSBaseModuleF', '>=0.0.0', '<1.0.0'
28 s.dependency 'DSExtensionModuleF', '>=0.0.0', '<1.0.0' 26 s.dependency 'DSExtensionModuleF', '>=0.0.0', '<1.0.0'
29 s.dependency 'DSBaseControlsModuleF', '>=0.0.0', '<1.0.0' 27 s.dependency 'DSBaseControlsModuleF', '>=0.0.0', '<1.0.0'
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/DSCnliveShopSDKToolsModule
No preview for this file type
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/DSCnliveShopSDKToolsModule.bundle/Assets.car
No preview for this file type
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/DSCnliveShopSDKToolsModule.bundle/Info.plist
No preview for this file type
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSBaseViewController.h renamed to DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSBaseViewController+DSCnliveShopSDKToolsModule.h
1 // 1 //
2 -// DSBaseViewController.h  
3 -// 2 +// DSBaseViewController+DSCnliveShopSDKToolsModule.h
  3 +// DSCnliveShopSDKToolsModule
4 // 4 //
5 -// Created by BIKE on 2018/7/12.  
6 -// Copyright © 2018年 BIKE. All rights reserved. 5 +// Created by zhaolin on 2020/3/6.
7 // 6 //
8 7
9 -#import <DSBaseControlsModule/DSBCMBaseViewController.h> 8 +#import <DSBaseControlsModule/DSBaseControlsModule.h>
10 #import <DSToolsModule/BKCycleScrollView.h> 9 #import <DSToolsModule/BKCycleScrollView.h>
11 #import "DSPlayerView.h" 10 #import "DSPlayerView.h"
12 11
13 -@interface DSBaseViewController : DSBCMBaseViewController 12 +NS_ASSUME_NONNULL_BEGIN
  13 +
  14 +@interface DSBaseViewController (DSCnliveShopSDKToolsModule)
14 15
15 #pragma mark - 顶部导航 16 #pragma mark - 顶部导航
16 17
@@ -49,3 +50,5 @@ @@ -49,3 +50,5 @@
49 -(void)settingPlayerViewCooperateWithCycleScrollView:(nonnull BKCycleScrollView*)cycleScrollView; 50 -(void)settingPlayerViewCooperateWithCycleScrollView:(nonnull BKCycleScrollView*)cycleScrollView;
50 51
51 @end 52 @end
  53 +
  54 +NS_ASSUME_NONNULL_END
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSCnliveShopSDKToolsModule-umbrella.h
@@ -10,24 +10,17 @@ @@ -10,24 +10,17 @@
10 #endif 10 #endif
11 #endif 11 #endif
12 12
13 -#import "DSBaseViewController.h"  
14 -#import "DSCollectionView.h"  
15 -#import "DSScrollView.h"  
16 -#import "DSTableView.h"  
17 -#import "DSTableViewCell.h" 13 +#import "DSBaseViewController+DSCnliveShopSDKToolsModule.h"
  14 +#import "DSCnliveShopSDKToolsModule.h"
18 #import "DSCommentRequestShareModel.h" 15 #import "DSCommentRequestShareModel.h"
19 #import "DSCommonRequest.h" 16 #import "DSCommonRequest.h"
  17 +#import "DSSDKSharedManager.h"
20 #import "DSSDKToolsConstant.h" 18 #import "DSSDKToolsConstant.h"
21 #import "DSSDKToolsMacro.h" 19 #import "DSSDKToolsMacro.h"
22 -#import "DSSharedManager.h"  
23 -#import "DSCnliveShopSDKToolsModule.h"  
24 #import "DSEmptyView+DSCnliveShopSDKToolsModule.h" 20 #import "DSEmptyView+DSCnliveShopSDKToolsModule.h"
25 #import "UIImage+DSCnliveShopSDKToolsModule.h" 21 #import "UIImage+DSCnliveShopSDKToolsModule.h"
26 #import "UIScrollView+DSCnliveShopSDKToolsModule.h" 22 #import "UIScrollView+DSCnliveShopSDKToolsModule.h"
27 #import "UIView+DSCnliveShopSDKToolsModule.h" 23 #import "UIView+DSCnliveShopSDKToolsModule.h"
28 -#import "DSRefreshFooter.h"  
29 -#import "DSRefreshHeader.h"  
30 -#import "DSRefreshWHeader.h"  
31 #import "DSPlayerBottomMessageView.h" 24 #import "DSPlayerBottomMessageView.h"
32 #import "DSPlayerFailureView.h" 25 #import "DSPlayerFailureView.h"
33 #import "DSPlayerFastForwardPreviewView.h" 26 #import "DSPlayerFastForwardPreviewView.h"
@@ -40,6 +33,9 @@ @@ -40,6 +33,9 @@
40 #import "DSPlayerView.h" 33 #import "DSPlayerView.h"
41 #import "DSPlayerViewController.h" 34 #import "DSPlayerViewController.h"
42 #import "DSPlayerVolumeBrightnessView.h" 35 #import "DSPlayerVolumeBrightnessView.h"
  36 +#import "DSRefreshFooter.h"
  37 +#import "DSRefreshHeader.h"
  38 +#import "DSRefreshWHeader.h"
43 39
44 FOUNDATION_EXPORT double DSCnliveShopSDKToolsModuleVersionNumber; 40 FOUNDATION_EXPORT double DSCnliveShopSDKToolsModuleVersionNumber;
45 FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKToolsModuleVersionString[]; 41 FOUNDATION_EXPORT const unsigned char DSCnliveShopSDKToolsModuleVersionString[];
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSCnliveShopSDKToolsModule.h
@@ -13,14 +13,10 @@ @@ -13,14 +13,10 @@
13 #import <DSToolsModule/DSToolsModule.h> 13 #import <DSToolsModule/DSToolsModule.h>
14 #import <DSBaseControlsModule/DSBaseControlsModule.h> 14 #import <DSBaseControlsModule/DSBaseControlsModule.h>
15 15
16 -#import "DSBaseViewController.h"  
17 -#import "DSCollectionView.h"  
18 -#import "DSScrollView.h"  
19 -#import "DSTableView.h"  
20 -#import "DSTableViewCell.h" 16 +#import "DSBaseViewController+DSCnliveShopSDKToolsModule.h"
21 #import "DSSDKToolsConstant.h" 17 #import "DSSDKToolsConstant.h"
22 #import "DSSDKToolsMacro.h" 18 #import "DSSDKToolsMacro.h"
23 -#import "DSSharedManager.h" 19 +#import "DSSDKSharedManager.h"
24 #import "DSCommonRequest.h" 20 #import "DSCommonRequest.h"
25 #import "DSEmptyView+DSCnliveShopSDKToolsModule.h" 21 #import "DSEmptyView+DSCnliveShopSDKToolsModule.h"
26 #import "UIImage+DSCnliveShopSDKToolsModule.h" 22 #import "UIImage+DSCnliveShopSDKToolsModule.h"
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSCollectionView.h deleted 100644 → 0
1 -//  
2 -// DSCollectionView.h  
3 -//  
4 -//  
5 -// Created by BIKE on 2018/7/11.  
6 -// Copyright © 2018年 BIKE. All rights reserved.  
7 -//  
8 -  
9 -#import <DSBaseControlsModule/DSBCMCollectionView.h>  
10 -  
11 -@interface DSCollectionView : DSBCMCollectionView  
12 -  
13 -@end  
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSSharedManager.h renamed to DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSSDKSharedManager.h
1 // 1 //
2 -// DSSharedManager.h 2 +// DSSDKSharedManager.h
3 // BKProjectFramework 3 // BKProjectFramework
4 // 4 //
5 // Created by BIKE on 2018/7/5. 5 // Created by BIKE on 2018/7/5.
@@ -9,14 +9,7 @@ @@ -9,14 +9,7 @@
9 #import <DSBaseModule/DSBaseModuleManager.h> 9 #import <DSBaseModule/DSBaseModuleManager.h>
10 #import <CoreLocation/CoreLocation.h> 10 #import <CoreLocation/CoreLocation.h>
11 11
12 -typedef NS_ENUM(NSUInteger, DSNetworkStatus) {  
13 - DSNetworkStatusNotReachable = 0, //无网  
14 - DSNetworkStatusReachable,  
15 - DSNetworkStatusWWAN,  
16 - DSNetworkStatusWiFi,  
17 -};  
18 -  
19 -@interface DSSharedManager : DSBaseModuleManager 12 +@interface DSSDKSharedManager : DSBaseModuleManager
20 13
21 #pragma mark - 通用信息 14 #pragma mark - 通用信息
22 15
@@ -33,13 +26,6 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) { @@ -33,13 +26,6 @@ typedef NS_ENUM(NSUInteger, DSNetworkStatus) {
33 /// 是否允许播放视频 默认允许 26 /// 是否允许播放视频 默认允许
34 @property (nonatomic,assign) BOOL isAllowPlayVideo; 27 @property (nonatomic,assign) BOOL isAllowPlayVideo;
35 28
36 -#pragma mark - 网络监测  
37 -  
38 -/**  
39 - AFNetworking网络监测 0没网 1流量 2WiFi  
40 - */  
41 -@property (nonatomic,assign,readonly) DSNetworkStatus netStatus;  
42 -  
43 #pragma mark - 跳转登录 29 #pragma mark - 跳转登录
44 30
45 /// 跳转登录 31 /// 跳转登录
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSSDKToolsMacro.h
@@ -20,19 +20,17 @@ @@ -20,19 +20,17 @@
20 20
21 #pragma mark - 信息 21 #pragma mark - 信息
22 22
23 -#define DS_USER_ID ([DSSharedManager sharedManager].userId ? [DSSharedManager sharedManager].userId : @"") 23 +#define DS_USER_ID ([DSSDKSharedManager sharedManager].userId ? [DSSDKSharedManager sharedManager].userId : @"")
24 #define DS_IS_LOGIN ([DS_USER_ID length] == 0 ? NO : YES) 24 #define DS_IS_LOGIN ([DS_USER_ID length] == 0 ? NO : YES)
25 25
26 -#define DS_APPID ([DSSharedManager sharedManager].appId ? [DSSharedManager sharedManager].appId : @"")  
27 -#define DS_APPKEY ([DSSharedManager sharedManager].appKey ? [DSSharedManager sharedManager].appKey : @"")  
28 -#define DS_IS_DEBUG [DSSharedManager sharedManager].isDebug 26 +#define DS_APPID ([DSSDKSharedManager sharedManager].appId ? [DSSDKSharedManager sharedManager].appId : @"")
  27 +#define DS_APPKEY ([DSSDKSharedManager sharedManager].appKey ? [DSSDKSharedManager sharedManager].appKey : @"")
  28 +#define DS_IS_DEBUG [DSSDKSharedManager sharedManager].isDebug
29 29
30 #pragma mark - 请求链接 30 #pragma mark - 请求链接
31 31
32 #define DS_REQUEST(interface) [NSString stringWithFormat:@"%@%@",(DS_IS_DEBUG ? @"https://wjjshop.cnlive.com" : @"https://managemall.cnlive.com"), interface] 32 #define DS_REQUEST(interface) [NSString stringWithFormat:@"%@%@",(DS_IS_DEBUG ? @"https://wjjshop.cnlive.com" : @"https://managemall.cnlive.com"), interface]
33 -#define DS_PAY_REQUEST(interface) [NSString stringWithFormat:@"%@%@",(DS_IS_DEBUG ? @"https://apiwjjtest.cnlive.com" : @"https://apiwjj.cnlive.com"), interface]  
34 -//之前另外一个团队的请求代码  
35 -#define DS_HAPPINESS_REQUEST(interface) [NSString stringWithFormat:@"%@%@",(DS_IS_DEBUG ? @"https://apiwjjtest.cnlive.com" : @"https://apiwjj.cnlive.com"), interface] 33 +#define DS_ONE_DEPARTMENT_REQUEST(interface) [NSString stringWithFormat:@"%@%@",(DS_IS_DEBUG ? @"https://apiwjjtest.cnlive.com" : @"https://apiwjj.cnlive.com"), interface]
36 34
37 #pragma mark - 默认头像 35 #pragma mark - 默认头像
38 36
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSScrollView.h deleted 100644 → 0
1 -//  
2 -// DSScrollView.h  
3 -//  
4 -//  
5 -// Created by BIKE on 2018/7/11.  
6 -// Copyright © 2018年 BIKE. All rights reserved.  
7 -//  
8 -  
9 -#import <DSBaseControlsModule/DSBCMScrollView.h>  
10 -  
11 -@interface DSScrollView : DSBCMScrollView  
12 -  
13 -@end  
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSTableView.h deleted 100644 → 0
1 -//  
2 -// DSTableView.h  
3 -//  
4 -//  
5 -// Created by BIKE on 2018/7/11.  
6 -// Copyright © 2018年 BIKE. All rights reserved.  
7 -//  
8 -  
9 -#import <DSBaseControlsModule/DSBCMTableView.h>  
10 -  
11 -@interface DSTableView : DSBCMTableView  
12 -  
13 -@end  
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/DSTableViewCell.h deleted 100644 → 0
1 -//  
2 -// DSTableViewCell.h  
3 -// DSCnliveShopSDK  
4 -//  
5 -// Created by zhaolin on 2018/11/27.  
6 -//  
7 -  
8 -#import <DSBaseControlsModule/DSBCMTableViewCell.h>  
9 -  
10 -NS_ASSUME_NONNULL_BEGIN  
11 -  
12 -@interface DSTableViewCell : DSBCMTableViewCell  
13 -  
14 -@end  
15 -  
16 -NS_ASSUME_NONNULL_END  
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Headers/UIScrollView+DSCnliveShopSDKToolsModule.h
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
20 20
21 #pragma mark - 加载更多 21 #pragma mark - 加载更多
22 22
23 -/// 添加电商加载更多 23 +/// 添加加载更多
24 -(void)addDSFooterRefreshBlock:(void (^)(void))block; 24 -(void)addDSFooterRefreshBlock:(void (^)(void))block;
25 25
26 @end 26 @end
DSCnliveShopSDKToolsModuleF/Frameworks/DSCnliveShopSDKToolsModule.framework/Info.plist
No preview for this file type