二级背景图展示逻辑调整

yanglingyu
1 parent debde431
Showing 6 changed files with 56 additions and 75 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.m
Example/CNLiveVideoClassifyKit/CNLIVEViewController.h
Example/CNLiveVideoClassifyKit/CNLiveClassifyKitImpl.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.39'
+  s.version          = '0.0.40'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -113,30 +113,7 @@
     }
     self.categoryView.defaultSelectedIndex = self.ld_currentIndex;
-    if (!CNLiveStringIsEmpty(self.backImageH5)) {
-        CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr wjj_safetyObjectAtIndex:self.ld_currentIndex];
-        NSString *backImageH5 = nil;
-        if (model.backgroundImgH5) {
-            backImageH5 = model.backgroundImgH5;
-        }else{
-            backImageH5 = self.backImageH5;
-            
-        }
-        weakself
-        [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
-            if (image) {
-                if (self.showType == CNLiveSubVCShowtypeChannel) {
-                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
-                }else{
-                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
-                }
-            }
-        }];
-    }else{
-        if (CNLiveStringIsEmpty(self.backImage)) {
-            self.bgImgView.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
-        }
-    }
+    [self refreshBgImageColor];
     if (self.showType == CNLiveSubVCShowtypeClassify) {
         self.listContainerView.scrollView.scrollEnabled = NO;
         // 添加二级频道右侧的搜索按钮
@@ -379,24 +356,8 @@
 -(void)refreshCurrentVCData
 {
     CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr wjj_safetyObjectAtIndex:self.ld_currentIndex];
-    NSString *backImageH5 = nil;
-    if (model.backgroundImgH5) {
-        backImageH5 = model.backgroundImgH5;
-    }else{
-        backImageH5 = self.backImageH5;
-        
-    }
-    weakself
-    [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
-        if (image) {
-            if (self.showType == CNLiveSubVCShowtypeChannel) {
-                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
-            }else{
-                weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
-            }
-        }
-    }];
-    
+    [self refreshBgImageColor];
+   
     if (![CNUserShareManager isLogin]) {
         [BHConfig set:ChannelsSelectSecond value:self.channelId];
     }
@@ -418,6 +379,40 @@
     CNLiveListController *list = controllers[@(self.ld_currentIndex)];
         [CNLiveClassifyJumpBridge listViewRefreshWithVC:list.childViewControllers[0] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
 }
