下啦刷新调整

yanglingyu
1 parent 4396e1dc
Showing 7 changed files with 54 additions and 25 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Manager/CNLiveListManager.h
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Manager/CNLiveListManager.m
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.36'
+  s.version          = '0.0.37'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -139,6 +139,9 @@
             NSValue *newValue = change[NSKeyValueChangeNewKey];
             CGFloat contentPointY = newValue.UIOffsetValue.vertical;
             self.contentOffetY = contentPointY;
+            if (contentPointY < 0) {
+                [[CNLiveListManager shareListManager] dragDown:-contentPointY];
+            }
             return;
         }
         UIScrollView *scrollView = object;
@@ -11,6 +11,9 @@
 #import "CNLiveListController.h"
 @interface CNLiveSubSegmentController ()
+{
+    CGFloat _bgImageheight;
+}
 @property (nonatomic, strong)JXCategoryTitleView *myCategoryView;
 @property (nonatomic, strong) CNLiveNavigationBar     *navigationBar;
@@ -65,17 +68,18 @@
         self.title = model.showName;
         self.ld_currentIndex = 0;
         self.selectChannelId = -1;
+        self->_bgImageheight = 100;
     }
     return self;
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    [self.view addSubview:self.bgImgView];
+    [self.view sendSubviewToBack:self.bgImgView];
     if (!CNLiveStringIsEmpty(self.backImageH5)) {
         // 如果后台传了背景图  就设置背景图
-        [self.view addSubview:self.bgImgView];
-        [self.view sendSubviewToBack:self.bgImgView];
+        
         weakself
         [self.bgImgView sd_setImageWithURL:[NSURL URLWithString:self.backImageH5] completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
             if (image) {
@@ -84,8 +88,14 @@
                 }else{
                     weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
                 }
+                self->_bgImageheight = weakSelf.bgImgView.height;
             }
         }];
+    }else
+    {
+        if (CNLiveStringIsEmpty(self.backImage)) {
+            self.bgImgView.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
+        }
     }
     [self handleDateWithChannelsArray];
     if ([CNWebRedirectHandle manager].isClickedIntegral) {
@@ -109,9 +119,6 @@
     self.view.backgroundColor = [UIColor clearColor];
     self.myCategoryView.titles = self.titles;
-    if (CNLiveStringIsEmpty(self.backImage)) {
-        self.view.backgroundColor = CNLiveColorWithHexString(self.backgroundColor);
-    }
     self.myCategoryView.titleColor = self.textColor;
     self.myCategoryView.titleSelectedColor = self.textColor;
     self.myCategoryView.cellSpacing = 32;
@@ -174,6 +181,16 @@
         [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) {
         !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
         };
+        [CNLiveListManager shareListManager].scrollViewDown = ^(CGFloat contentY) {
+            if (contentY > self->_bgImageheight) {
+                CGFloat wH = weakSelf.bgImgView.width/weakSelf.bgImgView.height;
+                weakSelf.bgImgView.height = contentY;
+                weakSelf.bgImgView.width = contentY * wH;
+            }else{
+                weakSelf.bgImgView.width = self.view.width;
+                weakSelf.bgImgView.height = self -> _bgImageheight;
+            }
+        };
     }else{
         [self.view addSubview:self.navigationBar];
         self.bgImgView.top = 0;
@@ -363,6 +380,7 @@
             }else{
                 weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
             }
+            self->_bgImageheight = weakSelf.bgImgView.height;
         }
     }];
     CNCategoryGetChannelModel *model = (CNCategoryGetChannelModel *)[self.pageListArr wjj_safetyObjectAtIndex:self.ld_currentIndex];
@@ -570,6 +588,7 @@
                 }else{
                     weakSelf.bgImgView.height = KScreenWidth*image.size.height/image.size.width;
                 }
+                self->_bgImageheight = weakSelf.bgImgView.height;
             }
         }];
 }
@@ -580,7 +599,7 @@
 }
 - (UIImageView *)bgImgView {
     if (!_bgImgView) {
-        _bgImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 50, KScreenWidth, self.view.height-50)];
+        _bgImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 50, KScreenWidth, 100)];
         _bgImgView.backgroundColor = kWhiteColor;
     }
     return _bgImgView;
@@ -11,11 +11,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveListManager : NSObject
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
+@property (nonatomic, copy) void (^scrollViewDown)(CGFloat contentY);
 @property (nonatomic, assign) BOOL isHiddenFirst;
 +(instancetype)shareListManager;
 //第一分类是否隐藏：yes为隐藏
 - (void)firstHeaderUp:(BOOL)isUp;
+
+//下拉高度
+- (void)dragDown:(CGFloat) contentY;
 //创建分类控制器
 + (CNCategoryBaseViewController *)CNCategoryBaseViewController;
 @end
@@ -44,4 +44,8 @@
     _isHiddenFirst = isHiddenFirst;
     !self.scrollViewDidScrollBlock ?: self.scrollViewDidScrollBlock(isHiddenFirst);
 }
+
+- (void)dragDown:(CGFloat) contentY{
+    !self.scrollViewDown ?: self.scrollViewDown(contentY);
+}
 @end
@@ -13,7 +13,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight
     // Override point for customization after application launch.
     return YES;
 }
