0.6.2

yanglingyu
1 parent 94d564cd
Showing 7 changed files with 33 additions and 7 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/CNGenesis/Model/CNAmuseContentProductModel.h
CNLiveVideoClassifyKit/Classes/SearchView/Model/CNWitnessSearchModel.h
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchDetailController.m
CNLiveVideoClassifyKit/Classes/SearchView/ViewController/CNWitnessSearchListController.m
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.6.1'
+  s.version          = '0.6.2'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -22,6 +22,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , copy) NSString                   *expiryDate;
 @property (nonatomic , copy) NSString                   *validPeriod;
 @property (nonatomic , copy) NSString                   *effectiveDate;
+@property (nonatomic , copy) NSString                   *check;
+@property (nonatomic , copy) NSString                   *albumProductType;
+@property (nonatomic , copy) NSString                   *androidOriginalRmb;
+@property (nonatomic , copy) NSString                   *iosOriginalRmb;
+@property (nonatomic , copy) NSString                   *productImg;
+@property (nonatomic , copy) NSString                   *productTitle;
+@property (nonatomic , copy) NSString                   *promCode;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -6,6 +6,7 @@
 //
 #import <Foundation/Foundation.h>
+#import "CNAmuseContentProductModel.h"
 NS_ASSUME_NONNULL_BEGIN
@@ -72,6 +73,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// 是否横屏
 @property (nonatomic, assign)NSInteger isHorizontalScreen;
 @property (nonatomic, assign)NSInteger videoShowType;
+
+@property (nonatomic, strong)NSDictionary *block;
+@property (nonatomic, strong)CNAmuseContentProductModel *product;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -32,6 +32,10 @@
 #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>
@@ -55,9 +59,6 @@ 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) {
-        if ([weakSelf.tagId isNotBlank]) {
-            weakSelf.tagId = @"";
-        }
         [QMUITips hideAllTips];
         [weakSelf.collectionView.mj_footer endRefreshing];
             if (error) {
@@ -136,6 +137,7 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
         [[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];
     }else{
         [[CNLiveListManager shareListManager] addObserver:self forKeyPath:@"personMessage" options:NSKeyValueObservingOptionNew context:NULL];
     }
@@ -218,6 +220,14 @@ static NSString *const CNWitnessSearchPersonCellID = @&quot;CNWitnessSearchPersonCell
         [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 - UIGestureRecognizerDelegate
 -(void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
@@ -46,7 +46,6 @@
     NSDictionary *controllers = self.listContainerView.validListDict;
     CNWitnessSearchListController *vc = controllers[@(index)];
     vc.searchStr = self.searchStr;
-    vc.tagId = self.tagId;
 }
 #pragma mark - JXCategoryListContainerViewDelegate
 - (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView{
@@ -90,6 +89,10 @@
     self.lineX = self.lineView.x;
     NSDictionary *controllers = self.listContainerView.validListDict;
     CNWitnessSearchListController *vc = controllers[@(self.selectIndex)];
+    vc.tagId = self.tagId;
+    if ([self.tagId isNotBlank]) {
+        self.tagId = @"";
+    }
     vc.searchStr = self.searchStr;
 }
 - (void)setSelectIndex:(NSInteger)selectIndex{
@@ -17,7 +17,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
     [BHContext shareInstance].application = application;
     [BHContext shareInstance].launchOptions = launchOptions;
@@ -82,7 +82,7 @@
             break;
         case 2:
         {
-            [CNLiveListManager pushWitnessSearchVCWithSearchStr:@{}];
+            [CNLiveListManager pushWitnessSearchVCWithSearchStr:@{@"tagId":@"1",@"tagName":@"爆料"}];
         }
             break;
         default: