添加交互0.4.4

yanglingyu
1 parent 5608678a
Showing 10 changed files with 135 additions and 7 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
CNLiveVideoClassifyKit/Classes/SearchView/View/CNWitnessSearchPersonCell.h
CNLiveVideoClassifyKit/Classes/SearchView/View/CNWitnessSearchPersonCell.m
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchDetailController.m
Example/CNLiveVideoClassifyKit/CNLiveClassifyKitImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.4.3'
+  s.version          = '0.4.4'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -60,6 +60,13 @@ NS_ASSUME_NONNULL_BEGIN
 /// 展示登录窗口
 /// @param loginPrepositionUrl 为appdelegate属性赋值字符串
 + (void)showLoginViewWithString:(NSString *)loginPrepositionUrl;
+/// 打开用户个人视频页
+/// @param params 传递参数
++ (void)openPersonMessage:(NSDictionary *)params;
+/// 打开视频播放页面
+/// @param currentIndex 当前选中
+/// @param dataList 视频数组
++ (void)openVideoPlayerVCWithCurrentIndex:(NSString *)currentIndex  dataList:(NSArray *)dataList;
 @end
 NS_ASSUME_NONNULL_END
@@ -72,4 +72,10 @@
 + (void)showLoginViewWithString:(NSString *)loginPrepositionUrl{
     [[CNLiveClassifyJumpBridge shareInstance].protocol showLoginViewWithString:loginPrepositionUrl];
 }
++ (void)openPersonMessage:(NSDictionary *)params{
+    [[CNLiveClassifyJumpBridge shareInstance].protocol openPersonMessage:params];
+}
++ (void)openVideoPlayerVCWithCurrentIndex:(NSString *)currentIndex dataList:(NSArray *)dataList{
+    [[CNLiveClassifyJumpBridge shareInstance].protocol openVideoPlayerVCWithCurrentIndex:currentIndex dataList:dataList];
+}
 @end
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveListManager : NSObject
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
 @property (nonatomic, assign) BOOL isHiddenFirst;
+@property (nonatomic, strong)NSDictionary *personMessage;
 +(instancetype)shareListManager;
 //第一分类是否隐藏：yes为隐藏
@@ -20,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
 + (CNCategoryBaseViewController *)CNCategoryBaseViewController;
 /// 跳转目击者搜索页
 + (void)pushWitnessSearchVC;
+/// 用户信息变动，修改关注状态
+/// @param jsonStr 返回参数
++ (void)personMessageChange:(NSString *)jsonStr;
 @end
 NS_ASSUME_NONNULL_END
@@ -8,6 +8,7 @@
 #import "CNLiveListManager.h"
 #import "CNLiveClassifySegmentController.h"
 #import "CNWitnessSearchViewController.h"
+#import "CNWitnessSearchModel.h"
 @interface CNLiveListManager()
 {
@@ -49,4 +50,8 @@
     _isHiddenFirst = isHiddenFirst;
     !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(isHiddenFirst);
 }
++ (void)personMessageChange:(NSString *)jsonStr
+{
+    [CNLiveListManager shareListManager].personMessage = [jsonStr mj_keyValues];
+}
 @end
@@ -101,6 +101,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param shopType 按着后台给的传
 /// @param currentVC 当前控制器
 -(void)skipType:(nonnull NSString*)type to:(nonnull NSString*)to shopType:(nonnull NSString*)shopType currentVC:(nonnull UIViewController*)currentVC;
+
+/// 打开用户个人视频页
+/// @param params 传递参数
+- (void)openPersonMessage:(NSDictionary *)params;
+/// 打开视频播放页面
+/// @param currentIndex 当前选中
+/// @param dataList 视频数组
+- (void)openVideoPlayerVCWithCurrentIndex:(NSString *)currentIndex  dataList:(NSArray *)dataList;
 @end
 NS_ASSUME_NONNULL_END
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNWitnessSearchPersonCell : UICollectionViewCell
 @property (nonatomic, strong)CNPersonMessageModel *model;