@@ -43,20 +43,20 @@ PODS:
     - CNLiveNewTripartiteManagement/QMUIKit
     - CNLiveRequestBastKit
     - CNLiveUserManagement
-  - CNLiveBusinessTools (0.1.27):
+  - CNLiveBusinessTools (0.1.31):
     - CNLiveBaseKit
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/QMUIKit
+    - CNLiveNewTripartiteManagement/YYAsyncLayer
     - CNLiveNewTripartiteManagement/YYCache
+    - CNLiveNewTripartiteManagement/YYCategories
+    - CNLiveNewTripartiteManagement/YYDispatchQueuePool
     - CNLiveNewTripartiteManagement/YYImage
     - CNLiveNewTripartiteManagement/YYModel
     - CNLiveNewTripartiteManagement/YYText
     - CNLiveNewTripartiteManagement/YYWebImage
     - CNLiveRequestBastKit
     - CNLiveUserManagement
-    - YYAsyncLayer
-    - YYCategories
-    - YYDispatchQueuePool
   - CNLiveCategory (0.0.2):
     - CNLiveCategory/Object (= 0.0.2)
   - CNLiveCategory/Object (0.0.2)
@@ -118,17 +118,16 @@ PODS:
     - CNLiveBusinessTools
     - CNLiveCustomUI/CNLiveGetImage
     - CNLiveNewTripartiteManagement/MJRefresh
-  - CNLiveCWebViewModule (0.1.2):
+  - CNLiveCWebViewModule (0.2.1):
     - CNLiveCustomUI
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/Masonry
-    - CNLiveNewTripartiteManagement/QMUIKit
     - CNLiveNewTripartiteManagement/YYText
     - CNLiveRequestBastKit
     - CNLiveSDK/CNLiveStat
     - CNLiveUserManagement
     - WebViewJavascriptBridge
-  - CNLiveEnvironment (0.3.3)
+  - CNLiveEnvironment (0.3.4)
   - CNLiveNewTripartiteManagement/Masonry (0.2.0.6):
     - Masonry (= 1.1.0)
   - CNLiveNewTripartiteManagement/MJExtension (0.2.0.6):
@@ -162,7 +161,7 @@ PODS:
   - CNLiveSDK/CNLiveStat (0.3.4.8)
   - CNLiveUserManagement (0.1.5):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveVideoClassifyKit (0.0.31):
+  - CNLiveVideoClassifyKit (0.0.36):
     - CNLiveBaseKit
     - CNLiveBeeHive
     - CNLiveBusinessBaseModule
@@ -505,11 +504,11 @@ PODS:
   - SDWebImage (5.2.3):
     - SDWebImage/Core (= 5.2.3)
   - SDWebImage/Core (5.2.3)
-  - UMAPM (1.5.5)
+  - UMAPM (1.5.6)
   - UMCCommon (7.3.5):
     - UMAPM
     - UMDevice
-  - UMDevice (2.0.5)
+  - UMDevice (2.1.0)
   - WebViewJavascriptBridge (6.0.3)
   - YYAsyncLayer (1.0)
   - YYCache (1.0.4)
@@ -584,18 +583,18 @@ SPEC CHECKSUMS:
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
   CNLiveBServices: 747c8c6c8d300c4daaeb108027c5886c66ed02ce
   CNLiveBusinessBaseModule: 1d2eee2e04c8db762781b7ad45278d043db56748
-  CNLiveBusinessTools: dfd3270d885523be2599bdc3a95a416277682d0d
+  CNLiveBusinessTools: 3cb2335316d1a330a179ea11151db0d5c203adb4
   CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
   CNLiveCustomControl: a692e47171afb799cebc210a8e77c5a4ddfc2099
   CNLiveCustomUI: b704f07f5f734e45c06bda1877e67b5f9e5d3581
-  CNLiveCWebViewModule: 1af1e2853cc1203dacad5a66e8215e62ede2bfc9
-  CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371
+  CNLiveCWebViewModule: 97d40b79c45b026f72d83bf2f6501912a1148572
+  CNLiveEnvironment: 48ba0f934399fd25fc54dc3239009754bcc1ddb3
   CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa
   CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
   CNLiveSDK: 75bafaafbb8c09dcb4420adfe0f05130405b25e7
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
-  CNLiveVideoClassifyKit: d36f2503ac8103369634f70f53df3ccc7b9a84d1
+  CNLiveVideoClassifyKit: 2b21a4818b6712b9dd1703381777096a1315c670
   FWDebug: 5a20d089a300517153de1438d8128ad4c4690951
   JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
@@ -603,9 +602,9 @@ SPEC CHECKSUMS:
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   QMUIKit: 15294d6a350466e4a6f4df0333eac5bff474f995
   SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce
-  UMAPM: 1ab13287a2b05c1d491009321270daddf5659a74
+  UMAPM: 5ab988b8bedfd090ee2307cb80530ba79b8ac264
   UMCCommon: 3c535e9e3958f72df075cc6fe4776fb5e403c8bc
-  UMDevice: c13bbb2e8ca6c67d1e23e03162553e3ec5a8b5b0
+  UMDevice: 04948a92184e8d25f1369b635dff5490c1f063e0
   WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   YYAsyncLayer: df6b01ebc695c5f6b4c15dd5c23fa3e081eb25c0
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952