Commit 8ad896efde04abbf8b941a873601c8344121a9b4

Authored by yanglingyu
1 parent 8a05a1a8

修改提交

CNLiveVideoClassifyKit.podspec
@@ -18,7 +18,7 @@ Pod::Spec.new do |s| @@ -18,7 +18,7 @@ Pod::Spec.new do |s|
18 # * Finally, don't worry about the indent, CocoaPods strips it! 18 # * Finally, don't worry about the indent, CocoaPods strips it!
19 19
20 s.description = <<-DESC 20 s.description = <<-DESC
21 -TODO: Add long description of the pod here. 21 +视讯分类视讯头部一二级菜单组件.
22 DESC 22 DESC
23 23
24 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveVideoClassifyKit.git' 24 s.homepage = 'http://bj.gitlab.cnlive.com/ios-team/CNLiveVideoClassifyKit.git'
@@ -43,7 +43,7 @@ TODO: Add long description of the pod here. @@ -43,7 +43,7 @@ TODO: Add long description of the pod here.
43 s.dependency 'JXCategoryView' 43 s.dependency 'JXCategoryView'
44 s.dependency 'CNLiveTripartiteManagement/MJExtension' 44 s.dependency 'CNLiveTripartiteManagement/MJExtension'
45 s.dependency 'CNLiveBaseKit' 45 s.dependency 'CNLiveBaseKit'
46 - s.dependency 'CNLiveBaseClass' 46 + s.dependency 'CNLiveCategory'
47 s.dependency 'CNLiveUserManagement' 47 s.dependency 'CNLiveUserManagement'
48 s.dependency 'CNLiveCommonCategory' 48 s.dependency 'CNLiveCommonCategory'
49 s.dependency 'CNLiveBeeHive' 49 s.dependency 'CNLiveBeeHive'
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.h
@@ -5,12 +5,11 @@ @@ -5,12 +5,11 @@
5 // Created by CNLive on 2021/8/12. 5 // Created by CNLive on 2021/8/12.
6 //分类试图控制器基类 6 //分类试图控制器基类
7 7
8 -#import <CNLiveBaseClass/CNLiveBaseViewController.h>  
9 #import <JXCategoryView/JXCategoryView.h> 8 #import <JXCategoryView/JXCategoryView.h>
10 9
11 NS_ASSUME_NONNULL_BEGIN 10 NS_ASSUME_NONNULL_BEGIN
12 11
13 -@interface CNCategoryBaseViewController : CNLiveBaseViewController<JXCategoryViewDelegate,UIPageViewControllerDelegate,UIPageViewControllerDataSource> 12 +@interface CNCategoryBaseViewController : UIViewController<JXCategoryViewDelegate,UIPageViewControllerDelegate,UIPageViewControllerDataSource>
14 13
15 @property (nonatomic, strong) JXCategoryBaseView *categoryView; 14 @property (nonatomic, strong) JXCategoryBaseView *categoryView;
16 @property (nonatomic, strong) UIPageViewController *pageViewController; 15 @property (nonatomic, strong) UIPageViewController *pageViewController;
CNLiveVideoClassifyKit/Classes/Controller/CNCategoryBaseViewController.m
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 [self addChildViewController:self.pageViewController]; 19 [self addChildViewController:self.pageViewController];
20 [self.view addSubview:self.pageViewController.view]; 20 [self.view addSubview:self.pageViewController.view];
21 self.view.backgroundColor = [UIColor whiteColor]; 21 self.view.backgroundColor = [UIColor whiteColor];
22 - self.navigationHidden = YES;  
23 22
24 // Do any additional setup after loading the view. 23 // Do any additional setup after loading the view.
25 } 24 }
@@ -34,7 +33,6 @@ @@ -34,7 +33,6 @@
34 { 33 {
35 [super viewWillAppear:animated]; 34 [super viewWillAppear:animated];
36 self.navigationController.interactivePopGestureRecognizer.enabled = NO; 35 self.navigationController.interactivePopGestureRecognizer.enabled = NO;
37 - self.navigationHidden = YES;  
38 36
39 } 37 }
40 38
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
@@ -377,14 +377,12 @@ @@ -377,14 +377,12 @@
377 inputPaths = ( 377 inputPaths = (
378 "${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-frameworks.sh", 378 "${PODS_ROOT}/Target Support Files/Pods-CNLiveVideoClassifyKit_Example/Pods-CNLiveVideoClassifyKit_Example-frameworks.sh",
379 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", 379 "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
380 - "${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",  
381 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework", 380 "${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
382 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework", 381 "${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
383 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework", 382 "${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
384 "${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework", 383 "${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework",
385 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework", 384 "${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
386 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework", 385 "${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
387 - "${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",  
388 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework", 386 "${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
389 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", 387 "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
390 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", 388 "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
@@ -403,14 +401,12 @@ @@ -403,14 +401,12 @@
403 name = "[CP] Embed Pods Frameworks"; 401 name = "[CP] Embed Pods Frameworks";
404 outputPaths = ( 402 outputPaths = (
405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", 403 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
406 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",  
407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework", 404 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework", 405 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework", 406 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
410 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework", 407 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework",
411 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework", 408 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework", 409 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
413 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",  
414 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework", 410 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
415 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", 411 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
416 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", 412 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",