no message

yanglingyu
1 parent a08a9751
Showing 5 changed files with 78 additions and 45 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.h
CNLiveVideoClassifyKit/Classes/Controller/CNLiveSubSegmentController.m
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@ TODO: Add long description of the pod here.
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
   s.ios.deployment_target = '10.0'
+  s.pod_target_xcconfig = { 'VALID_ARCHS' => 'x86_64 armv7 arm64' }
   s.source_files = 'CNLiveVideoClassifyKit/Classes/**/*'
@@ -36,9 +37,8 @@ TODO: Add long description of the pod here.
 #   s.resource_bundles = {
 #     'CNLiveVideoClassifyKit' => ['CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle']
 #   }
-    s.prefix_header_contents = '#import "CNLivevideoClassifyPCH.h"'
-   s.public_header_files = 'Pod/Classes/**/*.h'
-#   s.static_framework = true
+   s.prefix_header_contents = '#import "CNLivevideoClassifyPCH.h"'
+   s.static_framework = true
    s.frameworks = 'UIKit', 'MapKit'
    s.dependency 'JXCategoryView'
    s.dependency 'CNLiveTripartiteManagement/MJExtension'
@@ -73,12 +73,6 @@ static CGFloat moveHeight = 50;
     [self.view sendSubviewToBack:self.topBgImg];
     [self dataDivideIntoNormalAndOtherWithFirst:YES];
     [self handleDateWithChannelsArray];
-    if ([CNUserShareManager isLogin]) {
-        [self.view addSubview:self.customChannelsBtn];
-    }else
-    {
-        [self.view addSubview:self.loginBtn];
-    }
     self.myCategoryView.translatesAutoresizingMaskIntoConstraints = NO;
     self.myCategoryView.titleColorGradientEnabled = YES;
@@ -169,6 +163,12 @@ static CGFloat moveHeight = 50;
             [self categoryView:self.myCategoryView didSelectedItemAtIndex:self.ld_currentIndex];
         }
     }
+    if ([CNUserShareManager isLogin]) {
+        [self.view addSubview:self.customChannelsBtn];
+    }else
+    {
+        [self.view addSubview:self.loginBtn];
+    }
     // Do any additional setup after loading the view.
 }
 -(void)viewWillAppear:(BOOL)animated {
@@ -207,12 +207,12 @@ static CGFloat moveHeight = 50;
     self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ moveHeight);
     if ([CNUserShareManager isLogin]) {
         self.myCategoryView.width =  kScreenWidth - 45;
-        self.customChannelsBtn.centerY = self.myCategoryView.height/2 + kStatusHeight;
+        self.customChannelsBtn.centerY = [self preferredCategoryViewHeight]/2 + kStatusHeight;
         self.customChannelsBtn.right = kScreenWidth - 18;
     }else
     {
         self.myCategoryView.width = kScreenWidth - 70;
-        self.loginBtn.centerY = self.myCategoryView.height/2 + kStatusHeight;
+        self.loginBtn.centerY = [self preferredCategoryViewHeight]/2 + kStatusHeight;
         self.loginBtn.right = kScreenWidth - 11;
     }
@@ -653,6 +653,10 @@ static CGFloat moveHeight = 50;
 }
 -(void)scrollViewUpDowm:(BOOL)isUp
 {
+    if (isUp != self.findScrollView.isScrollEnabled) {
+        return;
+    }
+    self.findScrollView.scrollEnabled = !isUp;
     [UIView animateWithDuration:0.3 animations:^{
         if (isUp) {
             [self scrollViewUp];
@@ -664,10 +668,6 @@ static CGFloat moveHeight = 50;
 }
 -(void)scrollViewUp{
-    if (self.topBgImg.top<0) {
-        return;
-    }
-    [self managerScrollView:YES];
     self.topBgImg.top -= moveHeight;
     self.myCategoryView.collectionView.top = -50-kStatusHeight;
     self.pageViewController.view.top = kStatusHeight;
@@ -679,10 +679,6 @@ static CGFloat moveHeight = 50;
     }
 }
 -(void)scrollViewDown{
-    if (self.topBgImg.top==0) {
-        return;
-    }
-    [self managerScrollView:NO];
     self.topBgImg.top += moveHeight;
     self.myCategoryView.collectionView.top = 0;
     self.pageViewController.view.top = self.myCategoryView.bottom;
@@ -694,14 +690,6 @@ static CGFloat moveHeight = 50;
     }
 }
--(void)managerScrollView:(BOOL)enabled
-{
-    self.findScrollView.scrollEnabled = !enabled;
-    if ([self.pageViewController.viewControllers.firstObject isKindOfClass:[CNLiveSubSegmentController class]]) {
-        CNLiveSubSegmentController *subVc = (CNLiveSubSegmentController *)self.pageViewController.viewControllers.firstObject;
-           [subVc layoutRightSubViewWithShow:!enabled];
-        }
-}
 #pragma mark -
 #pragma mark - CNSubClassifySegmentControllerDelegate
 // 显示 目击者/监管/大众体育 首次使用引导页
@@ -25,9 +25,6 @@ NS_ASSUME_NONNULL_BEGIN
 -(instancetype)initWithModel:(CNCategoryGetChannelModel *)model;
 @property (nonatomic, copy) void (^scrollViewDidScrollBlock)(BOOL isUp);
-// 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
-- (void)layoutRightSubViewWithShow:(BOOL)show;
-
 - (void)refreshCurrentVCData;
 - (void)showGuideView;
@@ -121,6 +121,7 @@
         weakself
         list.scrollViewDidScrollBlock = ^(BOOL isUp) {
             !weakSelf.scrollViewDidScrollBlock ?: weakSelf.scrollViewDidScrollBlock(isUp);
+            [weakSelf rightSubViewWithShow:isUp];
         };
         [self.controllersArr addObject:listVC];
     }
