0.8.3视频号原生化

yanglingyu
1 parent f2c34735
Showing 26 changed files with 577 additions and 30 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/Witness/witness_video_type.imageset/Contents.json
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/Witness/witness_video_type.imageset/图层 4@2x.png
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/Witness/witness_video_type.imageset/图层 4@3x.png
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_person.imageset/Contents.json
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_person.imageset/个人主页@2x.png
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_person.imageset/个人主页@3x.png
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_search.imageset/Contents.json
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_search.imageset/搜索@2x.png
CNLiveVideoClassifyKit/Assets/CNLiveVideoClassifyKit.xcassets/classify/classify_search.imageset/搜索@3x.png
CNLiveVideoClassifyKit/Classes/CNVideoList/Controller/CNVideoListsDetailController.h
CNLiveVideoClassifyKit/Classes/CNVideoList/Controller/CNVideoListsDetailController.m
CNLiveVideoClassifyKit/Classes/CNVideoList/Model/CNVideoListsModel.h
CNLiveVideoClassifyKit/Classes/CNVideoList/Model/CNVideoListsModel.m
CNLiveVideoClassifyKit/Classes/CNVideoList/Present/CNVideoListsPresent.h
CNLiveVideoClassifyKit/Classes/CNVideoList/Present/CNVideoListsPresent.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Header/CNLivevideoClassifyPCH.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
CNLiveVideoClassifyKit/Classes/SearchView/Model/CNWitnessSearchModel.h
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.8.2'
+  s.version          = '0.8.3'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "图层 4@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "图层 4@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "个人主页@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "个人主页@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "搜索@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "搜索@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+//
+//  CNVideoListsDetailController.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/29.
+//
+typedef NS_ENUM(NSUInteger , CNVideoDetailType) {
+    CNVideoDetailTypeFollowd = 0,   //关注页
+    CNVideoDetailTypeRecommoned = 1,  //推荐页
+};
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNVideoListsDetailController : CNCommonViewController<JXCategoryListContentViewDelegate>
+/// 初始化
+/// @param type 页面类型
+- (instancetype)initWithPageType:(CNVideoDetailType)type;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNVideoListsDetailController.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/29.
+//
+
+#import "CNVideoListsDetailController.h"
+#import "CNWitnessSearchPresent.h"
+#import "CNWitnessSearchVideoCell.h"
+#import "CNWitnessSearchModel.h"
+#import "CNCollectionViewLayout.h"
+#import "CNLiveListManager.h"
+#import "CNVideoListsPresent.h"
+#import "CNVideoListsModel.h"
+
+static NSString *const CNWitnessSearchVideoCellID = @"CNWitnessSearchVideoCell";
+
+@interface CNVideoListsDetailController ()<UICollectionViewDelegate,UICollectionViewDataSource,CNWaterFallLayoutDelegate>
+@property (nonatomic, assign)CNVideoDetailType type;
+@property (nonatomic, strong)NSString *ts;
+@property (nonatomic, strong)UICollectionView *collectionView;
+@property (nonatomic, assign)NSInteger page;//请求页数
+@property (nonatomic, strong)NSMutableArray *dataSource;
+@property (nonatomic, strong)NSMutableArray *videoIDArray;
+
+@end
+
+@implementation CNVideoListsDetailController
+
+- (void)requestData{
+    if (![CNLiveNetworking isNetworking] && self.dataSource.count == 0) {
+        self.collectionView.mj_footer.hidden = YES;
+        [self showEmptyViewWithImage:[UIImage loadBundleImage:@"dd_wlcw"] text:@"网络开小差了,刷新试试" detailText:@"" buttonTitle:@"     刷新     " buttonAction:@selector(requestData)];
+        [self setCNAPIErrorEmptyView];
+        return;
+    }
+        weakself
+    [QMUITips showLoadingInView:self.view];
+    [CNWitnessSearchPresent requestSearchVideoListWithTS:self.ts type:self.type == CNVideoDetailTypeRecommoned ?@"1":@"2" searchType:1 tagId:@"" keyword:@"" page:self.page responseBlock:^(NSArray *dataArray, BOOL isLastPage, NSString *error) {
+        [QMUITips hideAllTips];
+        [weakSelf.collectionView.mj_footer endRefreshing];
+        [weakSelf.collectionView.mj_header endRefreshing];
+            if (error) {
+                if (weakSelf.page == 1) {
+                    weakSelf.collectionView.mj_footer.hidden = YES;
+                    [weakSelf showEmptyViewWithImage:[UIImage loadBundleImage:@"wufalianjie"] text:@"接口开小差了,试试重新请求" detailText:@"" buttonTitle:@"     重试     " buttonAction:@selector(requestData)];
+                    [weakSelf setCNAPIErrorEmptyView];
+                    return;
+                }
+                [QMUITips showWithText:error inView:self.view hideAfterDelay:1.5];
+                return;
+            }
+            if (weakSelf.page == 1 && dataArray == 0) {
+                weakSelf.collectionView.mj_footer.hidden = YES;
+                [weakSelf showEmptyViewWithImage:[UIImage loadBundleImage:@"zw_zt"] text:@"未搜索到相关内容哦" detailText:@"" buttonTitle:NULL buttonAction:NULL];
+                [weakSelf setCNAPIErrorEmptyView];
+                return;
+            }
+        weakSelf.collectionView.mj_footer.hidden = NO;
+        if (isLastPage) {
+            [weakSelf.collectionView.mj_footer endRefreshingWithNoMoreData];
+        }
+        [self.emptyView removeFromSuperview];
+        [self.dataSource addObjectsFromArray:dataArray];
+        [dataArray enumerateObjectsUsingBlock:^(CNWitnessSearchDetailModel *model, NSUInteger idx, BOOL * _Nonnull stop) {
+                [weakSelf.videoIDArray addObject:model.pid];
+        }];
+        [self.collectionView reloadData];
+        }];
+}
+- (void)requestGetpage{
+    weakself
+    [CNVideoListsPresent getDataWithPageId:@"2843" completionBlock:^(CNVideoListsModel * _Nonnull model) {
+        [weakSelf.videoIDArray insertObject:model.blockId atIndex:0];
+        CNWitnessSearchDetailModel *videoModel = [[CNWitnessSearchDetailModel alloc] init];
+        videoModel.title = model.blockName;
+        videoModel.poster = model.blockIcon;
+        videoModel.isHorizontalScreen = 0;
+        videoModel.pid = model.blockId;
+        videoModel.hidenPerson = YES;
+        [weakSelf.dataSource insertObject:videoModel atIndex:0];
+        [weakSelf.collectionView reloadData];
+    }];
+}
+- (void)dealloc
+{
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+    NSLog(@"CNWitnessSearchDetailController++++++销毁了");
+}
+- (instancetype)initWithPageType:(CNVideoDetailType)type
+{
+    if (self = [super init]) {
+        self.type = type;
+        self.page = 1;
+    }
+    return self;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self requestData];
+    if (self.type == CNVideoDetailTypeRecommoned) {
+        [self requestGetpage];
+    }
+    [self.view addSubview:self.collectionView];
+    [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.bottom.right.left.equalTo(self.view);
+    }];
+            //点赞
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoChangeWithParam:) name:@"WjjWitnessLikeStatusNotification" object:nil];
+        //关注
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoFocuseChange:) name:@"WjjAttentionUserStatusToJSNotification" object:nil];
+        //评论
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoCommentsChange:) name:WjjWitnessCommentNumberUpdateNotification object:nil];
+        //分享
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoShareChange:) name:WjjWitnessShareNotification object:nil];
+        //收藏
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoCollectChange:) name:WjjWitnessCollectStatusNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoPlaySuccess:) name:WjjVideoPaySuccessNotification object:nil];
+   
+}
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer{
+    return YES;
+}
+#pragma mark - KVO||Notification
+- (void)videoCollectChange:(NSNotification *)noti{
+    NSString *pid = [noti.userInfo objectForKey:@"contentId"];
+    if ([self.videoIDArray containsObject:pid]) {
+        NSInteger index = [self.videoIDArray indexOfObject:pid];
+        CNWitnessSearchDetailModel *model = self.dataSource[index];
+        NSString *selected = [noti.userInfo objectForKey:@"selected"];
+        model.tool.collectioned = [selected isEqualToString:@"true"];
+        if (model.tool.collectioned) {
+            model.tool.collectionNum += 1;
+        }else{
+            model.tool.collectionNum -= 1;
+        }
+    }
+}
+- (void)videoShareChange:(NSNotification *)noti{
+    NSString *pid = [noti.userInfo objectForKey:@"contentId"];
+    if ([self.videoIDArray containsObject:pid]) {
+        NSInteger index = [self.videoIDArray indexOfObject:pid];
+        CNWitnessSearchDetailModel *model = self.dataSource[index];
+        model.tool.shareNum += 1;
+    }
+}
+- (void)videoCommentsChange:(NSNotification *)noti{
+    NSString *pid = [noti.userInfo objectForKey:@"contentId"];
+    if ([self.videoIDArray containsObject:pid]) {
+        NSInteger index = [self.videoIDArray indexOfObject:pid];
+        CNWitnessSearchDetailModel *model = self.dataSource[index];
+        model.tool.commentsNum = [noti.userInfo stringForKey:@"number"].integerValue;
+    }
+}
+- (void)videoFocuseChange:(NSNotification *)noti{
+    NSString *pid = [noti.userInfo objectForKey:@"contentId"];
+    if ([self.videoIDArray containsObject:pid]) {
+        NSInteger index = [self.videoIDArray indexOfObject:pid];
+        CNWitnessSearchDetailModel *model = self.dataSource[index];
+        NSString *focused = [noti.userInfo objectForKey:@"focused"];
+        model.icon.focused = [focused isEqualToString:@"true"];
+    }
+}
+- (void)videoChangeWithParam:(NSNotification *)noti{
+    if ([noti.userInfo boolForKey:@"isCurrent"]) {
+        return;
+    }
+    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]]];
+    }
+}
+- (void)videoPlaySuccess:(NSNotification *)noti{
+    NSString *productId = [noti.userInfo objectForKey:@"productId"];
+    [self.dataSource enumerateObjectsUsingBlock:^(CNWitnessSearchDetailModel *detailModel, NSUInteger idx, BOOL * _Nonnull stop) {
+        if ([detailModel.product.productId isEqualToString:productId]) {
+            detailModel.product.check = @"1";
+        }
+    }];
+}
+#pragma mark - UICollectionViewDelegate
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    CNWitnessSearchDetailModel *model = self.dataSource[indexPath.row];
+    if (model.hidenPerson) {
+        [CNVideoListsPresent getBlockContentsWithBlockId:model.pid completionBlock:^(NSArray * _Nonnull array, NSString * _Nonnull errorStr) {
+            if (errorStr) {
+                [QMUITips showWithText:errorStr];
+                return;
+            }
+            [CNLiveClassifyJumpBridge openVideoPlayerVCWithCurrentIndex:@"0" dataList:array];
+        }];
+    }else{
+        CNWitnessSearchDetailModel *recommendModel = self.dataSource[0];
+        if (recommendModel.hidenPerson){
+            [self.dataSource removeFirstObject];
+        }
+        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;
+}
+- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
+    CNWitnessSearchVideoCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:CNWitnessSearchVideoCellID forIndexPath:indexPath];
+    cell.model = self.dataSource[indexPath.row];
+        return cell;
+   
+}
+#pragma mark - CNWaterFallLayoutDelegate
+//通过代理得到每个item 的一个高度
+- (CGFloat)collectionViewLayout:(CNCollectionViewLayout*)layout heightAtIndexPath:(NSIndexPath*)indexPath{
+    CNWitnessSearchDetailModel *model = self.dataSource[indexPath.row];
+           CGFloat oneHeight = [@"北" heightForFont:UIFontMake(15) width:(kScreenWidth-33)/2-20];
+           CGFloat totalHeight = [model.title heightForFont:UIFontMake(15) width:(kScreenWidth-33)/2-20];
+           if (totalHeight > oneHeight *2) {
+               totalHeight = oneHeight *2;
+           }
+    if (model.hidenPerson) {
+        return 270 + totalHeight;
+    }
+    if (model.isHorizontalScreen == 1) {
+               return 192 + totalHeight;
+           }
+           else{
+               return 290 + totalHeight;
+           }
+}
+
+#pragma mark - Getting
+- (UICollectionView *)collectionView
+{
+    if (!_collectionView) {
+            CNCollectionViewLayout *layout = [[CNCollectionViewLayout alloc] init];
+            layout.delegate = self;
+            layout.colCount = 2;
+            layout.colSpace = 9;
+            layout.lineSpace = 9;
+            layout.sectionInsets = UIEdgeInsetsMake(12, 12, 0, 12);
+            _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
+            _collectionView.backgroundColor = UIColorWhite;
+        _collectionView.delegate = self;
+        _collectionView.dataSource = self;
+        _collectionView.showsVerticalScrollIndicator = NO;
+        [_collectionView registerClass:[CNWitnessSearchVideoCell class] forCellWithReuseIdentifier:CNWitnessSearchVideoCellID];
+        weakself
+        _collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+            weakSelf.page ++;
+            [weakSelf requestData];
+        }];
+        _collectionView.mj_header = [CNLiveRefreshHeader headerWithRefreshingBlock:^{
+            [weakSelf.dataSource removeAllObjects];
+            [weakSelf.videoIDArray removeAllObjects];
+            [weakSelf requestData];
+            if (weakSelf.type == CNVideoDetailTypeRecommoned) {
+                [weakSelf requestGetpage];
+            }
+        }];
+    }
+    return _collectionView;
+}
+- (NSMutableArray *)dataSource
+{
+    if (!_dataSource) {
+        _dataSource = [NSMutableArray array];
+    }
+    return _dataSource;
+}
+- (NSMutableArray *)videoIDArray{
+    if (!_videoIDArray) {
+        _videoIDArray = [NSMutableArray array];
+    }
+    return _videoIDArray;
+}
+#pragma mark - JXCategoryListContentViewDelegate
+- (UIView *)listView{
+    return self.view;
+}
+
+@end
+//
+//  CNVideoListsModel.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/31.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNVideoListsModel : NSObject
+@property (nonatomic, copy) NSString *blockId;
+@property (nonatomic, copy) NSString *blockName;
+@property (nonatomic, copy) NSString *moreUrl;
+@property (nonatomic, copy) NSString *contentType;
+@property (nonatomic, copy) NSString *time;
+@property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy) NSString *background;
+@property (nonatomic, copy) NSString *blockIcon;
+@property (nonatomic, copy) NSString *showType;
+@property (nonatomic, copy) NSString *rowNum;
+@property (nonatomic, copy) NSString *blockSubTitle;
+@property (nonatomic, copy) NSString *linkType;
+@property (nonatomic, copy) NSString *moreType;
+
+@property (nonatomic, strong) NSArray *contents;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNVideoListsModel.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/31.
+//
+
+#import "CNVideoListsModel.h"
+
+@implementation CNVideoListsModel
+
+@end
+//
+//  CNVideoListsPresent.h
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/31.
+//
+
+#import <Foundation/Foundation.h>
+@class CNVideoListsModel;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNVideoListsPresent : NSObject
++ (void)getDataWithPageId:(NSString *)pageId completionBlock:(void(^)(CNVideoListsModel *model))response;
++ (void)getBlockContentsWithBlockId:(NSString *)blockId completionBlock:(void(^)(NSArray *array,NSString *errorStr))response;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNVideoListsPresent.m
+//  CNLiveVideoClassifyKit
+//
+//  Created by iOS on 2023/1/31.
+//
+
+#import "CNVideoListsPresent.h"
+#import "CNVideoListsModel.h"
+
+@implementation CNVideoListsPresent
++ (void)getDataWithPageId:(NSString *)pageId completionBlock:(void(^)(CNVideoListsModel *model))response{
+    
+    NSDictionary *params = @{@"pageId":@"2843",//@"2843"，@"38"
+                             @"userId":CNUserShareModel.uid};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:YES];//是否只要data字段数据
+    [CNLiveNetworking setupShowResult:YES];
+    //http://cmstest.cnlive.com:8768/contentApi/getPage?pageId=38&userId=353417
+    //http://cms.cnlive.com:8768/ CNGetClassifyPageUrl
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetClassifyPageUrl  Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (responseObject && [responseObject isKindOfClass:[NSArray class]]) {
+            CNVideoListsModel *model = [CNVideoListsModel mj_objectWithKeyValues:responseObject[0]];
+            if (response) {
+                response(model);
+            }
+        }
+    }];
+}
++ (void)getBlockContentsWithBlockId:(NSString *)blockId completionBlock:(nonnull void (^)(NSArray * _Nonnull, NSString * _Nonnull))response{
+    NSDictionary *params = @{
+                            @"blockId": @"9",
+                            @"userId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                            @"type":@"1",
+                            @"page":@"1",
+                            @"pageSize":@"10"
+    };
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/contentApi/getBlockContents") Param:params CacheType:NO CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        NSString*errorMessage = nil;
+        NSArray *array = nil;
+        if (error) {
+            errorMessage = @"服务器连接错误，请稍后再试";
+        }else{
+            if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
+                NSDictionary *data = responseObject[@"data"];
+                if (data && [data isKindOfClass:[NSDictionary class]]) {
+                    NSArray *dataArray = data[@"list"];
+                    if (dataArray &&[dataArray isKindOfClass:[NSArray class]]) {
+                        array = dataArray;
+                    }
+                }
+            }
+            if (!array) {
+                errorMessage = @"数据错误，请确定为最新版本";
+            }
+        }
+        if (response) {
+            response(array,errorMessage);
+        }
+    }];
+}
+@end
@@ -7,6 +7,30 @@
 #ifndef CNLivevideoClassifyPCH_h
 #define CNLivevideoClassifyPCH_h
