DSIOSTeam / DSBaseControlsModuleF · Commits

Commit 5729ffe904d6b304ce7b1d4a040bb6be0131f9e5

Authored by 毕珂
1 parent 724468c9

0.0.14

Inline Side-by-side
Showing 13 changed files with 56 additions and 49 deletions
DSBaseControlsModuleF.podspec
  View file @5729ffe
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 2
3 s.name = "DSBaseControlsModuleF" 3 s.name = "DSBaseControlsModuleF"
4 - s.version = "0.0.13" 4 + s.version = "0.0.14"
5 s.summary = "DSBaseControlsModuleF" 5 s.summary = "DSBaseControlsModuleF"
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" }
@@ -14,8 +14,9 @@ Pod::Spec.new do |s| @@ -14,8 +14,9 @@ Pod::Spec.new do |s|
14 s.dependency 'QMUIKit', '4.0.2' 14 s.dependency 'QMUIKit', '4.0.2'
15 s.dependency 'Masonry', '1.1.0' 15 s.dependency 'Masonry', '1.1.0'
16 s.dependency 'SDWebImage', '~> 5.2.3' 16 s.dependency 'SDWebImage', '~> 5.2.3'
17 - s.dependency 'DSBaseModuleF'  
18 - s.dependency 'DSExtensionModuleF'  
19 - s.dependency 'DSToolsModuleF' 17 +
  18 + s.dependency 'DSBaseModuleF', '>=0.0.0', '<1.0.0'
  19 + s.dependency 'DSExtensionModuleF', '>=0.0.0', '<1.0.0'
  20 + s.dependency 'DSToolsModuleF', '>=0.0.0', '<1.0.0'
20 21
21 end 22 end
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/DSBaseControlsModule
View file @5729ffe
No preview for this file type
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBaseControlsModule-umbrella.h
  View file @5729ffe
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 #endif 11 #endif
12 12
13 #import "DSBaseControlsModule.h" 13 #import "DSBaseControlsModule.h"
14 -#import "DSBCMBaseViewController.h" 14 +#import "DSBaseViewController.h"
15 #import "DSNavButton.h" 15 #import "DSNavButton.h"
16 -#import "DSBCMCollectionView.h" 16 +#import "DSCollectionView.h"
17 #import "DSEmptyView.h" 17 #import "DSEmptyView.h"
18 #import "UIView+DSEmptyView.h" 18 #import "UIView+DSEmptyView.h"
19 #import "DSImageView+DSBaseControlsModule.h" 19 #import "DSImageView+DSBaseControlsModule.h"
@@ -24,12 +24,12 @@ @@ -24,12 +24,12 @@
24 #import "DSViewControllerNaviDelegate.h" 24 #import "DSViewControllerNaviDelegate.h"
25 #import "NSObject+DSNavExtension.h" 25 #import "NSObject+DSNavExtension.h"
26 #import "UIViewController+DSNavExtension.h" 26 #import "UIViewController+DSNavExtension.h"
27 -#import "DSBCMScrollView.h"  
28 -#import "DSBCMTabBar.h"  
29 -#import "DSBCMTabBarButton.h"  
30 -#import "DSBCMTabBarViewController.h"  
31 -#import "DSBCMTableView.h"  
32 -#import "DSBCMTableViewCell.h" 27 +#import "DSScrollView.h"
  28 +#import "DSTabBar.h"
  29 +#import "DSTabBarButton.h"
  30 +#import "DSTabBarViewController.h"
  31 +#import "DSTableView.h"
  32 +#import "DSTableViewCell.h"
33 33
34 FOUNDATION_EXPORT double DSBaseControlsModuleVersionNumber; 34 FOUNDATION_EXPORT double DSBaseControlsModuleVersionNumber;
35 FOUNDATION_EXPORT const unsigned char DSBaseControlsModuleVersionString[]; 35 FOUNDATION_EXPORT const unsigned char DSBaseControlsModuleVersionString[];
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBaseControlsModule.h
  View file @5729ffe
@@ -12,8 +12,14 @@ @@ -12,8 +12,14 @@
12 #import <DSExtensionModule/DSExtensionModule.h> 12 #import <DSExtensionModule/DSExtensionModule.h>
13 #import <DSToolsModule/DSToolsModule.h> 13 #import <DSToolsModule/DSToolsModule.h>
14 14
15 -#import "DSBCMBaseViewController.h"  
16 -#import "DSBCMCollectionView.h" 15 +#import "DSBaseViewController.h"
  16 +#import "DSTabBarViewController.h"
  17 +#import "DSTabBar.h"
  18 +#import "DSTabBarButton.h"
  19 +#import "DSScrollView.h"
  20 +#import "DSCollectionView.h"
  21 +#import "DSTableView.h"
  22 +#import "DSTableViewCell.h"
