#916

save code

YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m

@@ -60,7 +60,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 ///背景
 //@property (nonatomic,strong) UIImageView *backImageView;
 ///导航
-@property (nonatomic,strong) XPNewHomeNavView *navView;
+//@property (nonatomic,strong) XPNewHomeNavView *navView;
 ///头视图
 @property(nonatomic,strong) XPNewHomeHeadView *headView;
 ///分页标题
@@ -103,10 +103,13 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 - (void)viewDidLoad {
     [super viewDidLoad];
     if(self.isEmpty == NO){
-        [self.presenter getHomeTagList];
-        [self initHttp];
         [self initSubViews];
         [self initSubViewConstraints];
+
+        [self requestCheckIp];
+//        [self.presenter getHomeAllTopsData];
+        [self.presenter getHomeTopData];
+        [self.presenter getHomeTagList];
     }
 }
 
@@ -114,12 +117,16 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     [super viewWillAppear:animated];
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    [self.pagingView.mainTableView.mj_header beginRefreshing];
+}
+
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
 }
 
 - (void)tokenInvalid {
- 
     [[AccountInfoStorage instance] saveAccountInfo:nil];
     [[AccountInfoStorage instance] saveTicket:nil];
     if ([NIMSDK sharedSDK].loginManager.isLogined) {
@@ -174,9 +181,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     self.pagingView.mainTableView.mj_header = header;
     [ClientConfig shareConfig].inviteCode = @"";
 
-    [self.pagingView.mainTableView.mj_header beginRefreshing];
+//    [self.pagingView.mainTableView.mj_header beginRefreshing];
     @kWeakify(self);
-    
     self.recommendVC.refreshComplete = ^{
         @kStrongify(self);
         [self.pagingView.mainTableView.mj_header endRefreshing];
@@ -193,7 +199,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(requestCheckIp) object:nil];
 }
 -(void)headerRefresh{
-    [self initHttp];
+    [self.presenter getHomeTopData];
+    [self.presenter getHomeRanks];
 
     PIHomeCategoryTitleModel *tagModel = [self.tagModelList xpSafeObjectAtIndex:self.type];
     XPHomePartyViewController *homeVC = [self.validListDict objectForKey:[NSNumber numberWithInteger:self.type]];
@@ -247,11 +254,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     }];
 }
 
