适配

yanglingyu
1 parent fdb67b04
Showing 8 changed files with 45 additions and 8 deletions
CNLiveVideoClassifyKit.podspec
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveListController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Header/CNLivevideoClassifyPCH.h
Example/CNLiveVideoClassifyKit.xcodeproj/project.pbxproj
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.h
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveVideoClassifyKit'
-  s.version          = '0.0.31'
+  s.version          = '0.0.32'
   s.summary          = '视讯头部一二级菜单组件'
 # This description is used to generate tags and improve search results.
@@ -46,6 +46,7 @@ Pod::Spec.new do |s|
    s.dependency 'CNLiveBaseKit'
    s.dependency 'CNLiveCategory'
    s.dependency 'CNLiveUserManagement'
+   s.dependency 'CNLiveBusinessBaseModule'
    s.dependency 'CNLiveCommonCategory'
    s.dependency 'CNLiveBeeHive'
    s.dependency 'CNLiveEnvironment'
@@ -766,7 +766,7 @@ static const CGFloat animationHeight = 15;
         CNLiveSubSegmentController *subVC = [[CNLiveSubSegmentController alloc] initWithModel:model];
         subVC.showType = CNLiveSubVCShowtypeChannel;
         subVC.isBlack = isBlack;
-        [self.navigationController pushViewController:subVC animated:YES];
+        [[BaseAppDelegate sharedAppDelegate] pushViewController:subVC];
     }else{
         if([model.pageType isEqualToString:@"4"] || [model.pageType isEqualToString:@"5"]){
@@ -83,6 +83,9 @@
     if (([CNLiveListController searchProperties:[vc class] string:@"webView"]||[CNLiveListController searchProperties:[vc.superclass class] string:@"webView"])&&[vc valueForKey:@"webView"]&&[[vc valueForKey:@"webView"] isKindOfClass:[WKWebView class]]) {
         WKWebView *webView = (WKWebView *)[vc valueForKey:@"webView"];
         [webView.scrollView addObserver:self forKeyPath:@"contentOffset" options:NSKeyValueObservingOptionNew context:nil];
+        [webView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.equalTo(self.view);
+        }];
         if (!self.isLoading) {
             [webView.scrollView.mj_header beginRefreshing];
         }
@@ -191,7 +191,7 @@
         self.myCategoryView.top = 0;
     }
-    self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom);
+    self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom -10);
     self.searchBtn.right = KScreenWidth-12;
     CGFloat width = self.searchBtn.left;
     self.searchBtn.centerY = self.myCategoryView.height/2;
@@ -21,6 +21,7 @@
 #import <CNLiveBeeHive/BHConfig.h>
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveCustomControl/CNLiveNavigationBar.h>
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
 #import <MJExtension/MJExtension.h>
 //#import <UMCommon/MobClick.h>
 #import <MJRefresh/MJRefresh.h>
@@ -379,6 +379,7 @@
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCWebViewModule/CNLiveCWebViewModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
@@ -412,6 +413,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessBaseModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCWebViewModule.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
@@ -7,9 +7,8 @@
 //
 @import UIKit;
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
-@interface CNLIVEAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
+@interface CNLIVEAppDelegate : BaseAppDelegate <UIApplicationDelegate>
 @end
@@ -17,6 +17,32 @@ PODS:
   - CNLiveBaseKit (0.1.23):
     - CNLiveNewTripartiteManagement/MJExtension
   - CNLiveBeeHive (0.1.9)
+  - CNLiveBServices (0.1.3.9):
+    - CNLiveBeeHive
+    - CNLiveBServices/Live (= 0.1.3.9)
+    - CNLiveBServices/Login (= 0.1.3.9)
+    - CNLiveBServices/Message (= 0.1.3.9)
+    - CNLiveBServices/Mine (= 0.1.3.9)
+    - CNLiveBServices/Service (= 0.1.3.9)
+  - CNLiveBServices/Live (0.1.3.9):
+    - CNLiveBeeHive
+  - CNLiveBServices/Login (0.1.3.9):
+    - CNLiveBeeHive
+  - CNLiveBServices/Message (0.1.3.9):
+    - CNLiveBeeHive
+  - CNLiveBServices/Mine (0.1.3.9):
+    - CNLiveBeeHive
+  - CNLiveBServices/Service (0.1.3.9):
+    - CNLiveBeeHive
+  - CNLiveBusinessBaseModule (0.2.0):
+    - CNLiveBaseKit
+    - CNLiveBeeHive
+    - CNLiveBServices
+    - CNLiveCommonCategory
+    - CNLiveEnvironment
+    - CNLiveNewTripartiteManagement/QMUIKit
+    - CNLiveRequestBastKit
+    - CNLiveUserManagement
   - CNLiveBusinessTools (0.1.27):
     - CNLiveBaseKit
     - CNLiveEnvironment
@@ -136,9 +162,10 @@ PODS:
   - CNLiveSDK/CNLiveStat (0.3.4.8)
   - CNLiveUserManagement (0.1.5):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveVideoClassifyKit (0.0.30):
+  - CNLiveVideoClassifyKit (0.0.31):
     - CNLiveBaseKit
     - CNLiveBeeHive
+    - CNLiveBusinessBaseModule
     - CNLiveCategory
     - CNLiveCommonCategory
     - CNLiveCustomControl
@@ -511,6 +538,8 @@ SPEC REPOS:
   http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git:
     - CNLiveBaseKit
     - CNLiveBeeHive
+    - CNLiveBServices
+    - CNLiveBusinessBaseModule
     - CNLiveBusinessTools
     - CNLiveCategory
     - CNLiveCommonCategory
@@ -553,6 +582,8 @@ SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   CNLiveBaseKit: 44e5fc573cbca78a86b704cf77c886ef53889807
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
+  CNLiveBServices: 747c8c6c8d300c4daaeb108027c5886c66ed02ce
+  CNLiveBusinessBaseModule: 1d2eee2e04c8db762781b7ad45278d043db56748
   CNLiveBusinessTools: dfd3270d885523be2599bdc3a95a416277682d0d
   CNLiveCategory: c90a01af1e20cd89f47d4f551d47d2ddc9ca96f3
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
@@ -564,7 +595,7 @@ SPEC CHECKSUMS:
   CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
   CNLiveSDK: 75bafaafbb8c09dcb4420adfe0f05130405b25e7
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
-  CNLiveVideoClassifyKit: 69256224dd4833a46653960b28576b9f42574e24
+  CNLiveVideoClassifyKit: d36f2503ac8103369634f70f53df3ccc7b9a84d1
   FWDebug: 5a20d089a300517153de1438d8128ad4c4690951
   JXCategoryView: 2ef9ecfd3735158d009ce02d1f29811aa822da65
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201