iOS Team / CNLiveVideoClassifyKit · Commits

Commit fe2e0c9eaa4173a4e22bb1b826f3df82d6a8770e

Authored by yanglingyu
1 parent 65625927

scrollview控制显示

Inline Side-by-side
Showing 2 changed files with 0 additions and 5 deletions
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
  View file @fe2e0c9
@@ -627,10 +627,6 @@ static CGFloat moveHeight = 50; @@ -627,10 +627,6 @@ static CGFloat moveHeight = 50;
627 } 627 }
628 -(void)scrollViewUpDowm:(BOOL)isUp 628 -(void)scrollViewUpDowm:(BOOL)isUp
629 { 629 {
630 - if (isUp != self.listContainerView.scrollView.isScrollEnabled) {  
631 - return;  
632 - }  
633 - self.listContainerView.scrollView.scrollEnabled = !isUp;  
634 self.isHiddenFirst = isUp; 630 self.isHiddenFirst = isUp;
635 [UIView animateWithDuration:0.3 animations:^{ 631 [UIView animateWithDuration:0.3 animations:^{
636 if (isUp) { 632 if (isUp) {
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
  View file @fe2e0c9
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 CGFloat contentOffset = scrollView.contentOffset.y; 39 CGFloat contentOffset = scrollView.contentOffset.y;
40 CGFloat distanceFromBottom = scrollView.contentSize.height - contentOffset; 40 CGFloat distanceFromBottom = scrollView.contentSize.height - contentOffset;
41 CGFloat offset = contentOffset - beginoffsetY; 41 CGFloat offset = contentOffset - beginoffsetY;
42 - beginoffsetY = contentOffset;  
43 if (offset > 0 && contentOffset > 0 && !self.isHiddenFirst) { 42 if (offset > 0 && contentOffset > 0 && !self.isHiddenFirst) {
44 self.isHiddenFirst = YES; 43 self.isHiddenFirst = YES;
45 !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(YES); 44 !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(YES);