交互问题修改提交

yanglingyu
1 parent da2663f3
Showing 10 changed files with 112 additions and 62 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLiveCommonDefines.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.m
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
Example/CNLiveVideoClassifyKit/CNLiveClassifyKitImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -13,8 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) JXCategoryBaseView *categoryView;
 @property (nonatomic, strong) UIPageViewController *pageViewController;
-@property (nonatomic, strong) UIScrollView *findScrollView;
-@property (nonatomic, strong) NSMutableArray *titles;
+@property (nonatomic, strong) UIScrollView *findScrollView;//控制器的scrollView
+@property (nonatomic, strong) NSMutableArray *titles;//标题
 @property (nonatomic, strong) NSMutableArray *controllersArr;/// 控制器数组
 @property (nonatomic, assign) NSInteger ld_currentIndex; //当前选中
@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveClassifySegmentController : CNCategoryBaseViewController
 @property (nonatomic, assign) BOOL isLoad;
-- (void)dataDivideIntoNormalAndOtherWithFirst:(BOOL)first;
 // 点击定制频道按钮进入定制
 - (void)customAction:(UIButton *)sender;
 @end
@@ -20,13 +20,12 @@ static const CGFloat animationHeight = 15;
 @interface CNLiveClassifySegmentController ()<JXCategoryViewDelegate,CNCustomChannelListViewDelegate,CNSubClassifySegmentControllerDelegate>
 @property (nonatomic, strong)JXCategoryTitleImageView *myCategoryView; //选择器
-@property (nonatomic, strong) UIButton                *customChannelsBtn;
-@property (nonatomic, strong) UIButton                *loginBtn;
-@property (nonatomic, strong) CNCustomChannelListView *customChannelsV;
+@property (nonatomic, strong) UIButton                *customChannelsBtn;//频道按钮
+@property (nonatomic, strong) UIButton                *loginBtn;//登录按钮
+@property (nonatomic, strong) CNCustomChannelListView *customChannelsV;//频道控制器窗口
 @property (nonatomic, strong) UIView *fuzzyView;//游客登录弹框
 @property (nonatomic, strong) UIImageView             *topBgImg; //头部图片
 @property (nonatomic, assign) CGFloat                  topBgImgHeight;//头部图片高度
-@property (nonatomic, assign) CGFloat               lastOffsetY;
 @property (nonatomic, assign) NSInteger       isLoginIndex;
@@ -143,7 +142,7 @@ static CGFloat moveHeight = 50;
                 }
                 else if ([url isEqualToString:@"judgeGiftUrl"]) {
                     NSURL *otherUrl = [BHConfig get:ActivityNewUrl];
-                    if (otherUrl && [CNUserShareManager isLogin]) {
+                    if (otherUrl&&![otherUrl isEqual:[NSURL URLWithString:@""]] && [CNUserShareManager isLogin]) {
                         [CNLiveClassifyJumpBridge checkForloginTurnToWithURL:otherUrl];
                     }
                 }
@@ -153,7 +152,7 @@ static CGFloat moveHeight = 50;
             } else {
                 if ([CNUserShareManager isLogin]) {
                     NSURL *otherUrl = [BHConfig get:ActivityNewUrl];
-                    if (otherUrl) {
+                    if (otherUrl &&![otherUrl isEqual:[NSURL URLWithString:@""]]) {
                         [CNLiveClassifyJumpBridge checkForloginTurnToWithURL:otherUrl];
                     }
                 }
@@ -413,7 +412,10 @@ static CGFloat moveHeight = 50;
     if ([locaVersion compare:guide options:NSNumericSearch]==NSOrderedAscending) {
         //show
         [BHConfig set:ChannelsShowGuide boolValue:YES];
-        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowGuideView];
+        NSDictionary *paramDic = @{
+            @"guide":guide
+        };
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpShowGuideView pageType:0 param:paramDic];
         return YES;
     } else {
         return NO;
@@ -747,32 +749,36 @@ static CGFloat moveHeight = 50;
             @"showName":model.showName?model.showName:@"",
             @"backgroundColor":model.backgroundColor?model.backgroundColor:@""
         };