+-(void)refreshBgImageColor{
+    CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr wjj_safetyObjectAtIndex:self.ld_currentIndex];
+        NSString *backImageH5 = nil;
+        if (!CNLiveStringIsEmpty(model.backgroundImgH5)) {
+            backImageH5 = model.backgroundImgH5;
+        }else if (CNLiveStringIsEmpty(model.backgroundColor)){
+            backImageH5 = self.backImageH5;
+            
+        }
+        NSString *backgroundColor = nil;
+        if (!CNLiveStringIsEmpty(model.backgroundColor)) {
+            backgroundColor = model.backgroundColor;
+        }else{
+            backgroundColor = self.backgroundColor;
+        }
+    if (!CNLiveStringIsEmpty(backImageH5)) {
+        self.bgImgView.backgroundColor = kWhiteColor;
+        weakself
+        [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+            if (image) {
+                if (self.showType == CNLiveSubVCShowtypeChannel) {
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
+                }else{
+                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
+                }
+            }
+        }];
+    }else if(!CNLiveStringIsEmpty(backgroundColor)){
+        self.bgImgView.backgroundColor = CNLiveColorWithHexString(backgroundColor);
+        self.bgImgView.height = self.view.height/2;
+    }else{
+        self.bgImgView.backgroundColor = kWhiteColor;
+    }
+}
 -(void)showGuideView
 {
     if (![CNUserShareManager isLogin] || [BHConfig boolValue:wjjIsShowWitnessShadeKey]) {
@@ -553,17 +548,17 @@
     NSString *backgroundColor = nil;
     NSString *backImageH5 = nil;
     NSString *backImage = nil;
-    if (model.backgroundColor) {
+    if (!CNLiveStringIsEmpty(model.backgroundColor)) {
         backgroundColor = model.backgroundColor;
     }else{
         backgroundColor = self.backgroundColor;
     }
-    if (model.backgroundImgH5) {
+    if (!CNLiveStringIsEmpty(model.backgroundImgH5)) {
         backImageH5 = model.backgroundImgH5;
-    }else{
+    }else if (CNLiveStringIsEmpty(model.backgroundColor)){
         backImageH5 = self.backImageH5;
     }
-    if (model.backgroundImg) {
+    if (!CNLiveStringIsEmpty(model.backgroundImg)) {
         backImage = model.backgroundImg;
     }else{
         backImage = self.backImage;
@@ -591,8 +586,8 @@
         NSDictionary *paramDic = nil;
         if ([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
              paramDic= @{
-                @"bgColor": model.backgroundColor?model.backgroundColor:@"",
-                 @"backgroundImg": model.backgroundImg?model.backgroundImg:@"",
+                 @"bgColor": model.backgroundColor?model.backgroundColor:self.backgroundColor? self.backgroundColor :@"",
+                 @"backgroundImg": model.backgroundImg?model.backgroundImg:self.backImage ? self.backImage:@"",
                  @"channelId":model.channelId?model.channelId:@"",
                  @"channelName":model.id?model.id:@"",
                  @"pageId":model.pageId?model.pageId:@"",
@@ -611,22 +606,7 @@
     CNLiveListController *list = controllers[@(self.ld_currentIndex)];
         [CNLiveClassifyJumpBridge listViewRefreshWithVC:list.childViewControllers[0] pageType:model.pageType.integerValue param:paramDic refreshTime:time];
         [self showGuideView];
-        weakself
-    NSString *backImageH5 = nil;
-    if (model.backgroundImgH5) {
-        backImageH5 = model.backgroundImgH5;
-    }else{
-        backImageH5 = self.backImageH5;
-    }
-        [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
-            if (image) {
-                if (self.showType == CNLiveSubVCShowtypeChannel) {
-                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width + 50;
-                }else{
-                    weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
-                }
-            }
-        }];
+    [self refreshBgImageColor];
 }
 #pragma mark - Getting&&Setting
 -(JXCategoryTitleView *)myCategoryView
@@ -13,7 +13,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
+    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
     // Override point for customization after application launch.
     return YES;
 }
@@ -8,7 +8,8 @@
 @import UIKit;
 #import <QMUIKit/QMUIKit.h>
+#import <CNLiveBusinessBaseModule/CNCommonViewController.h>
-@interface CNLIVEViewController : QMUICommonViewController
+@interface CNLIVEViewController : CNCommonViewController
 @end
@@ -29,14 +29,14 @@
         return demo;
     }else{
         NSString *thirdUrl = param[@"thirdUrl"];
-        NSString *backgroundColor = param[@"backgroundColor"];
+        NSString *backgroundColor = param[@"bgColor"];
         NSString *backImageH5 = param[@"backgroundImgH5"];
         if (!CNLiveStringIsEmpty(thirdUrl)) {
             NSString *andStr = @"&";
             if (![thirdUrl cn_containsString:@"?"]) {
                 andStr = @"?";
             }
-            thirdUrl = [thirdUrl stringByAppendingFormat:@"%@backgroundColor=%@&backgroundImgH5=%@",andStr,backgroundColor?[backgroundColor urlEncode]:@"",backImageH5?[backImageH5 urlEncode]:@""];
+            thirdUrl = [thirdUrl stringByAppendingFormat:@"%@backgroundColor=%@&backgroundImgH5=%@",andStr,backgroundColor?backgroundColor:@"",backImageH5?[backImageH5 urlEncode]:@""];
         }
         CNLiveSubWebViewController *subVC = (CNLiveSubWebViewController*)[CNLiveWebViewModuleImpl pushClassifyWebViewWithWebTitle:param[@"title"] url:thirdUrl intercept:YES isHiddenFirst:NO isBlack:[param boolForKey:@"isBlack"]];
         return subVC;
@@ -34,7 +34,7 @@ PODS:
     - CNLiveBeeHive
   - CNLiveBServices/Service (0.1.3.9):
     - CNLiveBeeHive
-  - CNLiveBusinessBaseModule (0.2.0):
+  - CNLiveBusinessBaseModule (0.2.2):
     - CNLiveBaseKit
     - CNLiveBeeHive
     - CNLiveBServices
@@ -118,7 +118,7 @@ PODS:
     - CNLiveBusinessTools
     - CNLiveCustomUI/CNLiveGetImage
     - CNLiveNewTripartiteManagement/MJRefresh
-  - CNLiveCWebViewModule (0.2.2):
+  - CNLiveCWebViewModule (0.2.3):
     - CNLiveCustomUI
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/Masonry
@@ -161,7 +161,7 @@ PODS:
   - CNLiveSDK/CNLiveStat (0.3.4.8)
   - CNLiveUserManagement (0.1.5):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveVideoClassifyKit (0.0.38):
+  - CNLiveVideoClassifyKit (0.0.39):
     - CNLiveBaseKit
     - CNLiveBeeHive
     - CNLiveBusinessBaseModule
@@ -582,19 +582,19 @@ SPEC CHECKSUMS:
   CNLiveBaseKit: 44e5fc573cbca78a86b704cf77c886ef53889807
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
   CNLiveBServices: 747c8c6c8d300c4daaeb108027c5886c66ed02ce
-  CNLiveBusinessBaseModule: 1d2eee2e04c8db762781b7ad45278d043db56748
+  CNLiveBusinessBaseModule: c3e34e44ea164034318e6ba4802a16961ff43ecd
   CNLiveBusinessTools: 3cb2335316d1a330a179ea11151db0d5c203adb4
   CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
   CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099
   CNLiveCustomUI: b704f07f5f734e45c06bda1877e67b5f9e5d3581
-  CNLiveCWebViewModule: 526a764ed102149405e42face52c7b676a48a737
+  CNLiveCWebViewModule: 92635bbd539554f861f24857792ff36ceeb2a368
   CNLiveEnvironment: 48ba0f934399fd25fc54dc3239009754bcc1ddb3
   CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa
   CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
   CNLiveSDK: 75bafaafbb8c09dcb4420adfe0f05130405b25e7
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
-  CNLiveVideoClassifyKit: 8fe40083a61b7596c248405451d0cede1c96af15
+  CNLiveVideoClassifyKit: 61ffd55d9d1e75da84d362d6e3a2097faf254181
   FWDebug: 5a20d089a300517153de1438d8128ad4c4690951
   JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201