iOS Team / CNLiveVideoClassifyKit · Commits

Commit 27b956797ac8b919cbce575d418593c329c93fff

Authored by yanglingyu
1 parent 6a779669

no message

Inline Side-by-side
Showing 5 changed files with 10 additions and 17 deletions
CNLiveVideoClassifyKit.podspec
  View file @27b9567
... ... @@ -46,6 +46,7 @@ TODO: Add long description of the pod here.
46 46 s.dependency 'CNLiveUserManagement'
47 47 s.dependency 'CNLiveCommonCategory'
48 48 s.dependency 'CNLiveBeeHive'
  49 + s.dependency 'CNLiveEnvironment'
49 50 s.dependency 'CNLiveTripartiteManagement/SDWebImage'
50 51 s.dependency 'CNLiveTripartiteManagement/Masonry'
51 52 s.dependency 'CNLiveTripartiteManagement/YYKit'
... ...
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
  View file @27b9567
... ... @@ -11,7 +11,6 @@
11 11 #import "CNCategoryGetChannelModel.h"
12 12 #import "CNLiveListManager.h"
13 13 #import "CNLiveSubSegmentController.h"
14   -#import <CNLiveCWebViewModule/CNLiveWebViewJumpBridge.h>
15 14  
16 15 static const CGFloat animationTime = 0.3;
17 16 static const CGFloat animationHeight = 15;
... ... @@ -439,19 +438,12 @@ static CGFloat moveHeight = 50;
439 438  
440 439 -(void)managerScrollView:(BOOL)enabled
441 440 {
  441 + self.listContainerView.scrollView.scrollEnabled = !enabled;
442 442 for (UIView *view in self.listContainerView.scrollView.subviews) {
443 443 if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
444 444 CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)view.viewController;
445 445 [subVc layoutRightSubViewWithShow:!enabled];
446   - for (UIView *subView in view.subviews) {
447   - if ([subView isKindOfClass:[JXCategoryListContainerView class]]) {
448   - JXCategoryListContainerView *titleView = (JXCategoryListContainerView *)subView;
449   - titleView.scrollView.scrollEnabled = enabled;
450   - self.listContainerView.scrollView.scrollEnabled = !enabled;
451   - }
452 446 }
453   -
454   - }
455 447 }
456 448 }
457 449 #pragma mark - CNCustomChannelListViewDelegate !!!!!!!!!!!!!!!!!!!!!!
... ...
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
  View file @27b9567
... ... @@ -15,7 +15,7 @@
15 15  
16 16 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
17 17 @property (nonatomic, strong)UIColor *textColor;
18   -@property (nonatomic, strong)UIColor *backgroundColor;
  18 +@property (nonatomic, strong)NSString *backgroundColor;
19 19 @property (nonatomic, strong)NSString *backImage;
20 20 @property (nonatomic, strong)NSString *backImageH5;
21 21  
... ... @@ -39,10 +39,10 @@
39 39 self.textColor = CNLiveColorWithHexString(@"#848494");
40 40 }
41 41 if (!CNLiveStringIsEmpty(model.backgroundColor)) {
42   - self.backgroundColor = CNLiveColorWithHexString(model.backgroundColor);
  42 + self.backgroundColor = model.backgroundColor;
43 43 }else
44 44 {
45   - self.backgroundColor = CNLiveColorWithHexString(@"#FFFFFF");
  45 + self.backgroundColor = @"#FFFFFF";
46 46 }
47 47 self.backImageH5 = model.backgroundImgH5;
48 48 self.backImage = model.backgroundImg;
... ... @@ -59,7 +59,7 @@
59 59 [self handleDateWithChannelsArray];
60 60 self.myCategoryView.titles = self.titles;
61 61 if (CNLiveStringIsEmpty(self.backImage)) {
62   - self.view.backgroundColor = self.backgroundColor;
  62 + self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
63 63 }
64 64 self.myCategoryView.titleColor = self.textColor;
65 65 self.myCategoryView.titleSelectedColor = self.textColor;
... ... @@ -96,6 +96,7 @@
96 96 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
97 97 - (void)layoutRightSubViewWithShow:(BOOL)show {
98 98  
  99 + self.listContainerView.scrollView.scrollEnabled = !show;
99 100 if (show) {
100 101 // 正常
101 102  
... ...
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
  View file @27b9567
... ... @@ -18,7 +18,7 @@
18 18 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
19 19 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
20 20 #import <CNLiveBeeHive/BHConfig.h>
21   -#import <CNLiveBeeHive/CNLiveBeeHive.h>
  21 +#import <CNLiveEnvironment/CNLiveEnvironment.h>
22 22 #import <MJExtension/MJExtension.h>
23 23 #import "CNLiveCommonDefines.h"
24 24 #import <QMUIKit/QMUIKit.h>
... ...
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.m
  View file @27b9567
... ... @@ -19,12 +19,11 @@
19 19 return bridge;
20 20 }
21 21 -(instancetype)init
22   -{
  22 +{
23 23 self = [super init];
24 24 if (self) {
25 25 Class class = NSClassFromString(@"CNLiveClassifyKitImpl");
26   - self.protocol = [CNLiveVideoClassifyProtocol Protocol];
27   - [[BeeHive shareInstance] registerService:self.protocol service:class];
  26 + self.protocol = [class new];
28 27 }
29 28 return self;
30 29 }
... ...