+@property (nonatomic, strong)void (^selectPersonBlock)(NSDictionary *dic);
 @end
 NS_ASSUME_NONNULL_END
@@ -96,6 +96,14 @@
         CAShapeLayer *maskLayer = [CAShapeLayer layer];
         maskLayer.path = path.CGPath;
         _logoImage.layer.mask = maskLayer;
+        _logoImage.userInteractionEnabled = YES;
+        weakself
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+            if (weakSelf.selectPersonBlock) {
+                weakSelf.selectPersonBlock([weakSelf.model mj_keyValues]);
+            }
+        }];
+        [_logoImage addGestureRecognizer:tap];
     }
     return _logoImage;
 }
@@ -11,6 +11,7 @@
 #import "CNWitnessSearchPersonCell.h"
 #import "CNWitnessSearchModel.h"
 #import "CNCollectionViewLayout.h"
+#import "CNLiveListManager.h"
 static NSString *const CNWitnessSearchVideoCellID = @"CNWitnessSearchVideoCell";
 static NSString *const CNWitnessSearchPersonCellID = @"CNWitnessSearchPersonCell";
@@ -20,6 +21,8 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
 @property (nonatomic, assign)NSInteger page;//请求页数
 @property (nonatomic, strong)NSString *ts;
 @property (nonatomic, strong)NSMutableArray *dataSource;
+@property (nonatomic, strong)NSMutableArray *personIDArray;
+@property (nonatomic, strong)NSMutableArray *videoIDArray;
 @end
 @implementation CNWitnessSearchDetailController
@@ -57,10 +60,28 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
         }
         [self.emptyView removeFromSuperview];
         [self.dataSource addObjectsFromArray:dataArray];
+        if (weakSelf.type == CNWitnessSearchDetailTypeVideo) {
+            [dataArray enumerateObjectsUsingBlock:^(CNWitnessSearchDetailModel *model, NSUInteger idx, BOOL * _Nonnull stop) {
+                [weakSelf.videoIDArray addObject:model.pid];
+            }];
+        }else{
+            [dataArray enumerateObjectsUsingBlock:^(CNPersonMessageModel *model, NSUInteger idx, BOOL * _Nonnull stop) {
+                [weakSelf.personIDArray addObject:model.id];
+            }];
+        }
+       
         [self.collectionView reloadData];
         }];
 }
-
+- (void)dealloc
+{
+    if (self.type == CNWitnessSearchDetailTypeVideo) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+    }else{
+        [[CNLiveListManager shareListManager] removeObserver:self forKeyPath:@"personMessage"];
+    }
+    
+}
 - (instancetype)initWithPageType:(CNWitnessSearchDetailType)type
 {
     if (self = [super init]) {
@@ -81,6 +102,12 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
         pan.delegate = self;
         [self.view addGestureRecognizer:pan];
     }
+    if (self.type == CNWitnessSearchDetailTypeVideo) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoChangeWithParam:) name:@"WjjWitnessLikeStatusNotification" object:nil];
+    }else{
+        [[CNLiveListManager shareListManager] addObserver:self forKeyPath:@"personMessage" options:NSKeyValueObservingOptionNew context:NULL];
+    }
+   
 }
 - (void)panGestureEvent:(UIPanGestureRecognizer *)gesture{
     if (self.panGestureBlock) {
@@ -90,11 +117,42 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer{
     return YES;
 }
+#pragma 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];
+            [self.dataSource replaceObjectAtIndex:index withObject:model];
+            [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:index inSection:0]]];
+        }
+    }
+}
+- (void)videoChangeWithParam:(NSNotification *)noti{
+    NSString *pid = [noti.userInfo objectForKey:@"contentId"];
+    if ([self.videoIDArray containsObject:pid]) {
+        NSInteger index = [self.videoIDArray indexOfObject:pid];
+        NSString *selected = [noti.userInfo objectForKey:@"selected"];
+        NSString *likesNumber = [noti.userInfo objectForKey:@"likesNum"];
+        CNWitnessSearchDetailModel *model = self.dataSource[index];
+        model.tool.liked = [selected isEqualToString:@"true"];
+        model.tool.likesNum = likesNumber.integerValue;
+        [self.collectionView reloadItemsAtIndexPaths:@[[NSIndexPath indexPathForItem:index inSection:0]]];
+    }
+}
 #pragma mark - UIGestureRecognizerDelegate
 -(void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
     [self.view endEditing:YES];
 }
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    if (self.type == CNWitnessSearchDetailTypeVideo) {
+        NSArray *dicArray = [NSDictionary mj_keyValuesArrayWithObjectArray:self.dataSource];
+        [CNLiveClassifyJumpBridge openVideoPlayerVCWithCurrentIndex:[NSString stringWithFormat:@"%ld",indexPath.row] dataList:dicArray.copy];
+    }
+}
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
     return self.dataSource.count;