17 #import "DSEmptyView.h" 23 #import "DSEmptyView.h"
18 #import "UIView+DSEmptyView.h" 24 #import "UIView+DSEmptyView.h"
19 #import "DSImageView.h" 25 #import "DSImageView.h"
@@ -21,11 +27,5 @@ @@ -21,11 +27,5 @@
21 #import "DSTransitionEnum.h" 27 #import "DSTransitionEnum.h"
22 #import "NSObject+DSNavExtension.h" 28 #import "NSObject+DSNavExtension.h"
23 #import "UIViewController+DSNavExtension.h" 29 #import "UIViewController+DSNavExtension.h"
24 -#import "DSBCMScrollView.h"  
25 -#import "DSBCMTabBarViewController.h"  
26 -#import "DSBCMTabBar.h"  
27 -#import "DSBCMTabBarButton.h"  
28 -#import "DSBCMTableView.h"  
29 -#import "DSBCMTableViewCell.h"  
30 30
31 #endif /* DSBaseControlsModule_h */ 31 #endif /* DSBaseControlsModule_h */
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMBaseViewController.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBaseViewController.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMBaseViewController.h 2 +// DSBaseViewController.h
3 // DSCnliveShopSDK 3 // DSCnliveShopSDK
4 // 4 //
5 // Created by zhaolin on 2019/5/7. 5 // Created by zhaolin on 2019/5/7.
@@ -14,7 +14,7 @@ UIKIT_EXTERN const CGFloat kTopNavLeftRightOffset; @@ -14,7 +14,7 @@ UIKIT_EXTERN const CGFloat kTopNavLeftRightOffset;
14 14
15 NS_ASSUME_NONNULL_BEGIN 15 NS_ASSUME_NONNULL_BEGIN
16 16
17 -@interface DSBCMBaseViewController : UIViewController 17 +@interface DSBaseViewController : UIViewController
18 18
19 #pragma mark - 通用属性 19 #pragma mark - 通用属性
20 20
@@ -22,11 +22,6 @@ NS_ASSUME_NONNULL_BEGIN @@ -22,11 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
22 /// 控制器唯一标识 22 /// 控制器唯一标识
23 @property (nonatomic,copy,nonnull,readonly) NSString * uniqueIdentity; 23 @property (nonatomic,copy,nonnull,readonly) NSString * uniqueIdentity;
24 24
25 -#pragma mark - 通用方法  
26 -  
27 -/// 获取数据方法 切换用户后，回到此界面会重新调用此方法  
28 --(void)requestDataMethod;  
29 -  
30 #pragma mark - 顶部导航 25 #pragma mark - 顶部导航
31 26
32 @property (nonatomic,strong) UIView * topNavView;//高度为 get_system_nav_height() 27 @property (nonatomic,strong) UIView * topNavView;//高度为 get_system_nav_height()
@@ -83,6 +78,17 @@ NS_ASSUME_NONNULL_BEGIN @@ -83,6 +78,17 @@ NS_ASSUME_NONNULL_BEGIN
83 */ 78 */
84 -(void)setStatusBarHidden:(BOOL)hidden withAnimation:(UIStatusBarAnimation)animation; 79 -(void)setStatusBarHidden:(BOOL)hidden withAnimation:(UIStatusBarAnimation)animation;
85 80
  81 +#pragma mark - 分类替代方法
  82 +
  83 +//以下方法对应系统的方法
  84 +-(void)dsViewDidLoad;
  85 +-(void)dsViewWillAppear:(BOOL)animated;
  86 +-(void)dsViewDidAppear:(BOOL)animated;
  87 +-(void)dsViewWillDisappear:(BOOL)animated;
  88 +-(void)dsViewDidDisappear:(BOOL)animated;
  89 +-(void)dsDealloc;
  90 +-(void)dsViewWillLayoutSubviews;
  91 +
