Commit 39206ec1c8b204a8e5e9fbb7fa2ec42473d56fba
1 parent
89ce97ec
修改判断方式0.5.9
Showing
2 changed files
with
5 additions
and
12 deletions
CNLiveVideoClassifyKit.podspec
| @@ -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.5.8' | 11 | + s.version = '0.5.9' |
| 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/SearchView/ViewController/CNWitnessSearchViewController.m
| @@ -76,21 +76,14 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView | @@ -76,21 +76,14 @@ static NSString *const CNWitnessSearchHeaderViewID = @"CNWitnessSearchHeaderView | ||
| 76 | make.width.mas_equalTo(kScreenWidth); | 76 | make.width.mas_equalTo(kScreenWidth); |
| 77 | }]; | 77 | }]; |
| 78 | } | 78 | } |
| 79 | -- (void)viewDidAppear:(BOOL)animated{ | ||
| 80 | - [super viewDidAppear:animated]; | ||
| 81 | - self.navigationController.interactivePopGestureRecognizer.delegate = self; | ||
| 82 | -} | ||
| 83 | -- (void)viewDidDisappear:(BOOL)animated{ | ||
| 84 | - [super viewDidDisappear:animated]; | ||
| 85 | - self.navigationController.interactivePopGestureRecognizer.delegate = nil; | 79 | + |
| 80 | +- (void)viewWillDisappear:(BOOL)animated{ | ||
| 81 | + [super viewWillDisappear:animated]; | ||
| 82 | + self.navigationController.interactivePopGestureRecognizer.enabled = !self.listViewShow; | ||
| 86 | } | 83 | } |
| 87 | - (BOOL)preferredNavigationBarHidden{ | 84 | - (BOOL)preferredNavigationBarHidden{ |
| 88 | return YES; | 85 | return YES; |
| 89 | } | 86 | } |
| 90 | -#pragma mark - UIGestureRecognizerDelegate | ||
| 91 | -- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveEvent:(UIEvent *)event{ | ||
| 92 | - return !self.listViewShow; | ||
| 93 | -} | ||
| 94 | - (void)panGestureEvent:(UIPanGestureRecognizer *)gesture{ | 87 | - (void)panGestureEvent:(UIPanGestureRecognizer *)gesture{ |
| 95 | CGPoint translation = [gesture translationInView:gesture.view]; | 88 | CGPoint translation = [gesture translationInView:gesture.view]; |
| 96 | CGFloat sensitivePosition = kScreenWidth / 2.f; | 89 | CGFloat sensitivePosition = kScreenWidth / 2.f; |