iOS Team / CNLiveVideoClassifyKit · Commits

Commit 0432b5fa5cec5f035b46559ba6f5384512eef006

Authored by yanglingyu
1 parent 31feffd9

修改交互

Inline Side-by-side
Showing 3 changed files with 16 additions and 1 deletions
CNLiveVideoClassifyKit.podspec
  View file @0432b5f
@@ -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.0.9' 11 + s.version = '0.0.10'
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/Controller/CNLiveClassifySegmentController.m
  View file @0432b5f
@@ -51,6 +51,7 @@ static const CGFloat animationHeight = 15; @@ -51,6 +51,7 @@ static const CGFloat animationHeight = 15;
51 @property (nonatomic, assign) BOOL isLoading; 51 @property (nonatomic, assign) BOOL isLoading;
52 @property (nonatomic, assign) BOOL isDSShopChanged; 52 @property (nonatomic, assign) BOOL isDSShopChanged;
53 @property (nonatomic, assign) BOOL contentLogin;//从内容跳过来的 53 @property (nonatomic, assign) BOOL contentLogin;//从内容跳过来的
  54 +@property (nonatomic, assign)BOOL isHiddenFirst;//是否隐藏一级分类
54 55
55 @end 56 @end
56 57
@@ -662,6 +663,7 @@ static CGFloat moveHeight = 50; @@ -662,6 +663,7 @@ static CGFloat moveHeight = 50;
662 return; 663 return;
663 } 664 }
664 self.findScrollView.scrollEnabled = !isUp; 665 self.findScrollView.scrollEnabled = !isUp;
  666 + self.isHiddenFirst = isUp;
665 [UIView animateWithDuration:0.3 animations:^{ 667 [UIView animateWithDuration:0.3 animations:^{
666 if (isUp) { 668 if (isUp) {
667 [self scrollViewUp]; 669 [self scrollViewUp];
@@ -850,7 +852,12 @@ static CGFloat moveHeight = 50; @@ -850,7 +852,12 @@ static CGFloat moveHeight = 50;
850 @"channelId":model.channelId?model.channelId:@"", 852 @"channelId":model.channelId?model.channelId:@"",
851 @"channelName":model.id?model.id:@"", 853 @"channelName":model.id?model.id:@"",
852 @"pageId":model.pageId?model.pageId:@"", 854 @"pageId":model.pageId?model.pageId:@"",
  855 + @"isHiddenFirst":@(self.isHiddenFirst)
853 }; 856 };
  857 + }else{
  858 + paramDic= @{
  859 + @"isHiddenFirst":@(self.isHiddenFirst)
  860 + };
854 } 861 }
855 NSTimeInterval time = 300; 862 NSTimeInterval time = 300;
856 if ([model.id isEqualToString:@"1"]) { 863 if ([model.id isEqualToString:@"1"]) {
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
  View file @0432b5f
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
21 @property (nonatomic, strong) UIButton *historyBtn;//历史记录 21 @property (nonatomic, strong) UIButton *historyBtn;//历史记录
22 @property (nonatomic, strong) UIButton *downloadingBtn;//听见中国下载按钮 22 @property (nonatomic, strong) UIButton *downloadingBtn;//听见中国下载按钮
23 23
  24 +@property (nonatomic, assign)BOOL isHiddenFirst;//是否隐藏一级分类
  25 +
24 26
25 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr; 27 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
26 @property (nonatomic, strong)UIColor *textColor; 28 @property (nonatomic, strong)UIColor *textColor;
@@ -310,6 +312,7 @@ @@ -310,6 +312,7 @@
310 return; 312 return;
311 } 313 }
312 self.findScrollView.scrollEnabled = show; 314 self.findScrollView.scrollEnabled = show;
  315 + self.isHiddenFirst = show;
313 weakself 316 weakself
314 [UIView animateWithDuration:0.3 animations:^{ 317 [UIView animateWithDuration:0.3 animations:^{
315 [weakSelf uploadUIWithIsUp:show]; 318 [weakSelf uploadUIWithIsUp:show];
@@ -537,7 +540,12 @@ @@ -537,7 +540,12 @@
537 @"channelId":model.channelId?model.channelId:@"", 540 @"channelId":model.channelId?model.channelId:@"",
538 @"channelName":model.id?model.id:@"", 541 @"channelName":model.id?model.id:@"",
539 @"pageId":model.pageId?model.pageId:@"", 542 @"pageId":model.pageId?model.pageId:@"",
  543 + @"isHiddenFirst":@(self.isHiddenFirst)
540 }; 544 };
  545 + }else{
  546 + paramDic= @{
  547 + @"isHiddenFirst":@(self.isHiddenFirst)
  548 + };
541 } 549 }
542 NSTimeInterval time = 300; 550 NSTimeInterval time = 300;
543 if ([model.id isEqualToString:@"1"]) { 551 if ([model.id isEqualToString:@"1"]) {