0.5.1

yanglingyu
1 parent f45c8cea
Showing 4 changed files with 16 additions and 7 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchDetailController.m
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchListController.m
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.5.0'
+  s.version          = '0.5.1'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -117,13 +117,20 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer{
     return YES;
 }
-#pragma KVO||Notification
+#pragma mark - KVO||Notification
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
     if ([keyPath isEqualToString:@"personMessage"]) {
         NSDictionary *dic = change[NSKeyValueChangeNewKey];
-        CNPersonMessageModel *model = [CNPersonMessageModel mj_objectWithKeyValues:dic];
-        if ([self.personIDArray containsObject:model.id]) {
-            NSInteger index = [self.personIDArray indexOfObject:model.id];
+        if ([self.personIDArray containsObject:dic[@"id"]]) {
+            NSInteger index = [self.personIDArray indexOfObject:dic[@"id"]];
+            CNPersonMessageModel *model = self.dataSource[index];
+            if ([dic[@"followStatus"] isEqualToString:@"0"] && model.focused) {
+                    model.focused = NO;
+                model.fansNum -= 1;
+            }else if (([dic[@"followStatus"] isEqualToString:@"1"] ||[dic[@"followStatus"] isEqualToString:@"2"] )&& !model.focused){
+                model.focused = YES;
+            model.fansNum += 1;
+            }
             [self.dataSource replaceObjectAtIndex:index withObject:model];
             [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:index inSection:0]]];
         }
@@ -68,7 +68,8 @@
             self.listContainerView.scrollView.offsetX = lenth;
             self.lineView.x = self.lineX + lenth/3;
          } else if (gesture.state == UIGestureRecognizerStateEnded) {
-             if (lenth >= sensitivePosition || gesture.numberOfTouches < 0.5) {
+             CGPoint speed = [gesture velocityInView:gesture.view];
+             if (lenth >= sensitivePosition || speed.x != 0) {
                  [self.myCategoryView selectItemAtIndex:1];
              }else{
                  [self.listContainerView.scrollView setOffsetX:0
@@ -94,7 +94,8 @@ static NSString *const CNWitnessSearchHeaderViewID = @&quot;CNWitnessSearchHeaderView
               make.left.equalTo(self.view).offset(translation.x);
           }];
       } else if (gesture.state == UIGestureRecognizerStateEnded) {
-          if (translation.x >= sensitivePosition || gesture.numberOfTouches < 0.5) {
+          CGPoint speed = [gesture velocityInView:gesture.view];
+          if (translation.x >= sensitivePosition ||  speed.x != 0) {
               [self listViewShow:NO];
           }else{
               [self listViewShow:YES];