YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

提交

Browse Source
This commit is contained in:
启星
2025-12-05 21:03:04 +08:00
parent 57975eafc1
commit afcf3cc9aa
12 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h
View File

@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface QXGuildViewController : QXBaseViewController @interface QXGuildViewController : QXBaseViewController
@property (nonatomic,strong)NSString*joinGuild;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

7
QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m
View File

@@ -44,7 +44,12 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
} }
- (void)loadData { - (void)loadData {
NSInteger safeTop = kSafeAreaTop; 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]; NSURLRequest *request =[NSURLRequest requestWithURL:url];
[self.contentWebView loadRequest:request]; [self.contentWebView loadRequest:request];
} }

2
QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h
View File

@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface QXGiftWallSubViewController : QXBaseViewController<JXCategoryListContentViewDelegate> @interface QXGiftWallSubViewController : UIViewController<JXCategoryListContentViewDelegate>
/// 是否为已点亮 /// 是否为已点亮
@property(nonatomic,assign)BOOL isLight; @property(nonatomic,assign)BOOL isLight;
/// 数据源 /// 数据源

2
QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m
View File

@@ -19,9 +19,9 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
[self initSubViews];
} }
- (void)initSubViews{ - (void)initSubViews{
self.bgImageHidden = YES;
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
int itemWidth = (SCREEN_WIDTH-16*2-12*2)/3; int itemWidth = (SCREEN_WIDTH-16*2-12*2)/3;
layout.itemSize = CGSizeMake(itemWidth, ScaleWidth(143)); layout.itemSize = CGSizeMake(itemWidth, ScaleWidth(143));

9
QXLive/Mine(音域)/Model/QXUserModel.h
View File

@@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *total_price; @property (nonatomic,strong)NSString *total_price;
/// 公会 /// 公会
@property (nonatomic,strong)NSString *guild; @property (nonatomic,strong)NSString *guild_name;
/// 是否使用靓号 0未使用 1 已使用 /// 是否使用靓号 0未使用 1 已使用
@property (nonatomic,strong)NSString *is_use_code; @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 *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 已关注 /// 是否已关注 0 未关注 1 已关注
@property (nonatomic,strong)NSString *is_follow; @property (nonatomic,strong)NSString *is_follow;

6
QXLive/Mine(音域)/View/QXMineServiceCell.m
View File

@@ -190,7 +190,7 @@
QXServiceModel *md4 = [[QXServiceModel alloc] init]; QXServiceModel *md4 = [[QXServiceModel alloc] init];
md4.title = @"家族"; md4.title = @"我的家族";
md4.icon = @"service_my_family"; md4.icon = @"service_my_family";
md4.type = QXMineServiceTypeFamily; md4.type = QXMineServiceTypeFamily;
@@ -243,8 +243,8 @@
_moreArray = [NSMutableArray arrayWithArray:@[ _moreArray = [NSMutableArray arrayWithArray:@[
md1, md1,
md2, md2,
md3, // md3,
md4, // md4,
// md5, // md5,
// md6, // md6,
md7 md7

4
QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m
View File

@@ -490,8 +490,8 @@
[self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)]; [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)];
} }
} }
if ([model.guild isExist]) { if ([model.guild_name isExist]) {
self.guildLabel.text = model.guild; self.guildLabel.text = model.guild_name;
}else{ }else{
self.guildLabel.text = @"无"; self.guildLabel.text = @"无";
} }

2
QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m
View File

@@ -103,7 +103,7 @@
self.rightNameLabel.text = model.nickname1; self.rightNameLabel.text = model.nickname1;
self.rightSexImageView.image = [UIImage imageNamed:model.sex2.intValue == 1?@"user_sex_boy":@"user_sex_girl"]; 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.topBtn.hidden = YES;
self.deleteBtn.hidden = YES; self.deleteBtn.hidden = YES;
}else{ }else{

2
QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m
View File

@@ -47,7 +47,7 @@
[self.priceBtn setTitle:model.market_value forState:(UIControlStateNormal)]; [self.priceBtn setTitle:model.market_value forState:(UIControlStateNormal)];
self.onlineLabel.text = model.is_online==1?@"当前在线":@"当前离线"; self.onlineLabel.text = model.is_online==1?@"当前在线":@"当前离线";
self.continueBtn.hidden = model.is_show_sign.intValue==1?NO:YES; self.continueBtn.hidden = model.is_show_sign.intValue==1?NO:YES;
self.continueBtn.hidden = NO; // self.continueBtn.hidden = NO;
} }
- (IBAction)continueAction:(id)sender { - (IBAction)continueAction:(id)sender {

1
QXLive/Room(房间)/Controller/QXRoomViewController.m
View File

@@ -1556,6 +1556,7 @@ QXRoomUserInfoViewDelegate
[[QXRoomMessageManager shared] sendChatMessage:@"" messageType:(QXRoomMessageTypeClearMessage) needInsertMessage:NO]; [[QXRoomMessageManager shared] sendChatMessage:@"" messageType:(QXRoomMessageTypeClearMessage) needInsertMessage:NO];
[self.chatListView clearMessage]; [self.chatListView clearMessage];
[self.settingView hide]; [self.settingView hide];
showToast(@"清除消息成功");
} }
break; break;
case QXRoomSettingTypeRoomSetting:{ case QXRoomSettingTypeRoomSetting:{

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

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

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

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