+//关注
+#ifndef WjjAttentionUserStatusToJSNotification
+#define WjjAttentionUserStatusToJSNotification  @"WjjAttentionUserStatusToJSNotification"
+#endif
+//评论
+#ifndef WjjWitnessCommentNumberUpdateNotification
+#define WjjWitnessCommentNumberUpdateNotification @"WjjWitnessCommentNumberUpdateNotification"
+#endif
+//分享
+#ifndef WjjWitnessShareNotification
+#define WjjWitnessShareNotification  @"WjjWitnessShareNotification"
+#endif
+//点赞
+#ifndef WjjWitnessLikeStatusNotification
+#define WjjWitnessLikeStatusNotification @"WjjWitnessLikeStatusNotification"
+#endif
+//收藏
+#ifndef WjjWitnessCollectStatusNotification
+#define WjjWitnessCollectStatusNotification @"WjjWitnessCollectStatusNotification"
+#endif
+//付费视频
+#ifndef WjjVideoPaySuccessNotification
+#define WjjVideoPaySuccessNotification @"WjjVideoPaySuccessNotification"
+#endif
 #import <JXCategoryView/JXCategoryTitleImageView.h>
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 用户信息变动，修改关注状态
 /// @param jsonStr 返回参数
 + (void)personMessageChange:(NSString *)jsonStr;
