提交

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

@@ -24,6 +24,7 @@
 #import "QXUserCpCardView.h"
 #import "QXUserCpDressView.h"
 #import "QXHeartBeatSpaceViewController.h"
+#import "QXGuildViewController.h"
 
 @interface QXRoomUserInfoView()<UIGestureRecognizerDelegate,SDCycleScrollViewDelegate,QXMenuPopViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource,QXUserCpCardViewDelegate>
 @property (nonatomic,strong)UIView *bgView;
@@ -444,6 +445,7 @@
         QXHeartBeatSpaceViewController*vc = [[QXHeartBeatSpaceViewController alloc] init];
         vc.userId = weakSelf.userId;
         [weakSelf.viewController.navigationController pushViewController:vc animated:YES];
+        [weakSelf hide];
     }];
     [self.bgView addSubview:self.cpContentView];
     [self.cpContentView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -680,15 +682,18 @@
 //        }];
         [weakSelf.collectionView reloadData];
         weakSelf.idLabel.text = [NSString stringWithFormat:@"%@ ID:%@",model.sex.intValue==1?@"男":@"女",model.user_code];
-        weakSelf.guildLabel.text = [NSString stringWithFormat:@"所属公会:%@",[model.guild isExist]?model.guild:@"无"];
-        if ([model.guild isExist]) {
+        weakSelf.guildLabel.text = [NSString stringWithFormat:@"所属公会:%@",[model.guild_name isExist]?model.guild_name:@"无"];
+        if ([model.me_guild_name isExist]) {
+            weakSelf.joinGuildBtn.hidden = YES;
+        }else{
             if ([weakSelf.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
                 weakSelf.joinGuildBtn.hidden = YES;
             }else{
                 weakSelf.joinGuildBtn.hidden = NO;
             }
-        }else{
-            weakSelf.joinGuildBtn.hidden = YES;
+            if (![model.guild_name isExist]) {
+                self.joinGuildBtn.hidden = YES;
+            }
         }
         [weakSelf.upSeatBtn setTitle:model.is_in_pit.intValue==1?QXText(@"下麦"):QXText(@"抱麦") forState:(UIControlStateNormal)];
         [weakSelf.moreGiftBtn setTitle:[NSString localizedStringWithFormat:QXText(@"90天内累计收到%@个礼物"),model.gift_num] forState:(UIControlStateNormal)];
@@ -984,11 +989,14 @@
     }
     if (sender == self.joinGuildBtn) {
         QXLOG(@"加入公会");
-        [QXMineNetwork joinGuildWithGuildId:self.userModel.guild successBlock:^(NSDictionary * _Nonnull dict) {
-            
-        } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
-            
-        }];
+//        [QXMineNetwork joinGuildWithGuildId:self.userModel.guild_name successBlock:^(NSDictionary * _Nonnull dict) {
+//
+//        } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+//            
+//        }];
+        QXGuildViewController*vc = [[QXGuildViewController alloc] init];
+        vc.joinGuild = self.userModel.guild_id;
+        [self.viewController.navigationController pushViewController:vc animated:YES];
         return;
     }
     if (sender == self.focusBtn) {

QXLive/Room(房间)/View/直播/QXSeatHeaderView.m

@@ -81,6 +81,7 @@
         make.right.equalTo(self).offset(6);
         make.bottom.equalTo(self.headImageView.mas_bottom).offset(6);
     }];
+    [self bringSubviewToFront:self.nobilityImageView];
 }
 
 -(void)setHeadIcon:(NSString *)headerIcon