提交

QXLive/Mine(音域)/Controller/亲密关系/QXHeartBeatSpaceViewController.m

@@ -6,17 +6,240 @@
 //
 
 #import "QXHeartBeatSpaceViewController.h"
+#import "QXMineNetwork.h"
+#import "QXHeartBeatSpaceRecordCell.h"
+#import "QXHeartBeatLevelRuleView.h"
+#import "QXUserCpDressView.h"
+
+@interface QXHeartBeatSpaceViewController ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic,strong)UIImageView *topImageView;
+@property (nonatomic,strong)UIImageView *titleImageView;
+@property (nonatomic,strong)UIImageView *flyImageView;
+@property (nonatomic,strong)QXSeatHeaderView *leftHeaderView;
+@property (nonatomic,strong)UIImageView *heartImageView;
+@property (nonatomic,strong)QXSeatHeaderView *rightHeaderView;
+@property (nonatomic,strong)UILabel *timeLabel;
+
+@property (nonatomic,strong)UIView *recordContentView;
+@property (nonatomic,strong)UIView *expView;
+@property (nonatomic,strong)UILabel *expLabel;
+@property (nonatomic,strong)UITableView *tableView;
+@property (nonatomic,strong)UIImageView *cpDressBgImageView;
+@property (nonatomic,strong)QXUserCpDressView *cpDressView;
 
