iOS Team / CNLiveVideoClassifyKit · Commits

Commit 9d3ac0f79437c81396c7ec89de5ceea6d294773d

Authored by yanglingyu
1 parent 915a7a69

跳转逻辑添加

Inline Side-by-side
Showing 4 changed files with 8 additions and 23 deletions
CNLiveVideoClassifyKit.podspec
  View file @9d3ac0f
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveVideoClassifyKit' 10 s.name = 'CNLiveVideoClassifyKit'
11 - s.version = '0.0.15' 11 + s.version = '0.0.16'
12 s.summary = '视讯头部一二级菜单组件' 12 s.summary = '视讯头部一二级菜单组件'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Header/CNLiveCommonDefines.h
  View file @9d3ac0f
@@ -21,7 +21,8 @@ typedef enum : NSUInteger { @@ -21,7 +21,8 @@ typedef enum : NSUInteger {
21 CNLiveClassifyJumpPushSearchVC, 21 CNLiveClassifyJumpPushSearchVC,
22 CNLiveClassifyJumpPushAddDiviceVC, 22 CNLiveClassifyJumpPushAddDiviceVC,
23 CNLiveClassifyJumpPushOtherSegmentVC, 23 CNLiveClassifyJumpPushOtherSegmentVC,
24 - CNLiveClassifyJumpPushCustomVC 24 + CNLiveClassifyJumpPushCustomVC,
  25 + CNLiveClassifyJumpTypeDarenWebVC
25 } CNLiveClassifyJumpType; 26 } CNLiveClassifyJumpType;
26 27
27 static NSString *const CNLiveLaunchWithFirsh = @"CNLiveLaunchWithFirsh"; 28 static NSString *const CNLiveLaunchWithFirsh = @"CNLiveLaunchWithFirsh";
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Manager/CNLiveClassifyJumpBridge.h
  View file @9d3ac0f
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
43 *pageType加载页面类型 43 *pageType加载页面类型
44 *param 传给View的参数 44 *param 传给View的参数
45 */ 45 */
46 -+ (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *)currentVC pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param; 46 ++ (UIView *)showViewOrPushVCWithCurrentVC:(UIViewController *_Nullable)currentVC pushType:(CNLiveClassifyJumpType)type pageType:(NSInteger)pageType param:(NSDictionary * _Nullable)param;
47 //加载FTPopOverMenuConfiguration需要 47 //加载FTPopOverMenuConfiguration需要
48 +(void)popOverShowEvent:(UIEvent *)event 48 +(void)popOverShowEvent:(UIEvent *)event
49 imageDone:(FTPopDoneBlock)doneBlock 49 imageDone:(FTPopDoneBlock)doneBlock
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Manager/CNWebRedirectHandle.m
  View file @9d3ac0f
@@ -37,27 +37,11 @@ @@ -37,27 +37,11 @@
37 } 37 }
38 38
39 - (void)turnToCategorySubWebVCWithUrl:(NSString *)urlStr { 39 - (void)turnToCategorySubWebVCWithUrl:(NSString *)urlStr {
40 -#warning pushVC 40 + NSDictionary *dic = @{
  41 + @"urlStr":urlStr
  42 + };
  43 + [CNLiveClassifyJumpBridge showViewOrPushVCWithCurrentVC:NULL pushType:CNLiveClassifyJumpTypeDarenWebVC pageType:0 param:dic];
41 // 二级页 44 // 二级页
42 -// NSDictionary *dic = [NSString getURLParameters:urlStr];  
43 -// AppDelegate *delegte = (AppDelegate *)[UIApplication sharedApplication].delegate;  
44 -// delegte.shouldChangeOrientation = WebPlayer;  
45 -// NSString *pageTitle = @" ";  
46 -// if ([dic containsObjectForKey:@"isShowTitle"] && [dic[@"isShowTitle"] isEqualToString:@"true"]) {  
47 -// pageTitle = nil;  
48 -// }  
49 -// CNDarenCategoryWebController *webVC = [[CNDarenCategoryWebController alloc] initWithUrl:urlStr pageTitle:pageTitle];  
50 -// webVC.statUrl = urlStr;  
51 -// if([dic[@"model"] isEqualToString:@"witness"]){  
52 -// webVC.shareType = @"witnessVideo";  
53 -// }  
54 -// else if([dic[@"model"] isEqualToString:@"3_witness"]){  
55 -// webVC.shareType = @"witnessArticle";  
56 -// }  
57 -// else {  
58 -// webVC.shareType = @"article";  
59 -// }  
60 -// [[AppDelegate sharedAppDelegate] pushViewController:webVC withBackTitle:@" "];  
61 } 45 }
62 46
63 - (void)jb_webRedirectHandleWithUrlStr:(NSString *)urlStr { 47 - (void)jb_webRedirectHandleWithUrlStr:(NSString *)urlStr {