no message

yanglingyu
1 parent 0af8ba95
Showing 1 changed file with 33 additions and 5 deletions
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
@@ -88,18 +88,27 @@
     UIViewController *vc = self.childViewControllers[0];
     if (([CNLiveListController searchProperties:[vc class] string:@"webView"]||[CNLiveListController searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
         WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
-        [webView.scrollView removeObserver:self forKeyPath:@"contentOffset"];
+        if ([self isObj:webView.scrollView hasObserverKey:@"contentOffset"]) {
+            [webView.scrollView removeObserver:self forKeyPath:@"contentOffset"];
+        }
+        
         if ([webView.scrollView valueForKey:@"mj_header"]) {
             id header = [webView.scrollView valueForKey:@"mj_header"];
-            [header removeObserver:self forKeyPath:@"state"];
+            if ([self isObj:header hasObserverKey:@"state"]) {
+                [header removeObserver:self forKeyPath:@"state"];
+            }
         }
     }else if ([CNLiveListController searchProperties:[vc class] string:@"collectionView"]&&[vc valueForKey:@"collectionView"] && [[vc valueForKey:@"collectionView"] isKindOfClass:[UICollectionView class]]){
         UICollectionView *collectionView = (UICollectionView *)[vc valueForKey:@"collectionView"];
-        [collectionView removeObserver:self forKeyPath:@"contentOffset"];
+        if ([self isObj:collectionView hasObserverKey:@"contentOffset"]) {
+            [collectionView removeObserver:self forKeyPath:@"contentOffset"];
+        }
         if ([collectionView valueForKey:@"mj_header"]) {
             id header = [collectionView valueForKey:@"mj_header"];
-            [header removeObserver:self forKeyPath:@"state"];
+            if ([self isObj:header hasObserverKey:@"state"]) {
+                [header removeObserver:self forKeyPath:@"state"];
+            }
         }
     }
 }
@@ -117,6 +126,25 @@
     }
     return NO;
 }
+-(BOOL)isObj:(NSObject *)obj hasObserverKey:(NSString *)keyPath{
+    if (obj == nil) {
+        return NO;
+    }
+    if (obj.observationInfo == nil) {
+        return NO;
+    }
+    NSObject *observances = [((__bridge NSObject*)(obj.observationInfo))valueForKeyPath:@"observances"];
+    if ([observances isKindOfClass:[NSArray class]]) {
+        for (NSObject *observance in (NSArray *)observances) {
+            NSString *inKeyPath = [NSString stringWithFormat:@"Key path: %@",keyPath];
+            NSString *objString = [NSString stringWithFormat:@"%@",observance];
+            if ([objString containsString:inKeyPath]) {
+                return YES;
+            }
+        }
+    }
+    return NO;
+}
 #pragma mark - KVO
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
@@ -138,7 +166,7 @@
         if (contentPointY>self.contentOffetY&&contentPointY>0) {
             [[CNLiveListManager shareListManager] firstHeaderUp:YES];
             self.contentOffetY = contentPointY;
-        }else if (self.contentOffetY > contentPointY &&contentPointY<scrollView.contentSize.height/2){
+        }else if (self.contentOffetY > contentPointY &&contentPointY<scrollView.contentSize.height-scrollView.height){
             self.contentOffetY = contentPointY;
             [[CNLiveListManager shareListManager] firstHeaderUp:NO];
         }