房间完成

QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m

@@ -30,6 +30,14 @@
 @property (nonatomic,strong)UIImageView *bgImageView;
 /// 头像
 @property (nonatomic,strong)QXSeatHeaderView *headerImageView;
+/// 师傅
+@property (nonatomic,strong)UIView *masterView;
+/// 师傅
+@property (nonatomic,strong)QXSeatHeaderView *masterHeaderView;
+/// 师傅
+@property (nonatomic,strong)UIImageView *masterViewIcon;
+/// 师傅点击按钮
+@property (nonatomic,strong)UIButton *masterViewButton;
 /// 昵称
 @property (nonatomic,strong)CKShimmerLabel *nameLabel;
 @property (nonatomic,strong)UIImageView *sexImageView;
@@ -123,8 +131,42 @@
         make.size.mas_equalTo(CGSizeMake(ScaleWidth(66), ScaleWidth(79)));
     }];
     
+    self.masterView = [[UIView alloc] init];
+    self.masterView.hidden = YES;
+    [self.bgView addSubview:self.masterView];
+    [self.masterView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.headerImageView);
+        make.left.equalTo(self.headerImageView.mas_right);
+        make.size.mas_equalTo(CGSizeMake(ScaleWidth(45), ScaleWidth(45+16)));
+    }];
+    
+    self.masterHeaderView = [[QXSeatHeaderView alloc] init];
+    self.masterHeaderView.contentMode = UIViewContentModeScaleAspectFill;
+    [self.masterView addSubview:self.masterHeaderView];
+//
+    [self.masterHeaderView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.equalTo(self.masterView);
+        make.height.equalTo(self.masterHeaderView.mas_width);
+    }];
+    
+    self.masterViewIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_info_master_icon"]];
+    [self.masterView insertSubview:self.masterViewIcon aboveSubview:self.masterHeaderView];
+    [self.masterViewIcon mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.masterHeaderView.mas_bottom).offset(-8);
+        make.centerX.equalTo(self.masterView);
+        make.size.mas_equalTo(CGSizeMake(ScaleWidth(30), ScaleWidth(16)));
+    }];
+    
+    self.masterViewButton = [[UIButton alloc] init];
+    [self.masterViewButton addTarget:self action:@selector(toMasterUserHome) forControlEvents:(UIControlEventTouchUpInside)];
+    [self.masterView addSubview:self.masterViewButton];
+    [self.masterViewButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.masterView);
+    }];
+    
+    
     UIButton *headder = [[UIButton alloc] init];
-    [headder addTarget:self action:@selector(toHomePage) forControlEvents:(UIControlEventTouchUpInside)];
+    [headder addTarget:self action:@selector(toUserHome) forControlEvents:(UIControlEventTouchUpInside)];
     [self.bgView addSubview:headder];
     [headder mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.left.right.top.equalTo(self.headerImageView);
@@ -485,11 +527,22 @@
 -(void)followAction{
     [[QXGlobal shareGlobal] joinRoomWithRoomId:self.roomId isRejoin:NO navagationController:self.viewController.navigationController];
 }
+-(void)toMasterUserHome{
+    [self toHomePageIsMaster:YES];
+}
+-(void)toUserHome{
+    [self toHomePageIsMaster:NO];
+}
 
--(void)toHomePage{
+-(void)toHomePageIsMaster:(BOOL)isMaster{
     [self hide];
     QXUserHomePageViewController *vc = [[QXUserHomePageViewController alloc] init];
     NSString *userId = self.userId;
+    if (isMaster) {
+        userId = self.userModel.master.user_id;
+    }else{
+        userId = self.userId;
+    }
     vc.user_id = userId;
     [self.viewController.navigationController pushViewController:vc animated:YES];
 }
@@ -590,6 +643,12 @@
         }else{
             [weakSelf.nameLabel stopShimmer];
         }
+        if (model.master) {
+            weakSelf.masterView.hidden = NO;
+            [weakSelf.masterHeaderView setHeadIcon:model.master.avatar dress:model.master.dress];
+        }else{
+            weakSelf.masterView.hidden = YES;
+        }
         weakSelf.nameLabel.text = model.nickname;
         [weakSelf.nameLabel.contentLabel sizeToFit];
         [weakSelf.nameLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
@@ -920,6 +979,11 @@
     }
     if (sender == self.joinGuildBtn) {
         QXLOG(@"加入公会");
+        [QXMineNetwork joinGuildWithGuildId:self.userModel.guild successBlock:^(NSDictionary * _Nonnull dict) {
+            
+        } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+            
+        }];
         return;
     }
     if (sender == self.focusBtn) {