+/// 跳转短视频列表页
++ (void)pushVideoLists;
 @end
 NS_ASSUME_NONNULL_END
@@ -9,6 +9,7 @@
 #import "CNLiveClassifySegmentController.h"
 #import "CNWitnessSearchViewController.h"
 #import "CNWitnessSearchModel.h"
+#import "CNVideoListsController.h"
 @interface CNLiveListManager()
 {
@@ -59,4 +60,8 @@
 {
     [CNLiveListManager shareListManager].personMessage = [jsonStr mj_JSONObject];
 }
++ (void)pushVideoLists{
+    CNVideoListsController *vc = [[CNVideoListsController alloc] init];
+    [[BaseAppDelegate sharedAppDelegate] pushViewController:vc];
+}
 @end
@@ -94,6 +94,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong)NSDictionary *block;
 @property (nonatomic, strong)CNAmuseContentProductModel *product;
+@property (nonatomic, assign)BOOL hidenPerson;//隐藏用户信息
 @end
 NS_ASSUME_NONNULL_END
@@ -30,7 +30,7 @@
 /// @param keyword 搜索关键词
 /// @param page 页数
 /// @param responseBlock 返回
-+ (void)requestSearchVideoListWithTS:(NSString *)ts searchType:(NSInteger)searchType tagId:(NSString *)tagId keyword:(NSString *)keyword page:(NSInteger)page responseBlock:(void (^)(NSArray *dataArray ,BOOL isLastPage, NSString *error))responseBlock;
++ (void)requestSearchVideoListWithTS:(NSString *)ts type:(NSString *)type searchType:(NSInteger)searchType tagId:(NSString *)tagId keyword:(NSString *)keyword page:(NSInteger)page responseBlock:(void (^)(NSArray *dataArray ,BOOL isLastPage, NSString *error))responseBlock;
 /// 视频点赞
 /// @param pid 未知
 /// @param contentSid 未知