-    }else if([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
-        paramDic= @{
-           @"bgColor": model.backgroundColor?model.backgroundColor:@"",
-            @"channelId":model.channelId?model.channelId:@"",
-            @"channelName":model.id?model.id:@"",
-            @"pageId":model.pageId?model.pageId:@"",
-       };
-    }else if ([model.pageType isEqualToString:@"2"]) {//电商中国
-        paramDic = @{
-            @"showName":model.showName?model.showName:@""
-        };
-    }else
-    {
-        BOOL isBlack = NO;
-        if (CNLiveStringIsEmpty(model.statusBarColor)) {
-            isBlack = YES;
-        } else {
-            isBlack = [model.statusBarColor boolValue];//1 黑色
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushOtherSegmentVC pageType:model.pageType.integerValue param:paramDic];
+        
+    }else{
+        if([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
+            paramDic= @{
+                @"bgColor": model.backgroundColor?model.backgroundColor:@"",
+                @"channelId":model.channelId?model.channelId:@"",
+                @"channelName":model.id?model.id:@"",
+                @"pageId":model.pageId?model.pageId:@"",
+            };
+        }else if ([model.pageType isEqualToString:@"2"]) {//电商中国
+            paramDic = @{
+                @"showName":model.showName?model.showName:@""
+            };
+        }else
+        {
+            BOOL isBlack = NO;
+            if (CNLiveStringIsEmpty(model.statusBarColor)) {
+                isBlack = YES;
+            } else {
+                isBlack = [model.statusBarColor boolValue];//1 黑色
+            }
+            paramDic= @{
+                @"title":   model.showName?model.showName:@"",
+                @"isBlack":@(isBlack),
+                @"thirdUrl":model.thirdUrl?model.thirdUrl:@""
+            };
+        }
+        [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushCustomVC pageType:model.pageType.integerValue param:paramDic];
         }
-        paramDic= @{
-           @"title": model.showName?model.showName:@"",
-           @"isBlack":@(isBlack),
-           @"thirdUrl":model.thirdUrl?model.thirdUrl:@""
-       };
-    }
-    [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushCustomVC pageType:model.pageType.integerValue param:paramDic];
 }
 - (void)closeCustomChannelsView {
@@ -835,7 +841,7 @@ static CGFloat moveHeight = 50;
     if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
          paramDic= @{
             @"bgColor": model.backgroundColor?model.backgroundColor:@"",
-             @"backgroundImg": model.backgroundImg?model.backgroundImg:@"",
+             @"backgroundImg": model.backgroundImgH5?model.backgroundImgH5:@"",
              @"channelId":model.channelId?model.channelId:@"",
              @"channelName":model.id?model.id:@"",
              @"pageId":model.pageId?model.pageId:@"",
@@ -456,7 +456,6 @@
 #pragma mark - TODO 历史
 - (void)historyAction:(UIButton *)sender {
     if (![CNUserShareManager isLogin]) {
-        [BHConfig set:LoginPrepositionUrl value:@""];
         [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
         return;
     }
@@ -481,7 +480,6 @@
 #pragma mark - TODO 听见中国-更多
 - (void)moreAction:(UIButton *)sender event:(UIEvent *)event{
     if (![CNUserShareManager isLogin]) {
-        [BHConfig set:LoginPrepositionUrl value:@""];
         [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:self pushType:CNLiveClassifyJumpPushLoginVC];
         return;
     }
@@ -20,6 +20,7 @@ typedef enum : NSUInteger {
     CNLiveClassifyJumpPushDownloadVC,
     CNLiveClassifyJumpPushSearchVC,
     CNLiveClassifyJumpPushAddDiviceVC,
+    CNLiveClassifyJumpPushOtherSegmentVC,
     CNLiveClassifyJumpPushCustomVC
 } CNLiveClassifyJumpType;
@@ -14,26 +14,47 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) id<CNLiveVideoClassifyProtocol> protocol;
 + (instancetype)shareInstance;
-
+/**
+ *返回需要加载的VC
+ *pageType加载页面类型
+ *param 传给View的参数
+ */
 + (UIViewController *)ListViewWithPageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
+/**
+ *刷新当时显示VC
+ *currentVC当前展示的页面VC
+ *pageType加载页面类型
+ *param 传给View的参数
+ *refreshTime刷新间隔时间
+ */
 + (void)listViewRefreshWithVC:(UIViewController *)currentVC pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param refreshTime:(NSTimeInterval)time;
-
+/**
+ *返回需要返回的VC和处理push操作
+ *currentVC当前控制器
+ *pushType 操作类型
+ */
 + (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type;
+/**
+ *返回需要返回的VC和处理push操作
+ *currentVC当前控制器
+ *pushType 操作类型
+ *pageType加载页面类型
+ *param 传给View的参数
+ */
 + (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param;
-
+//加载FTPopOverMenuConfiguration需要
 +(void)popOverShowEvent:(UIEvent *)event
                 imageDone:(FTPopDoneBlock)doneBlock
             dismissBlock:(FTPopDismissBlock)dismissBlock;
-+(void)showGuideShadeViewType:(NSInteger)type cellFrame:(CGRect)cellFrame cancelBlock:(FTPopDismissBlock)cancelBlock;
 + (void)checkForloginTurnToWithURL:(NSURL *)url;
 + (void)checkWithFunctionForShareURL:(NSString *)shareUrl;
 + (void)bringCenterLoginViewToFront;
-
+//获取播放状态
 + (BOOL)audioPlayerIsplaying;
 @end
@@ -35,7 +35,7 @@
 +(void)listViewRefreshWithVC:(UIViewController *)currentVC pageType:(NSInteger)pageType param:(NSDictionary *)param refreshTime:(NSTimeInterval)time
 {
-    
+    [[CNLiveClassifyJumpBridge shareInstance].protocol listViewRefreshWithVC:currentVC pageType:pageType param:param refreshTime:time];
 }
 +(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type
@@ -52,28 +52,18 @@
 }
 +(void)checkForloginTurnToWithURL:(NSURL *)url
 {
-    Class class = NSClassFromString(@"CNLiveSkipActionManager");
-    SEL sel = NSSelectorFromString(@"checkForloginTurnToWithURL");
-    if (class && sel) {
-        [class performSelector:sel withObject:url];
-    }
+    [[CNLiveClassifyJumpBridge shareInstance].protocol checkForloginTurnToWithURL:url];
 }
 +(void)checkWithFunctionForShareURL:(NSString *)shareUrl
 {
-    Class class = NSClassFromString(@"CNLiveSkipActionManager");
-    SEL sel = NSSelectorFromString(@"checkWithFunctionForShareURL");
-    if (class && sel) {
-        [class performSelector:sel withObject:shareUrl];
-    }
+    [[CNLiveClassifyJumpBridge shareInstance].protocol checkWithFunctionForShareURL:shareUrl];
 }
 + (void)bringCenterLoginViewToFront
 {
-    Class class = NSClassFromString(@"CNTouristsLoginView");
-    SEL sel = NSSelectorFromString(@"bringCenterLoginViewToFront");
-    [class performSelector:sel];
+    [[CNLiveClassifyJumpBridge shareInstance].protocol bringCenterLoginViewToFront];
 }
 + (BOOL)audioPlayerIsplaying
 {
@@ -14,16 +14,42 @@ typedef void(^FTPopDismissBlock)(void);
 NS_ASSUME_NONNULL_BEGIN
 @protocol CNLiveVideoClassifyProtocol <NSObject>
 /**
- *返回需要加载的View
+ *返回需要加载的VC
  *pageType加载页面类型
  *param 传给View的参数
  */
 -(UIViewController *)listViewShowPageType:(NSUInteger)pageType
                           param:(NSDictionary *)param;
+/**
+ *返回需要返回的VC和处理push操作
+ *currentVC当前控制器
+ *pushType 操作类型
+ *pageType加载页面类型
+ *param 传给View的参数
+ */
 -(UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC
                                 pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary *_Nullable)param;
+
+/**
+ *刷新当时显示VC
+ *currentVC当前展示的页面VC
+ *pageType加载页面类型
+ *param 传给View的参数
+ *refreshTime刷新间隔时间
+ */
+-(void)listViewRefreshWithVC:(UIViewController *)currentVC
+                    pageType:(NSInteger)pageType
+                       param:(NSDictionary *)param
+                 refreshTime:(NSTimeInterval)time;
+
 -(BOOL)audioPlayerIsplaying;
+- (void)checkForloginTurnToWithURL:(NSURL *)url;
+
+- (void)checkWithFunctionForShareURL:(NSString *)shareUrl;
+
+- (void)bringCenterLoginViewToFront;
+//加载FTPopOverMenuConfiguration需要
 -(void)popOverShowEvent:(UIEvent *)event
                 imageDone:(FTPopDoneBlock)doneBlock
             dismissBlock:(FTPopDismissBlock)dismissBlock;
@@ -50,13 +50,22 @@
 {
     return YES;
 }
+-(void)listViewRefreshWithVC:(UIViewController *)currentVC
+                    pageType:(NSInteger)pageType
+                       param:(NSDictionary *)param
+                 refreshTime:(NSTimeInterval)time{
+    
+}
+- (void)checkForloginTurnToWithURL:(NSURL *)url{}
+
+- (void)checkWithFunctionForShareURL:(NSString *)shareUrl{}
+
+- (void)bringCenterLoginViewToFront{}
 -(void)popOverShowEvent:(UIEvent *)event
                 imageDone:(FTPopDoneBlock)doneBlock
            dismissBlock:(FTPopDismissBlock)dismissBlock{
 }
--(void)showGuideShadeViewType:(NSInteger)type cellFrame:(CGRect)cellFrame cancelBlock:(FTPopDismissBlock)cancelBlock{
-    
-}
+
 @end