@@ -107,9 +165,16 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
     }else{
         CNWitnessSearchPersonCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:CNWitnessSearchPersonCellID forIndexPath:indexPath];
         cell.model = self.dataSource[indexPath.row];
+        weakself
+        cell.selectPersonBlock = ^(NSDictionary * _Nonnull dic) {
+            [weakSelf openPersonMessage:dic];
+        };
         return cell;
     }
 }
+- (void)openPersonMessage:(NSDictionary *)param{
+    [CNLiveClassifyJumpBridge openPersonMessage:param];
+}
 #pragma mark - CNWaterFallLayoutDelegate
 //通过代理得到每个item 的一个高度
 - (CGFloat)collectionViewLayout:(CNCollectionViewLayout*)layout heightAtIndexPath:(NSIndexPath*)indexPath{
@@ -131,6 +196,12 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
     if (![_searchStr isEqualToString:searchStr]) {
         _searchStr = searchStr;
         [self.dataSource removeAllObjects];
+        if (self.type == CNWitnessSearchDetailTypeVideo) {
+            [self.videoIDArray removeAllObjects];
+        }else{
+            [self.personIDArray removeAllObjects];
+        }
+        
         [self.collectionView reloadData];
         self.page = 1;
         [self requestData];
@@ -170,10 +241,6 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
             weakSelf.page ++;
             [weakSelf requestData];
         }];
-//        UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-//            [weakSelf.view endEditing:YES];
-//        }];
-//        [_collectionView addGestureRecognizer:pan];
     }
     return _collectionView;
 }
@@ -184,6 +251,18 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
     }
     return _dataSource;
 }
+- (NSMutableArray *)personIDArray{
+    if (!_personIDArray) {
+        _personIDArray = [NSMutableArray array];
+    }
+    return _personIDArray;
+}
+- (NSMutableArray *)videoIDArray{
+    if (!_videoIDArray) {
+        _videoIDArray = [NSMutableArray array];
+    }
+    return _videoIDArray;
+}
 #pragma mark - JXCategoryListContentViewDelegate
 - (UIView *)listView{
     return self.view;
@@ -95,6 +95,16 @@
 - (void)skipType:(nonnull NSString *)type to:(nonnull NSString *)to shopType:(nonnull NSString *)shopType currentVC:(nonnull UIViewController *)currentVC {
 }
-
+/// 打开用户个人视频页
+/// @param params 传递参数
+- (void)openPersonMessage:(NSDictionary *)params{
+    
+}
+/// 打开视频播放页面
+/// @param currentIndex 当前选中
+/// @param dataList 视频数组
+- (void)openVideoPlayerVCWithCurrentIndex:(NSString *)currentIndex  dataList:(NSArray *)dataList{
+    
+}
 @end