Commit 4396e1dc2f4b58bc4f75614f0d27f6028a384708
1 parent
098d2b8c
布局配置修改提交
Showing
5 changed files
with
19 additions
and
8 deletions
CNLiveVideoClassifyKit.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveVideoClassifyKit' | 10 | s.name = 'CNLiveVideoClassifyKit' |
| 11 | - s.version = '0.0.35' | 11 | + s.version = '0.0.36' |
| 12 | s.summary = '视讯头部一二级菜单组件' | 12 | s.summary = '视讯头部一二级菜单组件' |
| 13 | 13 | ||
| 14 | # This description is used to generate tags and improve search results. | 14 | # This description is used to generate tags and improve search results. |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNCategoryBaseViewController.m
| @@ -19,11 +19,15 @@ | @@ -19,11 +19,15 @@ | ||
| 19 | [self.view addSubview: self.categoryView]; | 19 | [self.view addSubview: self.categoryView]; |
| 20 | [self.view addSubview:self.listContainerView]; | 20 | [self.view addSubview:self.listContainerView]; |
| 21 | self.view.backgroundColor = [UIColor whiteColor]; | 21 | self.view.backgroundColor = [UIColor whiteColor]; |
| 22 | + | ||
| 23 | + // Do any additional setup after loading the view. | ||
| 24 | +} | ||
| 25 | +- (void)viewDidLayoutSubviews | ||
| 26 | +{ | ||
| 27 | + [super viewDidLayoutSubviews]; | ||
| 22 | self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]); | 28 | self.categoryView.frame = CGRectMake(0, kStatusHeight, self.view.bounds.size.width, [self preferredCategoryViewHeight]); |
| 23 | self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height); | 29 | self.listContainerView.frame = CGRectMake(0, [self preferredCategoryViewHeight], self.view.bounds.size.width, self.view.bounds.size.height); |
| 24 | - // Do any additional setup after loading the view. | ||
| 25 | } | 30 | } |
| 26 | - | ||
| 27 | #pragma mark - Public | 31 | #pragma mark - Public |
| 28 | - (void)categoryViewSelectedItemAtIndex:(NSInteger)index | 32 | - (void)categoryViewSelectedItemAtIndex:(NSInteger)index |
| 29 | { | 33 | { |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveClassifySegmentController.m
| @@ -165,7 +165,11 @@ static const CGFloat animationHeight = 15; | @@ -165,7 +165,11 @@ static const CGFloat animationHeight = 15; | ||
| 165 | [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) { | 165 | [CNLiveListManager shareListManager].scrollViewDidScrollBlock = ^(BOOL isUp) { |
| 166 | [weakSelf scrollViewUpDowm:isUp]; | 166 | [weakSelf scrollViewUpDowm:isUp]; |
| 167 | }; | 167 | }; |
| 168 | - | 168 | + // Do any additional setup after loading the view. |
| 169 | +} | ||
| 170 | +- (void)viewDidLayoutSubviews | ||
| 171 | +{ | ||
| 172 | + [super viewDidLayoutSubviews]; | ||
| 169 | self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ 50); | 173 | self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom+ 50); |
| 170 | if ([CNUserShareManager isLogin]) { | 174 | if ([CNUserShareManager isLogin]) { |
| 171 | self.myCategoryView.width = kScreenWidth - 45; | 175 | self.myCategoryView.width = kScreenWidth - 45; |
| @@ -187,7 +191,6 @@ static const CGFloat animationHeight = 15; | @@ -187,7 +191,6 @@ static const CGFloat animationHeight = 15; | ||
| 187 | self.loginBtn.centerY = self.myCategoryView.centerY+kStatusHeight; | 191 | self.loginBtn.centerY = self.myCategoryView.centerY+kStatusHeight; |
| 188 | } | 192 | } |
| 189 | } | 193 | } |
| 190 | - // Do any additional setup after loading the view. | ||
| 191 | } | 194 | } |
| 192 | -(void)viewWillAppear:(BOOL)animated { | 195 | -(void)viewWillAppear:(BOOL)animated { |
| 193 | 196 |
CNLiveVideoClassifyKit/Classes/ClassifyCategory/Controller/CNLiveSubSegmentController.m
| @@ -179,6 +179,12 @@ | @@ -179,6 +179,12 @@ | ||
| 179 | self.bgImgView.top = 0; | 179 | self.bgImgView.top = 0; |
| 180 | self.listContainerView.scrollView.scrollEnabled = YES; | 180 | self.listContainerView.scrollView.scrollEnabled = YES; |
| 181 | } | 181 | } |
| 182 | + // Do any additional setup after loading the view. | ||
| 183 | +} | ||
| 184 | + | ||
| 185 | +- (void)viewDidLayoutSubviews | ||
| 186 | +{ | ||
| 187 | + [super viewDidLayoutSubviews]; | ||
| 182 | if (self.showType == CNLiveSubVCShowtypeChannel) { | 188 | if (self.showType == CNLiveSubVCShowtypeChannel) { |
| 183 | self.myCategoryView.top = kNavigationBarHeight; | 189 | self.myCategoryView.top = kNavigationBarHeight; |
| 184 | }else{ | 190 | }else{ |
| @@ -201,9 +207,7 @@ | @@ -201,9 +207,7 @@ | ||
| 201 | } | 207 | } |
| 202 | 208 | ||
| 203 | self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom -10); | 209 | self.listContainerView.frame = CGRectMake(0, self.myCategoryView.bottom+10, kScreenWidth, self.view.bounds.size.height - self.myCategoryView.bottom -10); |
| 204 | - // Do any additional setup after loading the view. | ||
| 205 | } | 210 | } |
| 206 | - | ||
| 207 | - (void)viewWillAppear:(BOOL)animated | 211 | - (void)viewWillAppear:(BOOL)animated |
| 208 | { | 212 | { |
| 209 | [super viewWillAppear:animated]; | 213 | [super viewWillAppear:animated]; |
Example/CNLiveVideoClassifyKit/CNLIVEAppDelegate.m
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | 13 | ||
| 14 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions | 14 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions |
| 15 | { | 15 | { |
| 16 | - [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight | 16 | + [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];//CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveTestFlight |
| 17 | // Override point for customization after application launch. | 17 | // Override point for customization after application launch. |
| 18 | return YES; | 18 | return YES; |
| 19 | } | 19 | } |