@@ -56,13 +56,13 @@
     return modelArray;
 }
-+ (void)requestSearchVideoListWithTS:(NSString *)ts searchType:(NSInteger)searchType tagId:(NSString *)tagId keyword:(NSString *)keyword page:(NSInteger)page responseBlock:(void (^)(NSArray *, BOOL, NSString *))responseBlock{
++ (void)requestSearchVideoListWithTS:(NSString *)ts type:(NSString *)type searchType:(NSInteger)searchType tagId:(NSString *)tagId keyword:(NSString *)keyword page:(NSInteger)page responseBlock:(void (^)(NSArray *, BOOL, NSString *))responseBlock{
     NSDictionary *params = @{
         @"ts":ts?ts:@"",
         @"userId":CNUserShareModelUid,
         @"keyword":keyword?keyword:@"",
         @"searchType":@(searchType),
-        @"type":@"1",
+        @"type":type,
         @"tagId":tagId?tagId:@"",
         @"page":@(page),
         @"pageSize":@(10)
@@ -18,6 +18,7 @@
 @property (nonatomic, strong)UIImageView *authInfoImage;
 @property (nonatomic, strong)UILabel *nameLabel;
 @property (nonatomic, strong)QMUIButton *likeBtn;
+@property (nonatomic, strong)UIImageView *typeImageView;
 @end
 @implementation CNWitnessSearchVideoCell
@@ -31,6 +32,7 @@
         [self.bgView addSubview:self.authInfoImage];
         [self.bgView addSubview:self.nameLabel];
         [self.bgView addSubview:self.likeBtn];
+        [self.bgView addSubview:self.typeImageView];
         [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.bottom.left.right.equalTo(self.contentView);
         }];
@@ -38,6 +40,10 @@
             make.top.left.right.equalTo(self.contentView);
             make.height.mas_equalTo(242);
         }];