-- (void)initHttp {
-    [self.presenter getHomeTopData];
-    [self requestCheckIp];
-}
-
 #pragma mark - XPNewHomeNavViewDelegate
 - (void)xPNewHomeNavView:(XPNewHomeNavView *)view didClickRank:(UIButton *)sender {
     XPWebViewController * webVC =[[XPWebViewController alloc] init];
@@ -301,7 +303,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 }
 #pragma mark - JXCategoryViewDelegate
 - (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView {
-  
+
     if (self.headView.itemList.count == 0 && self.headView.bannerList.count == 0){
         return 0;
     }else if (self.headView.itemList.count > 0 && self.headView.bannerList.count == 0){
@@ -370,9 +372,26 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0];
 }
 
+- (void)getHomeTopDataSuccess:(NSArray *)resourceList 
+                      banners:(NSArray *)banners
+                  rankAvatars:(NSArray *)rankAvatars {
+    self.headView.itemList = resourceList;
+    self.headView.bannerList = banners;
+    self.headView.rankAvatars = rankAvatars;
+    [self.pagingView reloadData];
+    [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0];
+}
+
+- (void)getHomeRanksSuccess:(NSArray *)resourceList
+{
+    self.headView.rankAvatars = resourceList;
+}
+
 ///获取所有的tag成功
 - (void)getHomeTagListSuccess:(NSArray<PIHomeCategoryTitleModel *> *)array{
-    if(array.count == 0)return;
+    if(array.count == 0) {
+        return;
+    }
     NSMutableArray *list = [NSMutableArray new];
     NSMutableArray *titleArray = [NSMutableArray array];
     for (PIHomeCategoryTitleModel *model in array) {
@@ -417,10 +436,10 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     [self showErrorToast:msg];
 }
 -(void)requestCheckIp{
-    if([AccountInfoStorage instance].getTicket.length > 0 && [AccountInfoStorage instance].name.length > 0){
+    if([AccountInfoStorage instance].getTicket.length > 0 && 
+       [AccountInfoStorage instance].name.length > 0){
         [self.presenter checkIpRegionAction];
     }
-   
 }
 ///选择
 -(void)selectItemWithModel:(PIHomeItemModel *)model{
@@ -488,23 +507,23 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
         _titleView.titles = @[];
         _titleView.backgroundColor = [UIColor clearColor];
         _titleView.titleColor = UIColorFromRGB(0x767585);
-        _titleView.titleSelectedColor = UIColorFromRGB(0x1E1E1F);
-        _titleView.titleFont = kFontRegular(14);
-        _titleView.titleSelectedFont = kFontSemibold(16);
+        _titleView.titleSelectedColor = UIColorFromRGB(0x1E1E1E);
+        _titleView.titleFont = kFontBold(14);
+        _titleView.titleSelectedFont = kFontBold(14);
         _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;
         _titleView.contentScrollViewClickTransitionAnimationEnabled = NO;
         _titleView.defaultSelectedIndex = 0;
-    
+
         _titleView.cellSpacing = kGetScaleWidth(20);
 
         _titleView.listContainer = (id<JXCategoryViewListContainer>)self.pagingView.listContainerView;
         
-        JXCategoryIndicatorImageView * indocator = [[JXCategoryIndicatorImageView alloc] init];
-        indocator.indicatorImageView.image = [UIImage imageNamed:@"ms_hoem_index_icon"];
-        indocator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(24), kGetScaleWidth(24));
-        indocator.verticalMargin = -kGetScaleWidth(4);
-        indocator.contentMode = UIViewContentModeScaleAspectFit;
-        _titleView.indicators = @[indocator];
+        JXCategoryIndicatorImageView * indicator = [[JXCategoryIndicatorImageView alloc] init];
+        indicator.indicatorImageView.image = [UIImage imageNamed:@"ms_hoem_index_icon"];
+        indicator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(24), kGetScaleWidth(24));
+        indicator.verticalMargin = -kGetScaleWidth(4);
+        indicator.contentMode = UIViewContentModeScaleAspectFit;
+        _titleView.indicators = @[indicator];
     }
     return _titleView;
 }
@@ -512,20 +531,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 - (NSMutableArray<PIHomeCategoryTitleModel *> *)tagModelList{
     if(!_tagModelList){
         _tagModelList = [NSMutableArray array];
-        PIHomeCategoryTitleModel *recommendModel = [PIHomeCategoryTitleModel new];
-        recommendModel.id = @"-1";
-        recommendModel.name = YMLocalizedString(@"XPNewHomeViewController0");
-        recommendModel.checkedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontSemibold(16)];
-        recommendModel.noCheckedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontRegular(14)];
-        recommendModel.isChecked = YES;
-        
-        PIHomeCategoryTitleModel *hotModel = [PIHomeCategoryTitleModel new];
-        hotModel.id = @"-2";
-        hotModel.name = YMLocalizedString(@"XPNewHomeViewController1");
-        hotModel.checkedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontSemibold(16)];
-        hotModel.noCheckedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontRegular(14)];
-//        [_tagModelList addObject:recommendModel];
-//        [_tagModelList addObject:hotModel];
     }
     return _tagModelList;
 }
@@ -550,13 +555,13 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 
 
-- (XPNewHomeNavView *)navView {
-    if (!_navView) {
-        _navView = [[XPNewHomeNavView alloc] init];
-        _navView.delegate = self;
-    }
-    return _navView;
-}
+//- (XPNewHomeNavView *)navView {
+//    if (!_navView) {
+//        _navView = [[XPNewHomeNavView alloc] init];
+//        _navView.delegate = self;
+//    }
+//    return _navView;
+//}
 
 //- (UIImageView *)backImageView {
 //    if (!_backImageView) {