Commit 6cd49839d9080bbd09b6f0e1e49667e9fed16e8e

Authored by yanglingyu
1 parent aead4dce

交互关系

CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 14
15 - (void)viewDidLoad { 15 - (void)viewDidLoad {
16 [super viewDidLoad]; 16 [super viewDidLoad];
17 - self.navigationController.navigationBarHidden = YES;  
18 [self.view addSubview: self.categoryView]; 17 [self.view addSubview: self.categoryView];
19 [self addChildViewController:self.pageViewController]; 18 [self addChildViewController:self.pageViewController];
20 [self.view addSubview:self.pageViewController.view]; 19 [self.view addSubview:self.pageViewController.view];
@@ -33,6 +32,7 @@ @@ -33,6 +32,7 @@
33 { 32 {
34 [super viewWillAppear:animated]; 33 [super viewWillAppear:animated];
35 self.navigationController.interactivePopGestureRecognizer.enabled = NO; 34 self.navigationController.interactivePopGestureRecognizer.enabled = NO;
  35 + self.navigationController.navigationBarHidden = YES;
36 36
37 } 37 }
38 38
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
@@ -384,7 +384,7 @@ static CGFloat moveHeight = 50; @@ -384,7 +384,7 @@ static CGFloat moveHeight = 50;
384 } 384 }
385 // 登录 385 // 登录
386 - (void)loginAction:(UIButton *)sender { 386 - (void)loginAction:(UIButton *)sender {
387 - 387 + [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
388 } 388 }
389 #pragma mark - Method 389 #pragma mark - Method
390 - (NSInteger)containsWithChannelId:(NSString *)channelId { 390 - (NSInteger)containsWithChannelId:(NSString *)channelId {
@@ -431,6 +431,9 @@ static CGFloat moveHeight = 50; @@ -431,6 +431,9 @@ static CGFloat moveHeight = 50;
431 } else { 431 } else {
432 weakSelf.topBgImgHeight = kStatusHeight+100; 432 weakSelf.topBgImgHeight = kStatusHeight+100;
433 } 433 }
  434 + if (weakSelf.topBgImgHeight<kStatusHeight+100) {
  435 + weakSelf.topBgImgHeight = kStatusHeight+100;
  436 + }
434 weakSelf.topBgImg.height = weakSelf.topBgImgHeight; 437 weakSelf.topBgImg.height = weakSelf.topBgImgHeight;
435 weakSelf.topBgImg.bottom = kStatusHeight+100; 438 weakSelf.topBgImg.bottom = kStatusHeight+100;
436 weakSelf.myCategoryView.bottom = weakSelf.topBgImg.height-60; 439 weakSelf.myCategoryView.bottom = weakSelf.topBgImg.height-60;
@@ -809,6 +812,7 @@ static CGFloat moveHeight = 50; @@ -809,6 +812,7 @@ static CGFloat moveHeight = 50;
809 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { 812 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
810 NSLog(@"%@", NSStringFromSelector(_cmd)); 813 NSLog(@"%@", NSStringFromSelector(_cmd));
811 UIViewController *vc = self.controllersArr[index]; 814 UIViewController *vc = self.controllersArr[index];
  815 + vc.navigationController.navigationBarHidden = YES;
812 if (index>self.ld_currentIndex) { 816 if (index>self.ld_currentIndex) {
813 [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL]; 817 [self.pageViewController setViewControllers:@[vc] direction:UIPageViewControllerNavigationDirectionForward animated:YES completion:NULL];
814 }else 818 }else