+        [self.typeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.right.top.equalTo(self.contentView);
+            make.width.height.mas_equalTo(29);
+        }];
         [self.playImage mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(self.contentView).offset(9);
             make.right.equalTo(self.contentView).offset(-9);
@@ -129,6 +135,19 @@
         [self.authInfoImage sd_setImageWithURL:[NSURL URLWithString:authModel.icon]];
     }
     [self.likeBtn sizeToFit];
+  self.playImage.hidden = self.logoImage.hidden = self.authInfoImage.hidden =  self.likeBtn.hidden = self.nameLabel.hidden = model.hidenPerson;
+    self.typeImageView.hidden = !model.hidenPerson;
+    if (model.hidenPerson) {
+        [self.videoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.contentView).offset(3);
+            make.right.equalTo(self.contentView).offset(-3);
+        }];
+    }else{
+        [self.videoImage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.contentView);
+            make.right.equalTo(self.contentView);
+        }];
+    }
 }
 #pragma mark - Getting
 - (UIView *)bgView{
@@ -211,4 +230,11 @@
     }
     return _likeBtn;
 }
+- (UIImageView *)typeImageView{
+    if (!_typeImageView) {
+        _typeImageView = [[UIImageView alloc] initWithImage:[UIImage loadBundleImage:@"witness_video_type"]];
+        
+    }
+    return _typeImageView;
+}
 @end