@@ -165,6 +166,24 @@
         // 美食中国 历史记录
         [self.view addSubview:self.historyBtn];
     }
+    
+    self.myCategoryView.top = 0;
+    self.pageViewController.view.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
+    self.searchBtn.right = KScreenWidth-12;
+    CGFloat width = self.searchBtn.left;
+    self.searchBtn.centerY = self.myCategoryView.height/2;
+    if ([self.channelId isEqualToString:@"219"]) {
+        self.moreBtn.right = KScreenWidth-12-66-15;
+        self.moreBtn.centerY = self.myCategoryView.height/2;
+        self.progressView.right = KScreenWidth-93-18-15;
+        self.progressView.centerY = self.myCategoryView.height/2;
+        width = self.progressView.left;
+    }else if ([self.channelId isEqualToString:@"11"]){
+        self.historyBtn.right = KScreenWidth-93;
+        self.historyBtn.centerY = self.myCategoryView.height/2;
+        width = self.historyBtn.left;
+    }
+    self.myCategoryView.width = width;
     // Do any additional setup after loading the view.
 }
 -(void)viewDidLayoutSubviews
@@ -176,13 +195,13 @@
     CGFloat width = self.searchBtn.left;
     self.searchBtn.centerY = self.myCategoryView.height/2;
     if ([self.channelId isEqualToString:@"219"]) {
-        self.moreBtn.right = KScreenWidth-12-66-15;
+        self.moreBtn.right = self.searchBtn.left-15;
         self.moreBtn.centerY = self.myCategoryView.height/2;
-        self.progressView.right = KScreenWidth-93-18-15;
+        self.progressView.right = self.moreBtn.left-15;
         self.progressView.centerY = self.myCategoryView.height/2;
         width = self.progressView.left;
     }else if ([self.channelId isEqualToString:@"11"]){
-        self.historyBtn.right = KScreenWidth-93;
+        self.historyBtn.right = self.searchBtn.left - 15;
         self.historyBtn.centerY = self.myCategoryView.height/2;
         width = self.historyBtn.left;
     }
@@ -287,9 +306,20 @@
     self.pageListArr = array.copy;
 }
 // 一级频道显示隐藏时二级频道右侧的搜索按钮变宽变窄控制
-- (void)layoutRightSubViewWithShow:(BOOL)show {
-    self.findScrollView.scrollEnabled = !show;
-    if (show) {
+- (void)rightSubViewWithShow:(BOOL)show {
+    if (show == self.findScrollView.isScrollEnabled) {
+        return;
+    }
+    self.findScrollView.scrollEnabled = show;
+    weakself
+    [UIView animateWithDuration:0.3 animations:^{
+        [weakSelf uploadUIWithIsUp:show];
+    }];
+    
+}
+-(void)uploadUIWithIsUp:(BOOL)isUp
+{
+    if (!isUp) {
         // 正常
             self.searchBtn.width = 66;
@@ -297,27 +327,28 @@
             [self.searchBtn setTitle:@"搜索" forState:UIControlStateNormal];
         CGFloat width = self.searchBtn.left;
             if ([self.channelId isEqualToString:@"219"]) {
-                self.moreBtn.right = KScreenWidth-12-66-15;
-                self.progressView.right = KScreenWidth-93-18-15;
+                self.moreBtn.right = self.searchBtn.left - 15;
+                self.progressView.right = self.moreBtn.left-15;
                 width = self.progressView.left;
             } else if ([self.channelId isEqualToString:@"11"]) {
-                self.historyBtn.right = KScreenWidth-93;
+                self.historyBtn.right = self.searchBtn.left - 15;;
                 width = self.historyBtn.left;
             }
-            
+
             self.myCategoryView.width = width;
     } else {
         // 变窄
             self.searchBtn.width = 30;
             self.searchBtn.right = KScreenWidth-12;
+            self.searchBtn.titleLabel.text = nil;
             [self.searchBtn setTitle:nil forState:UIControlStateNormal];
             if ([self.channelId isEqualToString:@"219"]) {
-                self.moreBtn.right = KScreenWidth-12-66-15+30;
-                self.progressView.right = KScreenWidth-93-18-15+30;
+                self.moreBtn.right = self.searchBtn.left - 15;
+                self.progressView.right = self.moreBtn.left - 15;
             } else if ([self.channelId isEqualToString:@"11"]) {
-                self.historyBtn.right = KScreenWidth-93+30;
+                self.historyBtn.right = self.searchBtn.left - 15;
             }
             self.myCategoryView.width = self.searchBtn.left;
     }
@@ -233,6 +233,7 @@
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				9BF71EFE8082311341273D3D /* [CP] Embed Pods Frameworks */,
+				BC09AB0A3E357D27DAAEC5F9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -389,7 +390,6 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
-				"${BUILT_PRODUCTS_DIR}/CNLiveVideoClassifyKit/CNLiveVideoClassifyKit.framework",
 				"${BUILT_PRODUCTS_DIR}/FWDebug/FWDebug.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
@@ -416,7 +416,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveVideoClassifyKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FWDebug.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
@@ -432,6 +431,24 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		BC09AB0A3E357D27DAAEC5F9 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-resources.sh",
+				"${PODS_ROOT}/../../CNLiveVideoClassifyKit/Assets/CNSegmentControl.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNSegmentControl.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */