no message

yanglingyu
1 parent 6a779669
Showing 5 changed files with 10 additions and 17 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/Header/CNLivevideoClassifyPCH.h
CNLiveVideoClassifyKit/Classes/Manager/CNLiveClassifyJumpBridge.m
@@ -46,6 +46,7 @@ TODO: Add long description of the pod here.
    s.dependency 'CNLiveUserManagement'
    s.dependency 'CNLiveCommonCategory'
    s.dependency 'CNLiveBeeHive'
+   s.dependency 'CNLiveEnvironment'
    s.dependency 'CNLiveTripartiteManagement/SDWebImage'
    s.dependency 'CNLiveTripartiteManagement/Masonry'
    s.dependency 'CNLiveTripartiteManagement/YYKit'
@@ -11,7 +11,6 @@
 #import "CNCategoryGetChannelModel.h"
 #import "CNLiveListManager.h"
 #import "CNLiveSubSegmentController.h"
-#import <CNLiveCWebViewModule/CNLiveWebViewJumpBridge.h>
 static const CGFloat animationTime = 0.3;
 static const CGFloat animationHeight = 15;
@@ -439,19 +438,12 @@ static CGFloat moveHeight = 50;
 -(void)managerScrollView:(BOOL)enabled
 {
+    self.listContainerView.scrollView.scrollEnabled = !enabled;
     for (UIView *view in self.listContainerView.scrollView.subviews) {
         if ([view.viewController isKindOfClass:[CNLiveSubSegmentController class]]) {
             CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)view.viewController;
             [subVc layoutRightSubViewWithShow:!enabled];
-            for (UIView *subView in view.subviews) {
-                if ([subView isKindOfClass:[JXCategoryListContainerView class]]) {
-                    JXCategoryListContainerView *titleView = (JXCategoryListContainerView *)subView;
-                    titleView.scrollView.scrollEnabled = enabled;
-                    self.listContainerView.scrollView.scrollEnabled = !enabled;
-                }
             }
-            
-        }
     }
 }
 #pragma mark - CNCustomChannelListViewDelegate !!!!!!!!!!!!!!!!!!!!!!
@@ -15,7 +15,7 @@
 @property (nonatomic, strong)NSArray<CNCategoryGetChannelModel*> *pageListArr;
 @property (nonatomic, strong)UIColor *textColor;
-@property (nonatomic, strong)UIColor *backgroundColor;
+@property (nonatomic, strong)NSString *backgroundColor;
 @property (nonatomic, strong)NSString *backImage;
 @property (nonatomic, strong)NSString *backImageH5;
@@ -39,10 +39,10 @@
             self.textColor = CNLiveColorWithHexString(@"#848494");
         }
         if (!CNLiveStringIsEmpty(model.backgroundColor)) {
-            self.backgroundColor = CNLiveColorWithHexString(model.backgroundColor);
+            self.backgroundColor = model.backgroundColor;
         }else
         {
-            self.backgroundColor = CNLiveColorWithHexString(@"#FFFFFF");
+            self.backgroundColor = @"#FFFFFF";
         }
         self.backImageH5 = model.backgroundImgH5;
         self.backImage = model.backgroundImg;
@@ -59,7 +59,7 @@
     [self handleDateWithChannelsArray];
     self.myCategoryView.titles = self.titles;
     if (CNLiveStringIsEmpty(self.backImage)) {
-        self.view.backgroundColor = self.backgroundColor;
+        self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
     }
     self.myCategoryView.titleColor = self.textColor;
     self.myCategoryView.titleSelectedColor = self.textColor;
@@ -96,6 +96,7 @@
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
 - (void)layoutRightSubViewWithShow:(BOOL)show {
+    self.listContainerView.scrollView.scrollEnabled = !show;
     if (show) {
         // 正常
@@ -18,7 +18,7 @@
 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
 #import <CNLiveCommonCategory/UIColor+CNLiveExtension.h>
 #import <CNLiveBeeHive/BHConfig.h>
-#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <MJExtension/MJExtension.h>
 #import "CNLiveCommonDefines.h"
 #import <QMUIKit/QMUIKit.h>
@@ -19,12 +19,11 @@
     return bridge;
 }
 -(instancetype)init
-{
+{   
     self = [super init];
     if (self) {
         Class class = NSClassFromString(@"CNLiveClassifyKitImpl");
-        self.protocol = [CNLiveVideoClassifyProtocol Protocol];
-        [[BeeHive shareInstance] registerService:self.protocol service:class];
+        self.protocol = [class new];
     }
     return self;
 }