-@interface QXHeartBeatSpaceViewController ()
 
 @end
 
 @implementation QXHeartBeatSpaceViewController
 
 - (void)viewDidLoad {
+    self.isNoChangeBgImage = YES;
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 }
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+}
+-(void)setNavgationItems{
+    [super setNavgationItems];
+    UIButton*recordBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
+    [recordBtn setImage:[UIImage imageNamed:@"nobility_help_icon"] forState:(UIControlStateNormal)];
+    recordBtn.titleLabel.font = [UIFont systemFontOfSize:16];
+    [recordBtn addTarget:self action:@selector(helpAction) forControlEvents:(UIControlEventTouchUpInside)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:recordBtn];
+}
+- (void)initSubViews{
+    [self updateBackImage:[UIImage imageNamed:@"mine_intimate_back"]];
+    self.page = 1;
+    self.view.backgroundColor = RGB16(0xBF8BFA);
+    self.topImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_heart_beat_space_bg"]];
+    self.topImageView.frame = CGRectMake(0, 0, SCREEN_WIDTH, ScaleWidth(336));
+    [self.view addSubview:self.topImageView];
+    
+    
+   
+    
+    self.titleImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_heart_beat_title"]];
+    self.titleImageView.frame = CGRectMake((SCREEN_WIDTH-ScaleWidth(199))/2, ScaleWidth(48), ScaleWidth(199), ScaleWidth(87));
+    [self.view addSubview:self.titleImageView];
+    
+    self.flyImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_heart_beat_fly"]];
+    self.flyImageView.frame = CGRectMake((self.view.width-ScaleWidth(328))/2, self.titleImageView.top+ScaleWidth(24), ScaleWidth(328), ScaleWidth(184));
+    [self.view addSubview:self.flyImageView];
 
+    
+    self.leftHeaderView = [[QXSeatHeaderView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH/2-ScaleWidth(72), self.titleImageView.bottom+ScaleWidth(26), ScaleWidth(72), ScaleWidth(72))];
+    [self.leftHeaderView addRoundedCornersWithRadius:ScaleWidth(36)];
+    self.leftHeaderView.layer.borderWidth = 2;
+    self.leftHeaderView.layer.borderColor = RGB16(0xffffff).CGColor;
+    [self.view addSubview:self.leftHeaderView];
+    
+    
+    self.rightHeaderView = [[QXSeatHeaderView alloc] initWithFrame:CGRectMake(self.leftHeaderView.right, self.titleImageView.bottom+ScaleWidth(26), ScaleWidth(72), ScaleWidth(72))];
+    [self.rightHeaderView addRoundedCornersWithRadius:ScaleWidth(36)];
+    self.rightHeaderView.layer.borderWidth = 2;
+    self.rightHeaderView.layer.borderColor = RGB16(0xffffff).CGColor;
+    [self.view addSubview:self.rightHeaderView];
+    
+    
+    self.heartImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_heart_beat_heart_icon"]];
+    self.heartImageView.frame = CGRectMake(SCREEN_WIDTH/2-ScaleWidth(26/2), 0, ScaleWidth(26), ScaleWidth(26));
+    [self.view addSubview:self.heartImageView];
+    
+    self.heartImageView.centerY = self.leftHeaderView.centerY;
+    
+    self.timeLabel = [[UILabel alloc] init];
+    self.timeLabel.font = [UIFont systemFontOfSize:14];
+    self.timeLabel.textColor = RGB16(0xffffff);
+    self.timeLabel.backgroundColor = RGB16A(0x0300C8,0.35);
+    [self.timeLabel addRoundedCornersWithRadius:11.5];
+    [self.view addSubview:self.timeLabel];
+    
+    self.recordContentView = [[UIView alloc] initWithFrame:CGRectMake(16,  self.topImageView.bottom-ScaleWidth(20), SCREEN_WIDTH-32, self.view.height-self.topImageView.bottom-ScaleWidth(20))];
+    self.recordContentView.backgroundColor = RGB16(0xffffff);
+    [self.recordContentView addRoundedCornersWithRadius:12];
+    
+    
+    self.expView = [[UIView alloc] initWithFrame:CGRectMake(14, 14, self.recordContentView.width-28, ScaleWidth(89))];
+    [self.recordContentView addSubview:self.expView];
+    
+    UIImageView *expImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_heart_beat_exp_bg"]];
+    expImageView.frame = self.expView.bounds;
+    [self.expView addSubview:expImageView];
+    
+    self.expLabel = [[UILabel alloc] initWithFrame:CGRectMake(127, (self.expView.height-32)/2, self.expView.width-127-10, 32)];
+    self.expLabel.textColor = RGB16(0xffffff);
+    self.expLabel.font = [UIFont systemFontOfSize:16];
+    [self.expView addSubview:self.expLabel];
+    
+    [self.recordContentView addSubview:self.tableView];
+    [self.view addSubview:self.recordContentView];
+//    user_heart_beat_exp_bg
+    self.cpDressBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"heart_beat_space_dress_bg"]];
+    self.cpDressBgImageView.frame = CGRectMake(self.view.width-ScaleWidth(115), 0, ScaleWidth(115), ScaleWidth(210));
+    [self.view addSubview:self.cpDressBgImageView];
+    self.cpDressBgImageView.centerY = self.leftHeaderView.centerY;
+//    [self.cpDressBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.right.equalTo(self.view);
+//        make.centerY.equalTo(self.leftHeaderView);
+//        make.width.mas_equalTo(ScaleWidth(115));
+//        make.height.mas_equalTo(ScaleWidth(210));
+//    }];
+    
+    self.cpDressView = [[QXUserCpDressView alloc] initWithFrame:self.cpDressBgImageView.frame];
+    [self.cpDressView hideHeader];
+    [self.view addSubview:self.cpDressView];
+//    [self.cpDressView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.edges.equalTo(self.cpDressBgImageView);
+//    }];
+    self.cpDressView.hidden = YES;
+    self.cpDressBgImageView.hidden = YES;
+}
 
