修复组件积分跳转问题

yanglingyu
1 parent 854436ad
Showing 5 changed files with 30 additions and 34 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Manager/CNLiveListManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.18'
+  s.version          = '0.0.19'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -110,16 +110,10 @@ static CGFloat moveHeight = 50;
         }
     }
     if ([CNWebRedirectHandle manager].isClickedIntegral) {
-        [CNWebRedirectHandle manager].isClickedIntegral = NO;
         self.ld_currentIndex = [CNWebRedirectHandle manager].channelId;
-        NSNumber *key = @([CNWebRedirectHandle manager].classifyId);
-        CNLiveSubSegmentController *svc = (CNLiveSubSegmentController *)self.listContainerView.validListDict[key];
-        if([svc isKindOfClass:[CNLiveSubSegmentController class]]){
-            //目击者 - 今日要闻 - 中国冰雪
-            [svc categoryViewSelectedItemAtIndex:[CNWebRedirectHandle manager].classifyId];
-        }
+        
         [CNWebRedirectHandle manager].channelId = 0;
-        [CNWebRedirectHandle manager].classifyId = 0;
+
     } else {
         if (!CNLiveStringIsEmpty(channelId)) {
@@ -649,7 +643,7 @@ static CGFloat moveHeight = 50;
 }
 -(void)scrollViewUp{
-    self.topBgImg.top -= moveHeight;
+    self.topBgImg.bottom -= moveHeight;
     self.myCategoryView.collectionView.top = -50-kStatusHeight;
     self.listContainerView.top = kStatusHeight;
     if ([CNUserShareManager isLogin]) {
@@ -660,7 +654,7 @@ static CGFloat moveHeight = 50;
     }
 }
 -(void)scrollViewDown{
-    self.topBgImg.top += moveHeight;
+    self.topBgImg.bottom = kStatusHeight+100;
     self.myCategoryView.top = kStatusHeight;
     self.myCategoryView.collectionView.top = 0;
     self.listContainerView.top = self.myCategoryView.bottom;
@@ -47,10 +47,10 @@
         time = 60;
     }
     UIViewController *subVC = [CNLiveClassifyJumpBridge ListViewWithPageType:_model.pageType.integerValue param:_paramDic];
-    [CNLiveClassifyJumpBridge listViewRefreshWithVC:subVC pageType:_model.pageType.integerValue param:_paramDic refreshTime:time];
     [self.view addSubview:subVC.view];
     [self addChildViewController:subVC];
     [subVC didMoveToParentViewController:self];
+    [CNLiveClassifyJumpBridge listViewRefreshWithVC:subVC pageType:_model.pageType.integerValue param:_paramDic refreshTime:time];
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
@@ -82,7 +82,13 @@
         }];
     }
     [self handleDateWithChannelsArray];
-    if (self.selectChannelId != -1) {
+    if ([CNWebRedirectHandle manager].isClickedIntegral) {
+        [CNWebRedirectHandle manager].isClickedIntegral = NO;
+        self.ld_currentIndex = [CNWebRedirectHandle manager].classifyId;
+        
+        
+        [CNWebRedirectHandle manager].classifyId = 0;
+    }else if (self.selectChannelId != -1) {
         NSString *classifyId = [BHConfig get:ChannelsSelectSecond];
         [BHConfig set:ChannelsSelectSecond value:@""];
         if (!CNLiveStringIsEmpty(classifyId)) {
@@ -316,33 +322,25 @@
             self.searchBtn.width = 66;
             self.searchBtn.right = KScreenWidth-12;
             [self.searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
-        CGFloat width = self.searchBtn.left;
-            if ([self.channelId isEqualToString:@"219"]) {
-                self.moreBtn.right = self.searchBtn.left - 15;
-                self.progressView.right = self.moreBtn.left-15;
-                width = self.progressView.left;
-            } else if ([self.channelId isEqualToString:@"11"]) {
-                self.historyBtn.right = self.searchBtn.left - 15;;
-                width = self.historyBtn.left;
-            }
-
-            self.myCategoryView.width = width-10;
+      
     } else {
         // 变窄
             self.searchBtn.width = 30;
             self.searchBtn.right = KScreenWidth-12;
-            self.searchBtn.titleLabel.text = nil;
             [self.searchBtn setTitle:nil forState:UIControlStateNormal];
-            
-            if ([self.channelId isEqualToString:@"219"]) {
-                self.moreBtn.right = self.searchBtn.left - 15;
-                self.progressView.right = self.moreBtn.left - 15;
-            } else if ([self.channelId isEqualToString:@"11"]) {
-                self.historyBtn.right = self.searchBtn.left - 15;
-            }
-            self.myCategoryView.width = self.searchBtn.left-10;
     }
+    CGFloat width = self.searchBtn.left;
+        if ([self.channelId isEqualToString:@"219"]) {
+            self.moreBtn.right = self.searchBtn.left - 15;
+            self.progressView.right = self.moreBtn.left-15;
+            width = self.progressView.left;
+        } else if ([self.channelId isEqualToString:@"11"]) {
+            self.historyBtn.right = self.searchBtn.left - 15;;
+            width = self.historyBtn.left;
+        }
+
+        self.myCategoryView.width = width-10;
 }
 -(void)refreshCurrentVCData
@@ -48,5 +48,9 @@
         }
     }
 }
-
+- (void)setIsHiddenFirst:(BOOL)isHiddenFirst
+{
+    _isHiddenFirst = isHiddenFirst;
+    !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(isHiddenFirst);
+}
 @end