Commit a59f0ce2af0ce247fa9bbd44f24e57fac5f20895

Authored by yanglingyu
1 parent 32788b18

no message

CNLiveVideoClassifyKit.podspec
@@ -46,6 +46,7 @@ TODO: Add long description of the pod here. @@ -46,6 +46,7 @@ TODO: Add long description of the pod here.
46 s.dependency 'CNLiveUserManagement' 46 s.dependency 'CNLiveUserManagement'
47 s.dependency 'CNLiveCommonCategory' 47 s.dependency 'CNLiveCommonCategory'
48 s.dependency 'CNLiveCWebViewModule' 48 s.dependency 'CNLiveCWebViewModule'
  49 + s.dependency 'CNLiveBeeHive'
49 s.dependency 'CNLiveTripartiteManagement/SDWebImage' 50 s.dependency 'CNLiveTripartiteManagement/SDWebImage'
50 s.dependency 'CNLiveTripartiteManagement/Masonry' 51 s.dependency 'CNLiveTripartiteManagement/Masonry'
51 s.dependency 'CNLiveTripartiteManagement/YYKit' 52 s.dependency 'CNLiveTripartiteManagement/YYKit'
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
@@ -288,10 +288,7 @@ static CGFloat moveHeight = 50; @@ -288,10 +288,7 @@ static CGFloat moveHeight = 50;
288 [[NSUserDefaults standardUserDefaults] setObject:newChannelVer forKey:CNWjjOldCategoryChannelVerKey]; 288 [[NSUserDefaults standardUserDefaults] setObject:newChannelVer forKey:CNWjjOldCategoryChannelVerKey];
289 289
290 } else { // 从未请求到过数据 290 } else { // 从未请求到过数据
291 - Class class = NSClassFromString(@"CNTools");  
292 - SEL manager = NSSelectorFromString(@"manager");  
293 - SEL sel = NSSelectorFromString(@"channelsRequested");  
294 - if (!(BOOL)[[class performSelector:manager] performSelector:sel]&& first) { 291 + if ([BHConfig boolValue:ChannelsRequested]&& first) {
295 [QMUITips showLoadingInView:self.view]; 292 [QMUITips showLoadingInView:self.view];
296 self.isLoading = YES; 293 self.isLoading = YES;
297 return; 294 return;
CNLiveVideoClassifyKit/Classes/Header/CNLiveCommonDefines.h
@@ -47,4 +47,8 @@ @@ -47,4 +47,8 @@
47 #define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification" 47 #define kDSHappinessPageControlScrollEnableNotification @"kDSHappinessPageControlScrollEnableNotification"
48 #endif 48 #endif
49 49
  50 +#ifndef ChannelsRequested
  51 +#define ChannelsRequested @"channelsRequested"
  52 +#endif
  53 +
50 #endif /* CNLiveCommonDefines_h */ 54 #endif /* CNLiveCommonDefines_h */
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 #import <SDWebImage/SDWebImage.h> 17 #import <SDWebImage/SDWebImage.h>
18 #import <CNLiveCommonCategory/CNLiveCommonCategory.h> 18 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
19 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h> 19 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
  20 +#import <CNLiveBeeHive/BHConfig.h>
20 #import <MJExtension/MJExtension.h> 21 #import <MJExtension/MJExtension.h>
21 #import "CNLiveCommonDefines.h" 22 #import "CNLiveCommonDefines.h"
22 #import <QMUIKit/QMUIKit.h> 23 #import <QMUIKit/QMUIKit.h>
CNLiveVideoClassifyKit/Classes/Manager/CNLiveListManager.m
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 #import <CNLiveCWebViewModule/CNLiveCWebViewModule.h> 10 #import <CNLiveCWebViewModule/CNLiveCWebViewModule.h>
11 #import <CNLiveCWebViewModule/CNLiveSubWebViewController.h> 11 #import <CNLiveCWebViewModule/CNLiveSubWebViewController.h>
12 12
13 -@interface CNLiveListManager() 13 +@interface CNLiveListManager()<UIScrollViewDelegate>
14 { 14 {
15 NSDictionary *_paramDic; 15 NSDictionary *_paramDic;
16 CNCategoryGetChannelModel *_model; 16 CNCategoryGetChannelModel *_model;
@@ -39,6 +39,9 @@ @@ -39,6 +39,9 @@
39 实现 <JXCategoryListContentViewDelegate> 协议方法,返回该视图控制器所拥有的「视图」 39 实现 <JXCategoryListContentViewDelegate> 协议方法,返回该视图控制器所拥有的「视图」
40 */ 40 */
41 - (UIView *)listView { 41 - (UIView *)listView {
  42 + if ([_model.pageType isEqualToString:@"4"] || [_model.pageType isEqualToString:@"5"]){
  43 +
  44 + }
42 CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_model.thirdUrl 45 CNLiveSubWebViewController *subVC = [CNLiveCWebViewModule showWebVCWithLunchForWebURL:_model.thirdUrl
43 ParamDict:_paramDic ShowType:CNLiveWebViewLunchShowTypeHidden]; 46 ParamDict:_paramDic ShowType:CNLiveWebViewLunchShowTypeHidden];
44 // for (UIView*subView in subVC.view.subviews) { 47 // for (UIView*subView in subVC.view.subviews) {
@@ -47,7 +50,7 @@ @@ -47,7 +50,7 @@
47 // [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionOld context:NULL]; 50 // [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionOld context:NULL];
48 // } 51 // }
49 // } 52 // }
50 - 53 +
51 return subVC.view; 54 return subVC.view;
52 } 55 }
53 @end 56 @end
CNLiveVideoClassifyKit/Classes/Manager/CNLiveVideoClassifyProtocol.h
@@ -7,11 +7,12 @@ @@ -7,11 +7,12 @@
7 /* CNLiveVideoClassifyProtocol_h */ 7 /* CNLiveVideoClassifyProtocol_h */
8 // 8 //
9 9
  10 +#imp
10 /** 11 /**
11 *与主工程交互 12 *与主工程交互
12 */ 13 */
13 @protocol CNLiveVideoClassifyProtocol <NSObject> 14 @protocol CNLiveVideoClassifyProtocol <NSObject>
14 -  
15 - 15 +//返回列表View
  16 +-(UIView *)listView;
16 17
17 @end 18 @end
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
@@ -363,6 +363,7 @@ @@ -363,6 +363,7 @@
363 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", 363 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
364 "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework", 364 "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
365 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 365 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
  366 + "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
366 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", 367 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
367 "${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework", 368 "${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework",
368 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", 369 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
@@ -389,6 +390,7 @@ @@ -389,6 +390,7 @@
389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", 390 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
390 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework", 391 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
391 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 392 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
  393 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
392 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", 394 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
393 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework", 395 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework",
394 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", 396 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
Example/CNLiveVideoClassifyKit/CNTools.m
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 #import <CNUserInfoManager.h> 15 #import <CNUserInfoManager.h>
16 #import <CNLiveCommonCategory/CNLiveCommonCategory.h> 16 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
17 #import <CNLiveVideoClassifyKit/CNLivevideoClassifyPCH.h> 17 #import <CNLiveVideoClassifyKit/CNLivevideoClassifyPCH.h>
  18 +#import <CNLiveBeeHive/BHConfig.h>
18 19
19 20
20 static NSString * const CNDarenDownloadShareSourceUrl = @"CNDarenDownloadShareSourceUrl"; 21 static NSString * const CNDarenDownloadShareSourceUrl = @"CNDarenDownloadShareSourceUrl";
@@ -65,7 +66,7 @@ static NSString * const CNDarenDownloadShareSourceUrl = @&quot;CNDarenDownloadShareSo @@ -65,7 +66,7 @@ static NSString * const CNDarenDownloadShareSourceUrl = @&quot;CNDarenDownloadShareSo
65 [[NSNotificationCenter defaultCenter] postNotificationName:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil userInfo:nil]; 66 [[NSNotificationCenter defaultCenter] postNotificationName:CNWjjClassifyChannelsRequestHideLoadingNotifiName object:nil userInfo:nil];
66 } 67 }
67 [CNTools manager].channelsRequesting = NO; 68 [CNTools manager].channelsRequesting = NO;
68 - [CNTools manager].channelsRequested = YES; 69 + [BHConFig set:ChannelsRequested boolValue:YES];
69 }]; 70 }];
70 71
71 } 72 }