+-(void)helpAction{
+    QXHeartBeatLevelRuleView *view = [[QXHeartBeatLevelRuleView alloc] init];
+    NSString *urlStr =  [NSString stringWithFormat:@"%@api/Page/page_show?id=31",ServerUrl];
+    view.rule = urlStr;
+    [view showInView:self.view];
+}
+
+-(void)setUserId:(NSString *)userId{
+    _userId = userId;
+    self.page = 1;
+    [self getList];
+}
+-(void)getList{
+    MJWeakSelf
+    [QXMineNetwork heartBeatUserInfoWithUserId:self.userId page:self.page successBlock:^(QXUserCpInfoModel * _Nonnull model) {
+        if (weakSelf.page == 1) {
+            if ([model.user_info1.user_id isEqualToString:weakSelf.userId]) {
+                [weakSelf.leftHeaderView setHeadIcon:model.user_info1.avatar dress:model.user_info1.dress];
+                [weakSelf.rightHeaderView setHeadIcon:model.user_info2.avatar dress:model.user_info2.dress];
+            }else{
+                [weakSelf.leftHeaderView setHeadIcon:model.user_info2.avatar dress:model.user_info2.dress];
+                [weakSelf.rightHeaderView setHeadIcon:model.user_info1.avatar dress:model.user_info1.dress];
+            }
+            if ([model.pendant isExist]) {
+                weakSelf.cpDressView.hidden = NO;
+                weakSelf.cpDressBgImageView.hidden = NO;
+                weakSelf.cpDressView.model = model;
+            }
+            
+            NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
+            long long milliseconds = (long long)(currentTime);
+            NSInteger time =  milliseconds - model.createtime.longLongValue;
+            weakSelf.timeLabel.text = [NSString stringWithFormat:@"   我们在一起%@啦   ",[NSString getTimeWithDay:time]];
+            [weakSelf.timeLabel sizeToFit];
+            weakSelf.timeLabel.centerX = weakSelf.topImageView.centerX;
+            weakSelf.timeLabel.height = 21;
+            weakSelf.timeLabel.top = weakSelf.leftHeaderView.bottom+ScaleWidth(21);
+            if (model.next_level_exp.integerValue <=0 ) {
+                weakSelf.expLabel.text = @"当前已是最高等级";
+            }else{
+                NSString *expString = [NSString stringWithFormat:@"还需%@经验升级",model.next_level_exp];
+                NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:expString];
+                [attr yy_setFont:[UIFont fontWithName:@"DIN Condensed" size:32] range:[expString rangeOfString:model.next_level_exp]];
+                [attr yy_setColor:RGB16(0xFFF022) range:[expString rangeOfString:model.next_level_exp]];
+                weakSelf.expLabel.attributedText = attr;
+            }
+            [weakSelf.dataArray removeAllObjects];
+        }
+        [weakSelf.dataArray addObjectsFromArray:model.gift_log];
+        [weakSelf.tableView reloadData];
+        if (model.gift_log.count == 0) {
+            weakSelf.tableView.mj_footer.state = MJRefreshStateNoMoreData;
+        }else{
+            [weakSelf.tableView.mj_footer endRefreshing];
+        }
+        [weakSelf.tableView.mj_header endRefreshing];
+    } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+        showToast(msg);
+        [weakSelf.tableView.mj_header endRefreshing];
+        [weakSelf.tableView.mj_footer endRefreshing];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [weakSelf.navigationController popViewControllerAnimated:YES];
+        });
+    }];
+}
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    return self.dataArray.count;
+}
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    QXHeartBeatSpaceRecordCell *cell = [QXHeartBeatSpaceRecordCell cellWithTableView:tableView];
+    cell.userId = self.userId;
+    cell.model = self.dataArray[indexPath.row];
+    return cell;
+}
+
+-(UITableView *)tableView{
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(14,self.expView.bottom+6,self.recordContentView.width-28,self.recordContentView.height-self.expView.bottom-14-6) style:(UITableViewStylePlain)];
+        _tableView.dataSource = self;
+        _tableView.delegate = self;
+        _tableView.backgroundColor = RGB16(0xF4F4F4);
+        [_tableView addRoundedCornersWithRadius:12];
+        _tableView.tableFooterView = [UIView new];
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.rowHeight = UITableViewAutomaticDimension;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+        if (@available(iOS 15.0, *)) {
+            _tableView.sectionHeaderTopPadding = 0;
+        } else {
+            // Fallback on earlier versions
+        }
+        MJWeakSelf
+        _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+            weakSelf.page = 1;
+            [weakSelf getList];
+        }];
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            weakSelf.page++;
+            [weakSelf getList];
+        }];
+    }
+    return _tableView;
+}
 @end

