修复已知问题

yanglingyu
1 parent 9ac59be1
Showing 3 changed files with 33 additions and 35 deletions
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
@@ -85,9 +85,6 @@ static CGFloat moveHeight = 50;
     self.myCategoryView.cellWidthZoomEnabled = YES;
     self.myCategoryView.cellWidthZoomScale = 1.3;
     self.myCategoryView.imageSize = CGSizeMake(56, 18);
-    if (!self.isLoading) {
-        [self uploadSubViews];
-    }
     if (![CNUserShareManager isLogin]) {
         NSString *showGuide = [[NSUserDefaults standardUserDefaults] objectForKey:CNLiveNetAddShowGuideKey];
         if ([showGuide isEqualToString:@"1"] && ![BHConfig boolValue:ChannelsShowGuide]) {
@@ -110,17 +107,18 @@ static CGFloat moveHeight = 50;
     if (!CNLiveStringIsEmpty(channelId)) {
         selectChannelId = [self containsWithChannelId:channelId];
         if (selectChannelId != -1) {
+            self.ld_currentIndex = selectChannelId;
             self.isLoginIndex = selectChannelId;
         }
     }
     if ([CNWebRedirectHandle manager].isClickedIntegral) {
         [CNWebRedirectHandle manager].isClickedIntegral = NO;
-        [self categoryView:self.myCategoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].channelId];
+        self.ld_currentIndex = [CNWebRedirectHandle manager].channelId;
         NSNumber *key = @([CNWebRedirectHandle manager].classifyId);
         CNLiveSubSegmentController *svc = (CNLiveSubSegmentController *)self.listContainerView.validListDict[key];
         if([svc isKindOfClass:[CNLiveSubSegmentController class]]){
             //目击者 - 今日要闻 - 中国冰雪
-            [svc categoryView:svc.categoryView didSelectedItemAtIndex:[CNWebRedirectHandle manager].classifyId];
+            [svc categoryViewSelectedItemAtIndex:[CNWebRedirectHandle manager].classifyId];
         }
         [CNWebRedirectHandle manager].channelId = 0;
         [CNWebRedirectHandle manager].classifyId = 0;
@@ -130,11 +128,8 @@ static CGFloat moveHeight = 50;
             self.contentLogin = YES;
             if(selectChannelId == -1){
                 //我的频道中没有这个频道
-                [self categoryView:self.myCategoryView didSelectedItemAtIndex:self.ld_currentIndex];
                 self.fuzzyView =  [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowFuzzyView];
                 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(touristsLoginTipsViewIsClassify:) name:TouristloginTipsViewActionNotification object:nil];
-            } else {
-                [self categoryView:self.myCategoryView didSelectedItemAtIndex:selectChannelId];
             }
             //最后判断是否有url//
             NSString *url = [BHConfig get:LoginPrepositionUrl];
@@ -159,10 +154,12 @@ static CGFloat moveHeight = 50;
                     }
                 }
             }
-        } else {
-            [self categoryView:self.myCategoryView didSelectedItemAtIndex:self.ld_currentIndex];
         }
     }
+    self.categoryView.defaultSelectedIndex = self.ld_currentIndex;
+    if (!self.isLoading) {
+        [self uploadSubViews];
+    }
     if ([CNUserShareManager isLogin]) {
         [self.view addSubview:self.customChannelsBtn];
     }else
@@ -393,7 +390,6 @@ static CGFloat moveHeight = 50;
 -(void)updateSelectColors:(NSInteger)index
 {
     self.ld_currentIndex = index;
-    self.myCategoryView.defaultSelectedIndex = index;
     NSString *backgroundImage = [self.bgImages safetyObjectAtIndex:index];
     weakself
     [self.topBgImg sd_setImageWithURL:[NSURL URLWithString:backgroundImage] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
@@ -834,22 +830,22 @@ static CGFloat moveHeight = 50;
         }
         self.contentLogin = NO;
     }else{
-    NSDictionary *paramDic = nil;
-    if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
-         paramDic= @{
-            @"bgColor": model.backgroundColor?model.backgroundColor:@"",
-             @"backgroundImg": model.backgroundImgH5?model.backgroundImgH5:@"",
-             @"channelId":model.channelId?model.channelId:@"",
-             @"channelName":model.id?model.id:@"",
-             @"pageId":model.pageId?model.pageId:@"",
+        NSDictionary *paramDic = nil;
+        if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+            paramDic= @{
+                @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+                @"backgroundImg": model.backgroundImgH5?model.backgroundImgH5:@"",
+                @"channelId":model.channelId?model.channelId:@"",
+                @"channelName":model.id?model.id:@"",
+                @"pageId":model.pageId?model.pageId:@"",
+                @"isHiddenFirst":@(self.isHiddenFirst)
+            };
+        }else{
+            paramDic= @{
             @"isHiddenFirst":@(self.isHiddenFirst)
-        };
-    }else{
-        paramDic= @{
-           @"isHiddenFirst":@(self.isHiddenFirst)
-       };
-    }
-        NSTimeInterval time = 300;
+            };
+        }
+            NSTimeInterval time = 300;
         if ([model.id isEqualToString:@"1"]) {
             time = 60;
         }
