Commit 806b8a60cba7b661710a1d1ebec0c096d99b3916
1 parent
13a154bf
修复问题
Showing
3 changed files
with
16 additions
and
2 deletions
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
| @@ -216,7 +216,16 @@ static CGFloat moveHeight = 50; | @@ -216,7 +216,16 @@ static CGFloat moveHeight = 50; | ||
| 216 | self.loginBtn.centerY = [self preferredCategoryViewHeight]/2 + kStatusHeight; | 216 | self.loginBtn.centerY = [self preferredCategoryViewHeight]/2 + kStatusHeight; |
| 217 | self.loginBtn.right = kScreenWidth - 11; | 217 | self.loginBtn.right = kScreenWidth - 11; |
| 218 | } | 218 | } |
| 219 | - | 219 | + if (self.isHiddenFirst) { |
| 220 | + self.myCategoryView.top = -50-kStatusHeight; | ||
| 221 | + self.listContainerView.top = kStatusHeight; | ||
| 222 | + if ([CNUserShareManager isLogin]) { | ||
| 223 | + self.customChannelsBtn.centerY = self.myCategoryView.centerY + kStatusHeight; | ||
| 224 | + }else | ||
| 225 | + { | ||
| 226 | + self.loginBtn.centerY = self.myCategoryView.centerY+kStatusHeight; | ||
| 227 | + } | ||
| 228 | + } | ||
| 220 | } | 229 | } |
| 221 | 230 | ||
| 222 | 231 | ||
| @@ -654,6 +663,7 @@ static CGFloat moveHeight = 50; | @@ -654,6 +663,7 @@ static CGFloat moveHeight = 50; | ||
| 654 | } | 663 | } |
| 655 | -(void)scrollViewDown{ | 664 | -(void)scrollViewDown{ |
| 656 | self.topBgImg.top += moveHeight; | 665 | self.topBgImg.top += moveHeight; |
| 666 | + self.myCategoryView.top = kStatusHeight; | ||
| 657 | self.myCategoryView.collectionView.top = 0; | 667 | self.myCategoryView.collectionView.top = 0; |
| 658 | self.listContainerView.top = self.myCategoryView.bottom; | 668 | self.listContainerView.top = self.myCategoryView.bottom; |
| 659 | if ([CNUserShareManager isLogin]) { | 669 | if ([CNUserShareManager isLogin]) { |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
| @@ -42,7 +42,12 @@ | @@ -42,7 +42,12 @@ | ||
| 42 | } | 42 | } |
| 43 | - (void)viewDidLoad { | 43 | - (void)viewDidLoad { |
| 44 | [super viewDidLoad]; | 44 | [super viewDidLoad]; |
| 45 | + NSTimeInterval time = 300; | ||
| 46 | + if ([_model.id isEqualToString:@"1"]) { | ||
| 47 | + time = 60; | ||
| 48 | + } | ||
| 45 | UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:_paramDic]; | 49 | UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:_paramDic]; |
| 50 | + [CNLiveClassifyJumpBridge listViewRefreshWithVC:subVC pageType:_model.pageType.integerValue param:_paramDic refreshTime:time]; | ||
| 46 | [self.view addSubview:subVC.view]; | 51 | [self.view addSubview:subVC.view]; |
| 47 | [self addChildViewController:subVC]; | 52 | [self addChildViewController:subVC]; |
| 48 | [subVC didMoveToParentViewController:self]; | 53 | [subVC didMoveToParentViewController:self]; |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
| @@ -512,7 +512,6 @@ | @@ -512,7 +512,6 @@ | ||
| 512 | #pragma mark - JXCategoryListContentViewDelegate | 512 | #pragma mark - JXCategoryListContentViewDelegate |
| 513 | -(UIView *)listView | 513 | -(UIView *)listView |
| 514 | { | 514 | { |
| 515 | - [self refreshCurrentVCData]; | ||
| 516 | return self.view; | 515 | return self.view; |
| 517 | } | 516 | } |
| 518 | #pragma mark - JXCategoryViewDelegate | 517 | #pragma mark - JXCategoryViewDelegate |