diff --git a/xplan-ios/Main/Home/View/XPHomeLivesViewController.h b/xplan-ios/Main/Home/View/XPHomeLivesViewController.h index db54e5b1..2b76e954 100644 --- a/xplan-ios/Main/Home/View/XPHomeLivesViewController.h +++ b/xplan-ios/Main/Home/View/XPHomeLivesViewController.h @@ -12,6 +12,9 @@ NS_ASSUME_NONNULL_BEGIN @interface XPHomeLivesViewController : MvpViewController +///是否非tabbar上的 +@property (nonatomic, assign) BOOL noTabbarVc; + @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Home/View/XPHomeLivesViewController.m b/xplan-ios/Main/Home/View/XPHomeLivesViewController.m index ab396ccc..fd717a0c 100644 --- a/xplan-ios/Main/Home/View/XPHomeLivesViewController.m +++ b/xplan-ios/Main/Home/View/XPHomeLivesViewController.m @@ -82,7 +82,11 @@ - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; - self.pagingView.frame = CGRectMake(0, kNavigationHeight, KScreenWidth, KScreenHeight - kNavigationHeight); + if (!self.noTabbarVc) { + self.pagingView.frame = CGRectMake(0, kNavigationHeight, KScreenWidth, KScreenHeight - kNavigationHeight); + } else { + self.pagingView.frame = self.view.bounds; + } } - (void)viewWillAppear:(BOOL)animated { @@ -124,12 +128,14 @@ #pragma mark - Private Method - (void)initSubViews { self.view.backgroundColor = [UIColor clearColor]; - [self.customNavigationBar addSubview:self.titleLabel]; - [self.view addSubview:self.customNavigationBar]; + if (!self.noTabbarVc) { + [self.view addSubview:self.customNavigationBar]; + [self.customNavigationBar addSubview:self.titleLabel]; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.mas_equalTo(self.customNavigationBar); + }]; + } [self.view addSubview:self.pagingView]; - [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.customNavigationBar); - }]; } #pragma mark - XPHomeRecommendProtocol diff --git a/xplan-ios/Main/Home/View/XPHomePartyContainerViewController.m b/xplan-ios/Main/Home/View/XPHomePartyContainerViewController.m index 50b82948..1e536d0c 100644 --- a/xplan-ios/Main/Home/View/XPHomePartyContainerViewController.m +++ b/xplan-ios/Main/Home/View/XPHomePartyContainerViewController.m @@ -148,7 +148,12 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey; index = idx; *stop = YES; } - } + } else if ([[dic objectForKey:@"section"] integerValue] == 3) { + if ([obj.name containsString:@"个播"]) { + index = idx; + *stop = YES; + } + } }]; [self.titleView selectItemAtIndex:index]; }); diff --git a/xplan-ios/Main/Home/View/XPHomeViewController.m b/xplan-ios/Main/Home/View/XPHomeViewController.m index 4d0f9bf8..b4a54ae4 100644 --- a/xplan-ios/Main/Home/View/XPHomeViewController.m +++ b/xplan-ios/Main/Home/View/XPHomeViewController.m @@ -28,6 +28,7 @@ #import "XPHomeHotRoomViewController.h" #import "XPRoomViewController.h" #import "XPLittleGameRoomOpenView.h" +#import "XPHomeLivesViewController.h" UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; @@ -42,6 +43,8 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; @property (nonatomic,assign) NSInteger defaultSelectedIndex; @property (nonatomic,strong) XPHomeRecommendViewController *recommendVC; @property (nonatomic,strong) XPHomePartyContainerViewController *partyVC; +///个播房的 +@property (nonatomic, strong) XPHomeLivesViewController *anchorRoomListVC; @end @@ -97,7 +100,9 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; return self.recommendVC; }else if (index == 1) { return self.partyVC; - } + } else if (index == 2) { + return self.anchorRoomListVC; + } return nil; } @@ -178,7 +183,7 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; - (NSArray *)titles { if (!_titles) { - _titles = @[@"推荐",@"派对"]; + _titles = @[@"推荐",@"派对", @"直播"]; } return _titles; } @@ -198,4 +203,11 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; return _partyVC; } +- (XPHomeLivesViewController *)anchorRoomListVC { + if (!_anchorRoomListVC) { + _anchorRoomListVC = [[XPHomeLivesViewController alloc] init]; + _anchorRoomListVC.noTabbarVc = YES; + } + return _anchorRoomListVC; +} @end diff --git a/xplan-ios/Main/Tabbar/View/TabbarViewController.m b/xplan-ios/Main/Tabbar/View/TabbarViewController.m index f5cb5d79..19d52876 100644 --- a/xplan-ios/Main/Tabbar/View/TabbarViewController.m +++ b/xplan-ios/Main/Tabbar/View/TabbarViewController.m @@ -70,7 +70,6 @@ UIKIT_EXTERN NSString * kUserCompleteInfoFinishKey; NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey"; NSString * const kHadLaunchApp = @"kHadLaunchApp"; NSString * const kLastShowAnchorCardTime = @"kLastShowAnchorCardTime"; -UIKIT_EXTERN NSString * kHomeMoreScrollPageKey; UIKIT_EXTERN NSString * kNewUserRechargeKey; UIKIT_EXTERN NSString *kTabShowAnchorCardKey; @@ -113,7 +112,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [[NSNotificationCenter defaultCenter] addObserverForName:kUserCompleteInfoFinishKey object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { [self completeUserInfoFinish:note.object]; }]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recommendMoreNotification:) name:kHomeMoreScrollPageKey object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showNewUserRecharge) name:kNewUserRechargeKey object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil]; } @@ -516,13 +514,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [TTPopup popupView:view style:TTPopupStyleAlert]; } -#pragma mark - Event Response -- (void)recommendMoreNotification:(NSNotification *)notification { - if ([notification.object[@"section"] intValue] == 3) { - self.selectedIndex = 1; - } -} - #pragma mark - 主播卡片弹窗 //新用户专享充值弹窗 - (void)showNewUserRecharge {