@@ -12,30 +12,7 @@
 #import "CNWitnessSearchModel.h"
 #import "CNCollectionViewLayout.h"
 #import "CNLiveListManager.h"
-//关注
-#ifndef WjjAttentionUserStatusToJSNotification
-#define WjjAttentionUserStatusToJSNotification  @"WjjAttentionUserStatusToJSNotification"
-#endif
-//评论
-#ifndef WjjWitnessCommentNumberUpdateNotification
-#define WjjWitnessCommentNumberUpdateNotification @"WjjWitnessCommentNumberUpdateNotification"
-#endif
-//分享
-#ifndef WjjWitnessShareNotification
-#define WjjWitnessShareNotification  @"WjjWitnessShareNotification"
-#endif
-//点赞
-#ifndef WjjWitnessLikeStatusNotification
-#define WjjWitnessLikeStatusNotification @"WjjWitnessLikeStatusNotification"
-#endif
-//收藏
-#ifndef WjjWitnessCollectStatusNotification
-#define WjjWitnessCollectStatusNotification @"WjjWitnessCollectStatusNotification"
-#endif
-//付费视频
-#ifndef WjjVideoPaySuccessNotification
-#define WjjVideoPaySuccessNotification @"WjjVideoPaySuccessNotification"
-#endif
+
 static NSString *const CNWitnessSearchVideoCellID = @"CNWitnessSearchVideoCell";
 static NSString *const CNWitnessSearchPersonCellID = @"CNWitnessSearchPersonCell";
 @interface CNWitnessSearchDetailController ()<UICollectionViewDelegate,UICollectionViewDataSource,CNWaterFallLayoutDelegate,UIGestureRecognizerDelegate>
