iOS Team / CNLiveVideoClassifyKit · Commits

Commit 4f738ae25466f8bfc27c08efe586c73025e35583

Authored by yanglingyu
1 parent dc2271c7

0.7.0

Inline Side-by-side
Showing 7 changed files with 10 additions and 7 deletions
CNLiveVideoClassifyKit.podspec
  View file @4f738ae
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveVideoClassifyKit' 10 s.name = 'CNLiveVideoClassifyKit'
11 - s.version = '0.6.9' 11 + s.version = '0.7.0'
12 s.summary = '视讯头部一二级菜单组件' 12 s.summary = '视讯头部一二级菜单组件'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNCategoryBaseViewController.h
  View file @4f738ae
@@ -6,10 +6,11 @@ @@ -6,10 +6,11 @@
6 //分类试图控制器基类 6 //分类试图控制器基类
7 7
8 #import <JXCategoryView/JXCategoryView.h> 8 #import <JXCategoryView/JXCategoryView.h>
  9 +#import <CNLiveBusinessBaseModule/CNCommonViewController.h>
9 10
10 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
11 12
12 -@interface CNCategoryBaseViewController : UIViewController<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate> 13 +@interface CNCategoryBaseViewController : CNCommonViewController<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
13 14
14 @property (nonatomic, strong) JXCategoryBaseView *categoryView; //分类控制器 15 @property (nonatomic, strong) JXCategoryBaseView *categoryView; //分类控制器
15 @property (nonatomic, strong) JXCategoryListContainerView *listContainerView;//分类控制器对应VC管理器 16 @property (nonatomic, strong) JXCategoryListContainerView *listContainerView;//分类控制器对应VC管理器
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNCategoryBaseViewController.m
  View file @4f738ae
@@ -28,6 +28,9 @@ @@ -28,6 +28,9 @@
28 self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]); 28 self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]);
29 self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height); 29 self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height);
30 } 30 }
  31 +- (BOOL)preferredNavigationBarHidden{
  32 + return YES;
  33 +}
31 #pragma mark - Public 34 #pragma mark - Public
32 - (void)categoryViewSelectedItemAtIndex:(NSInteger)index 35 - (void)categoryViewSelectedItemAtIndex:(NSInteger)index
33 { 36 {
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
  View file @4f738ae
@@ -212,7 +212,6 @@ static const CGFloat animationHeight = 15; @@ -212,7 +212,6 @@ static const CGFloat animationHeight = 15;
212 [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveDeepLinkPushNotification object:nil]; 212 [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveDeepLinkPushNotification object:nil];
213 [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveRemotePushNotification object:nil]; 213 [[NSNotificationCenter defaultCenter] postNotificationName:kCNLiveRemotePushNotification object:nil];
214 } 214 }
215 - self.navigationController.navigationBarHidden = YES;  
216 [[NSUserDefaults standardUserDefaults] setBool:YES forKey:CNLiveLaunchWithFirsh]; 215 [[NSUserDefaults standardUserDefaults] setBool:YES forKey:CNLiveLaunchWithFirsh];
217 [[NSUserDefaults standardUserDefaults] synchronize]; 216 [[NSUserDefaults standardUserDefaults] synchronize];
218 self.tabBarController.tabBar.hidden = NO; 217 self.tabBarController.tabBar.hidden = NO;
@@ -228,7 +227,6 @@ static const CGFloat animationHeight = 15; @@ -228,7 +227,6 @@ static const CGFloat animationHeight = 15;
228 - (void)viewWillDisappear:(BOOL)animated { 227 - (void)viewWillDisappear:(BOOL)animated {
229 [super viewWillDisappear:animated]; 228 [super viewWillDisappear:animated];
230 [self quitCustomChannels]; 229 [self quitCustomChannels];
231 - self.navigationController.navigationBarHidden = NO;  
232 self.navigationController.interactivePopGestureRecognizer.enabled = NO; 230 self.navigationController.interactivePopGestureRecognizer.enabled = NO;
233 } 231 }
234 - (void)dealloc 232 - (void)dealloc
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.h
  View file @4f738ae
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
13 -@interface CNLiveListController : UIViewController<JXCategoryListContentViewDelegate> 13 +@interface CNLiveListController : CNCommonViewController<JXCategoryListContentViewDelegate>
14 14
15 /** 15 /**
16 创建View 16 创建View
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
  View file @4f738ae
@@ -108,7 +108,9 @@ @@ -108,7 +108,9 @@
108 } 108 }
109 // Do any additional setup after loading the view. 109 // Do any additional setup after loading the view.
110 } 110 }
111 - 111 +- (BOOL)preferredNavigationBarHidden{
  112 + return YES;
  113 +}
112 + (BOOL)searchProperties:(Class)cls string:(NSString *)key 114 + (BOOL)searchProperties:(Class)cls string:(NSString *)key
113 { 115 {
114 unsigned int count; 116 unsigned int count;
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
  View file @4f738ae
@@ -211,7 +211,6 @@ @@ -211,7 +211,6 @@
211 - (void)viewWillAppear:(BOOL)animated 211 - (void)viewWillAppear:(BOOL)animated
212 { 212 {
213 [super viewWillAppear:animated]; 213 [super viewWillAppear:animated];
214 - self.navigationController.navigationBarHidden = YES;  
215 } 214 }
216 - (void)viewWillDisappear:(BOOL)animated 215 - (void)viewWillDisappear:(BOOL)animated
217 { 216 {