QXLive/Mine(音域)/Controller/亲密关系/QXIntimateViewController.m

@@ -14,8 +14,9 @@
 #import "QXMoreIntimateViewController.h"
 #import "QXIntimateMoreListCell.h"
 #import "QXHeartBeatSpaceViewController.h"
+#import "QXUserHomePageViewController.h"
 
-@interface QXIntimateViewController ()<UITableViewDataSource,UITableViewDelegate>
+@interface QXIntimateViewController ()<UITableViewDataSource,UITableViewDelegate,QXUserCpCardViewDelegate,QXIntimateMoreListCellDelegate>
 @property (nonatomic,strong)UITableView *tableView;
 @property (nonatomic,strong)QXRoomBestFriendModel *model;
 @end
@@ -79,6 +80,7 @@
     QXMoreIntimateViewController *vc = [[QXMoreIntimateViewController alloc] init];
     vc.userId = self.userId;
     vc.relation_id = md.relation_list.firstObject.relation_id;
+    vc.relation_name = md.relation_name;
     [self.navigationController pushViewController:vc animated:YES];
 }
 
@@ -98,7 +100,9 @@
     if (indexPath.section == 0) {
         if (self.model.cp) {
             QXIntimateCpCell *cell = [QXIntimateCpCell cellWithTableView:tableView];
+            cell.userId = self.userId;
             cell.model = self.model.cp;
+            cell.delegate = self;
             return cell;
         }else{
             QXIntimateNoCpCell *cell = [QXIntimateNoCpCell cellWithTableView:tableView];
@@ -108,6 +112,7 @@
         QXRoomBestFriendListModel *md = self.dataArray[indexPath.section-1];
         if (md.relation_list.count > 1) {
             QXIntimateListCell*cell = [QXIntimateListCell cellWithTableView:tableView];
+            cell.userId = self.userId;
             if (self.dataArray.count>0) {
                 QXRoomBestFriendListModel *md = self.dataArray[indexPath.section-1];
                 cell.model = md;
@@ -116,8 +121,10 @@
         }else{
             MJWeakSelf
             QXIntimateMoreListCell *cell = [QXIntimateMoreListCell cellWithTableView:tableView];
+            cell.userId = self.userId;
             QXRoomBestFriendListModel *md = self.dataArray.firstObject;
             cell.model = md.relation_list.firstObject;
+            cell.delegate = self;
             cell.deleteSuccessBlock = ^(QXRelationshipListModel * _Nonnull model) {
                 weakSelf.page = 1;
                 [weakSelf getList];
@@ -184,13 +191,13 @@
         }
     }else{
         QXRoomBestFriendListModel *md = self.dataArray[indexPath.section-1];
-        if (md.relation_list.count > 1) {
+        if (md.relation_list.count ==  1) {
             return ScaleWidth(92)+18;
         }else{
             if (md.relation_list.count == 0) {
                 return 0;
             }else{
-                return ScaleWidth(100)+16;
+                return ScaleWidth(125);
             }
         }
         
@@ -206,14 +213,35 @@
     return 15;
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (indexPath.section == 0) {
-        if (self.model.cp) {
-            QXHeartBeatSpaceViewController *vc = [[QXHeartBeatSpaceViewController alloc] init];
-            vc.userId = self.userId;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
+//    if (indexPath.section == 0) {
+//        if (self.model.cp) {
+//            QXHeartBeatSpaceViewController *vc = [[QXHeartBeatSpaceViewController alloc] init];
+//            vc.userId = self.userId;
+//            [self.navigationController pushViewController:vc animated:YES];
+//        }
+//    }
+}
+
+-(void)didClickHeaderCardViewWithUserId:(NSString *)userId{
+    if (self.model.cp) {
+        QXHeartBeatSpaceViewController *vc = [[QXHeartBeatSpaceViewController alloc] init];
+        vc.userId = self.userId;
+        [self.navigationController pushViewController:vc animated:YES];
     }
 }
+
+-(void)didClickHeaderViewUserId:(NSString *)userId{
+    QXUserHomePageViewController *vc = [[QXUserHomePageViewController alloc] init];
+    vc.user_id = userId;
+    [self.navigationController pushViewController:vc animated:YES];
+    
+}
+- (void)didClickHeaderWithUserId:(NSString *)userId{
+    QXUserHomePageViewController *vc = [[QXUserHomePageViewController alloc] init];
+    vc.user_id = userId;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
 -(UITableView *)tableView{
     if (!_tableView) {
         _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, NavContentHeight+ScaleWidth(68), SCREEN_WIDTH, SCREEN_HEIGHT -NavContentHeight-ScaleWidth(68)) style:(UITableViewStyleGrouped)];

QXLive/Mine(音域)/Controller/亲密关系/QXMoreIntimateViewController.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface QXMoreIntimateViewController : QXBaseViewController
 @property (nonatomic,strong)NSString *userId;
 @property (nonatomic,strong)NSString *relation_id;
+@property (nonatomic,strong)NSString *relation_name;
 @end
 
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/Controller/亲密关系/QXMoreIntimateViewController.m

@@ -16,9 +16,30 @@
 @implementation QXMoreIntimateViewController
 
 - (void)viewDidLoad {
+    self.isNoChangeBgImage = YES;
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 }
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+}
+-(void)initSubViews{
+    [super initSubViews];
+    self.page = 1;
+    [self updateBgImage:@"mine_intimate_bg"];
+    [self updateBackImage:[UIImage imageNamed:@"mine_intimate_back"]];
+    UIImageView *titleImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_intimate_title_img"]];
+    [self.view addSubview:titleImageView];
+    [titleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self.view);
+        make.width.mas_equalTo(ScaleWidth(178));
+        make.height.mas_equalTo(ScaleWidth(68));
+        make.top.mas_equalTo(NavContentHeight);
+    }];
+    [self.view addSubview:self.tableView];
+    
+}
 -(void)setUserId:(NSString *)userId{
     _userId = userId;
 }
@@ -33,6 +54,7 @@
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     QXIntimateMoreListCell *cell = [QXIntimateMoreListCell cellWithTableView:tableView];
+    cell.userId = self.userId;
     cell.model = self.dataArray[indexPath.row];
     MJWeakSelf
     cell.topSuccessBlock = ^(QXRelationshipListModel * _Nonnull model) {
@@ -46,7 +68,29 @@
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     return ScaleWidth(92)+16;
 }
-
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.width, 50)];
+    UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mine_intimate_title_bg"]];
+    UILabel *titleLabel = [[UILabel alloc] init];
+    titleLabel.font = [UIFont boldSystemFontOfSize:16];
+    titleLabel.textColor = RGB16(0xffffff);
+    [header addSubview:imageView];
+    [header addSubview:titleLabel];
+    [imageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(132);
+        make.height.mas_equalTo(36);
+        make.centerX.centerY.equalTo(header);
+    }];
+    [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(header);
+        make.centerY.equalTo(header).offset(2);
+    }];
+    titleLabel.text = self.relation_name;
+    return header;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    return 50;
+}
 -(void)getList{
     MJWeakSelf
     [QXMineNetwork userBestFriendsMoreListWithUserId:self.userId relation_id:self.relation_id successBlock:^(NSArray<QXRelationshipListModel *> * _Nonnull model) {