diff --git a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h index adb14a4..1dfe7dd 100644 --- a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h +++ b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @interface QXGuildViewController : QXBaseViewController - +@property (nonatomic,strong)NSString*joinGuild; @end NS_ASSUME_NONNULL_END diff --git a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m index e4d0c30..3d05159 100644 --- a/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m +++ b/QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m @@ -44,7 +44,12 @@ static void *WKWebBrowserContext = &WKWebBrowserContext; } - (void)loadData { NSInteger safeTop = kSafeAreaTop; - NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/union/index?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]]; + NSString *urlString = [NSString stringWithFormat:@"%@web/index.html#/pages/union/index?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]; + + if ([self.joinGuild isExist]) { + urlString = [urlString stringByAppendingFormat:@"&guild_id=%@",self.joinGuild]; + } + NSURL* url=[NSURL URLWithString:urlString]; NSURLRequest *request =[NSURLRequest requestWithURL:url]; [self.contentWebView loadRequest:request]; } diff --git a/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h b/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h index 3c1d7d4..e0f191c 100644 --- a/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h +++ b/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface QXGiftWallSubViewController : QXBaseViewController +@interface QXGiftWallSubViewController : UIViewController /// 是否为已点亮 @property(nonatomic,assign)BOOL isLight; /// 数据源 diff --git a/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m b/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m index 647c089..a3719a4 100644 --- a/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m +++ b/QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m @@ -19,9 +19,9 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. + [self initSubViews]; } - (void)initSubViews{ - self.bgImageHidden = YES; UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; int itemWidth = (SCREEN_WIDTH-16*2-12*2)/3; layout.itemSize = CGSizeMake(itemWidth, ScaleWidth(143)); diff --git a/QXLive/Mine(音域)/Model/QXUserModel.h b/QXLive/Mine(音域)/Model/QXUserModel.h index d3a53db..22604ec 100644 --- a/QXLive/Mine(音域)/Model/QXUserModel.h +++ b/QXLive/Mine(音域)/Model/QXUserModel.h @@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSString *total_price; /// 公会 -@property (nonatomic,strong)NSString *guild; +@property (nonatomic,strong)NSString *guild_name; /// 是否使用靓号 0未使用 1 已使用 @property (nonatomic,strong)NSString *is_use_code; @@ -200,7 +200,12 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)NSString *gift_num; /// 公会 -@property (nonatomic,strong)NSString *guild; +@property (nonatomic,strong)NSString *guild_id; +@property (nonatomic,strong)NSString *guild_name; + +/// 公会 +@property (nonatomic,strong)NSString *me_guild_id; +@property (nonatomic,strong)NSString *me_guild_name; /// 是否已关注 0 未关注 1 已关注 @property (nonatomic,strong)NSString *is_follow; diff --git a/QXLive/Mine(音域)/View/QXMineServiceCell.m b/QXLive/Mine(音域)/View/QXMineServiceCell.m index 7bbb84b..43a42cd 100644 --- a/QXLive/Mine(音域)/View/QXMineServiceCell.m +++ b/QXLive/Mine(音域)/View/QXMineServiceCell.m @@ -190,7 +190,7 @@ QXServiceModel *md4 = [[QXServiceModel alloc] init]; - md4.title = @"家族"; + md4.title = @"我的家族"; md4.icon = @"service_my_family"; md4.type = QXMineServiceTypeFamily; @@ -243,8 +243,8 @@ _moreArray = [NSMutableArray arrayWithArray:@[ md1, md2, - md3, - md4, +// md3, +// md4, // md5, // md6, md7 diff --git a/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m b/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m index 067846f..25ccadb 100644 --- a/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m +++ b/QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m @@ -490,8 +490,8 @@ [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)]; } } - if ([model.guild isExist]) { - self.guildLabel.text = model.guild; + if ([model.guild_name isExist]) { + self.guildLabel.text = model.guild_name; }else{ self.guildLabel.text = @"无"; } diff --git a/QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m b/QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m index 5b5ab1c..0f3f788 100644 --- a/QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m +++ b/QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m @@ -103,7 +103,7 @@ self.rightNameLabel.text = model.nickname1; self.rightSexImageView.image = [UIImage imageNamed:model.sex2.intValue == 1?@"user_sex_boy":@"user_sex_girl"]; } - if ([self.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) { + if (![self.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) { self.topBtn.hidden = YES; self.deleteBtn.hidden = YES; }else{ diff --git a/QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m b/QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m index b583a14..74dd683 100644 --- a/QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m +++ b/QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m @@ -47,7 +47,7 @@ [self.priceBtn setTitle:model.market_value forState:(UIControlStateNormal)]; self.onlineLabel.text = model.is_online==1?@"当前在线":@"当前离线"; self.continueBtn.hidden = model.is_show_sign.intValue==1?NO:YES; - self.continueBtn.hidden = NO; +// self.continueBtn.hidden = NO; } - (IBAction)continueAction:(id)sender { diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController.m b/QXLive/Room(房间)/Controller/QXRoomViewController.m index 2099d89..8876a47 100644 --- a/QXLive/Room(房间)/Controller/QXRoomViewController.m +++ b/QXLive/Room(房间)/Controller/QXRoomViewController.m @@ -1556,6 +1556,7 @@ QXRoomUserInfoViewDelegate [[QXRoomMessageManager shared] sendChatMessage:@"" messageType:(QXRoomMessageTypeClearMessage) needInsertMessage:NO]; [self.chatListView clearMessage]; [self.settingView hide]; + showToast(@"清除消息成功"); } break; case QXRoomSettingTypeRoomSetting:{ diff --git a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m index 60eff46..11ed739 100644 --- a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m +++ b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m @@ -24,6 +24,7 @@ #import "QXUserCpCardView.h" #import "QXUserCpDressView.h" #import "QXHeartBeatSpaceViewController.h" +#import "QXGuildViewController.h" @interface QXRoomUserInfoView() @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) { diff --git a/QXLive/Room(房间)/View/直播/QXSeatHeaderView.m b/QXLive/Room(房间)/View/直播/QXSeatHeaderView.m index 1e0ddc7..052cb67 100644 --- a/QXLive/Room(房间)/View/直播/QXSeatHeaderView.m +++ b/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