@@ -81,6 +81,7 @@
             }
         }];
     }
+    [self handleDateWithChannelsArray];
     if (self.selectChannelId != -1) {
         NSString *classifyId = [BHConfig get:ChannelsSelectSecond];
         [BHConfig set:ChannelsSelectSecond value:@""];
@@ -89,12 +90,11 @@
             if(selectChannelId == -1){
                 //我的频道中没有这个频道
             } else {
-                self.myCategoryView.defaultSelectedIndex = selectChannelId;
                 self.ld_currentIndex = selectChannelId;
             }
         }
     }
-    [self handleDateWithChannelsArray];
+    
     // 添加二级频道右侧的搜索按钮
     [self.view addSubview:self.searchBtn];
     self.view.backgroundColor = [UIColor clearColor];
@@ -113,7 +113,10 @@
     lineView.indicatorWidth = 18;
     lineView.indicatorColor = self.textColor;
     self.myCategoryView.indicators = @[lineView];
-    [self.categoryView reloadData];
+    if (!self.ld_currentIndex) {
+        self.ld_currentIndex = 0;
+    }
+    self.categoryView.defaultSelectedIndex = self.ld_currentIndex;
     if ([self.channelId isEqualToString:@"219"]) {
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updatePlayingStatus:) name:WjjAudioPlayerStatusNotification object:nil];
@@ -196,7 +199,7 @@
         self.historyBtn.centerY = self.myCategoryView.height/2;
         width = self.historyBtn.left;
     }
-    self.myCategoryView.width = width;
+    self.myCategoryView.width = width-10;
 }
 #pragma mark - Notification
 - (void)updatePlayingStatus:(NSNotification *)notifi {
@@ -289,7 +292,6 @@
             [self.titles addObject:model.name];
             [array addObject:model];
             if (!CNLiveStringIsEmpty(model.defaultPage) && [model.defaultPage isEqualToString:@"1"]) {
-                self.myCategoryView.defaultSelectedIndex = [self.pageListArr indexOfObject:model];
                 self.ld_currentIndex = [self.pageListArr indexOfObject:model];
             }
         }
@@ -324,7 +326,7 @@
                 width = self.historyBtn.left;
             }
-            self.myCategoryView.width = width;
+            self.myCategoryView.width = width-10;
     } else {
         // 变窄
@@ -339,7 +341,7 @@
             } else if ([self.channelId isEqualToString:@"11"]) {
                 self.historyBtn.right = self.searchBtn.left - 15;
             }
-            self.myCategoryView.width = self.searchBtn.left;
+            self.myCategoryView.width = self.searchBtn.left-10;
     }
 }
@@ -510,13 +512,13 @@
 #pragma mark - JXCategoryListContentViewDelegate
 -(UIView *)listView
 {
+    [self refreshCurrentVCData];
     return self.view;
 }
 #pragma mark - JXCategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index
 {
     self.navigationController.interactivePopGestureRecognizer.enabled = (index ==0);
-    self.myCategoryView.defaultSelectedIndex = index;
         self.ld_currentIndex = index;
         if (index != self.myCategoryView.selectedIndex) {
             [[NSNotificationCenter defaultCenter] postNotificationName:WjjH5StopVideoPlayerNotification object:nil];
@@ -44,7 +44,7 @@
     [BHConfig set:ChannelsSelectFirst value:@"0"];
     [CNTools GetClassifyChannelsUrlsAndSave];
     self.title = @"首页";
-    segArr = @[@"分类",@"百度小程序"];
+    segArr = @[@"分类"];
     [self.view addSubview:self.collectionView];
 }
 -(void)viewDidAppear:(BOOL)animated