@@ -58,7 +35,7 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
     }
         weakself
     [QMUITips showLoadingInView:self.view];
-    [CNWitnessSearchPresent requestSearchVideoListWithTS:self.ts searchType:self.type + 1 tagId:self.tagId keyword:self.searchStr page:self.page responseBlock:^(NSArray *dataArray, BOOL isLastPage, NSString *error) {
+    [CNWitnessSearchPresent requestSearchVideoListWithTS:self.ts type:@"1" searchType:self.type + 1 tagId:self.tagId keyword:self.searchStr page:self.page responseBlock:^(NSArray *dataArray, BOOL isLastPage, NSString *error) {
         [QMUITips hideAllTips];
         [weakSelf.collectionView.mj_footer endRefreshing];
             if (error) {
@@ -198,6 +198,7 @@
 		6003F5B5195388D20070C39A /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				81D25E332984C11200809E7A /* View */,
 				6003F5BB195388D20070C39A /* Tests.m */,
 				6003F5B6195388D20070C39A /* Supporting Files */,
 			);
@@ -235,6 +236,13 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
+		81D25E332984C11200809E7A /* View */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -45,7 +45,7 @@
     [BHConfig set:ChannelsSelectFirst value:@"0"];
     [CNTools GetClassifyChannelsUrlsAndSave];
     self.title = @"首页";
-    segArr = @[@"分类",@"搜索",@"搜索文字"];
+    segArr = @[@"分类",@"搜索",@"搜索文字",@"短视频"];
     [self.view addSubview:self.collectionView];
 }
 -(void)viewDidAppear:(BOOL)animated
@@ -85,6 +85,9 @@
             [CNLiveListManager pushWitnessSearchVCWithSearchStr:@{@"tagId":@"1",@"tagName":@"爆料"}];
         }
             break;
+        case 3:{
+            [CNLiveListManager pushVideoLists];
+        }break;
         default:
             break;
     }