86 @end 92 @end
87 93
88 NS_ASSUME_NONNULL_END 94 NS_ASSUME_NONNULL_END
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMCollectionView.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSCollectionView.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMCollectionView.h 2 +// DSCollectionView.h
3 // 3 //
4 // 4 //
5 // Created by BIKE on 2018/7/11. 5 // Created by BIKE on 2018/7/11.
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -@interface DSBCMCollectionView : UICollectionView 11 +@interface DSCollectionView : UICollectionView
12 12
13 #pragma mark - 手势 13 #pragma mark - 手势
14 14
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMScrollView.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSScrollView.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMScrollView.h 2 +// DSScrollView.h
3 // 3 //
4 // 4 //
5 // Created by BIKE on 2018/7/11. 5 // Created by BIKE on 2018/7/11.
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -@interface DSBCMScrollView : UIScrollView 11 +@interface DSScrollView : UIScrollView
12 12
13 #pragma mark - 手势 13 #pragma mark - 手势
14 14
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMTabBar.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSTabBar.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMTabBar.h 2 +// DSTabBar.h
3 // com.cnlive.pro.CNLiveNetAdd 3 // com.cnlive.pro.CNLiveNetAdd
4 // 4 //
5 // Created by zhaolin on 2019/9/16. 5 // Created by zhaolin on 2019/9/16.
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
13 -@interface DSBCMTabBar : UIView 13 +@interface DSTabBar : UIView
14 14
15 @end 15 @end
16 16
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMTabBarButton.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSTabBarButton.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMTabBarButton.h 2 +// DSTabBarButton.h
3 // com.cnlive.pro.CNLiveNetAdd 3 // com.cnlive.pro.CNLiveNetAdd
4 // 4 //
5 // Created by zhaolin on 2019/9/16. 5 // Created by zhaolin on 2019/9/16.
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
13 -@interface DSBCMTabBarButton : UIButton 13 +@interface DSTabBarButton : UIButton
14 14
15 @end 15 @end
16 16
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMTabBarViewController.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSTabBarViewController.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMTabBarViewController.h 2 +// DSTabBarViewController.h
3 // com.cnlive.pro.CNLiveNetAdd 3 // com.cnlive.pro.CNLiveNetAdd
4 // 4 //
5 // Created by zhaolin on 2019/9/16. 5 // Created by zhaolin on 2019/9/16.
6 // Copyright © 2019 cnlive. All rights reserved. 6 // Copyright © 2019 cnlive. All rights reserved.
7 // 7 //
8 8
9 -#import "DSBCMBaseViewController.h"  
10 -#import "DSBCMTabBar.h"  
11 -@class DSBCMTabBarViewController; 9 +#import "DSBaseViewController.h"
  10 +#import "DSTabBar.h"
  11 +@class DSTabBarViewController;
12 12
13 -@protocol DSBCMTabBarViewControllerDelegate <NSObject> 13 +@protocol DSTabBarViewControllerDelegate <NSObject>
14 14
15 @optional 15 @optional
16 16
17 /// 切换index代理 实现了这个代理后 切换index必须用调用tabBar.displayIndex=switchIndex才能切换显示界面 17 /// 切换index代理 实现了这个代理后 切换index必须用调用tabBar.displayIndex=switchIndex才能切换显示界面
18 -/// @param tabBar DSBCMTabBarViewController 18 +/// @param tabBar DSTabBarViewController
19 /// @param switchIndex 切换后index 19 /// @param switchIndex 切换后index
20 /// @param fromIndex 切换前index 20 /// @param fromIndex 切换前index
21 --(void)tabBar:(nonnull DSBCMTabBarViewController*)tabBar switchIndex:(NSUInteger)switchIndex fromIndex:(NSUInteger)fromIndex; 21 +-(void)tabBar:(nonnull DSTabBarViewController*)tabBar switchIndex:(NSUInteger)switchIndex fromIndex:(NSUInteger)fromIndex;
22 22
23 @end 23 @end
24 24
25 NS_ASSUME_NONNULL_BEGIN 25 NS_ASSUME_NONNULL_BEGIN
26 26
27 -@interface DSBCMTabBarViewController : DSBCMBaseViewController 27 +@interface DSTabBarViewController : DSBaseViewController
28 28
29 #pragma mark - 代理 29 #pragma mark - 代理
30 30
31 -@property (nonatomic,weak) id<DSBCMTabBarViewControllerDelegate> delegate; 31 +@property (nonatomic,weak) id<DSTabBarViewControllerDelegate> delegate;
32 32
33 #pragma mark - 属性 33 #pragma mark - 属性
34 34
@@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
48 /** 48 /**
49 DSTabBar 49 DSTabBar
50 */ 50 */
51 -@property (nonatomic,strong) DSBCMTabBar * tabBar; 51 +@property (nonatomic,strong) DSTabBar * tabBar;
52 52
53 #pragma mark - 消息数 53 #pragma mark - 消息数
54 54
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMTableView.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSTableView.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMTableView.h 2 +// DSTableView.h
3 // 3 //
4 // 4 //
5 // Created by BIKE on 2018/7/11. 5 // Created by BIKE on 2018/7/11.
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
10 10
11 -@interface DSBCMTableView : UITableView 11 +@interface DSTableView : UITableView
12 12
13 #pragma mark - 手势 13 #pragma mark - 手势
14 14
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSBCMTableViewCell.h renamed to DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Headers/DSTableViewCell.h
  View file @5729ffe
1 // 1 //
2 -// DSBCMTableViewCell.h 2 +// DSTableViewCell.h
3 // DSCnliveShopSDK 3 // DSCnliveShopSDK
4 // 4 //
5 // Created by zhaolin on 2018/11/27. 5 // Created by zhaolin on 2018/11/27.
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 NS_ASSUME_NONNULL_BEGIN 10 NS_ASSUME_NONNULL_BEGIN
11 11
12 -@interface DSBCMTableViewCell : UITableViewCell 12 +@interface DSTableViewCell : UITableViewCell
13 13
14 @end 14 @end
15 15
DSBaseControlsModuleF/Frameworks/DSBaseControlsModule.framework/Info.plist
View file @5729ffe
No preview for this file type