MIDI/midi_ios
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

最后调整

Browse Source
This commit is contained in:
启星
2025-09-15 18:20:22 +08:00
parent 35709d4e8e
commit a3a7bfdf22
31 changed files with 707 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
QXLive/HomePage(声播)/Controlller/QXRankHomeVC.m
View File

@@ -29,7 +29,8 @@
}
-(void)initSubViews{
self.view.backgroundColor = [UIColor whiteColor];
self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"公会榜",@"真爱榜"];
// self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"公会榜",@"真爱榜"];
self.titles = @[@"房间榜", @"财富榜", @"魅力榜",@"真爱榜"];
self.listVCArray = [NSMutableArray array];
self.categoryView = [[JXCategoryTitleView alloc] init];
self.categoryView.frame = CGRectMake(0, 0, SCREEN_WIDTH-100, 44);
@@ -39,10 +40,10 @@
self.categoryView.titleColor = [UIColor colorWithHexString:@"#999999"];
JXCategoryIndicatorImageView *indicatorImageView = [[JXCategoryIndicatorImageView alloc] init];
indicatorImageView.indicatorImageView.image = [UIImage imageNamed:@"home_slider"];
indicatorImageView.indicatorWidth = (SCREEN_WIDTH-100)/5.0;
indicatorImageView.indicatorWidth = (SCREEN_WIDTH-100)/self.titles.count;
indicatorImageView.indicatorHeight = 5;
self.categoryView.indicators = @[indicatorImageView];
self.categoryView.cellWidth = (SCREEN_WIDTH-100)/5.0;
self.categoryView.cellWidth = (SCREEN_WIDTH-100)/self.titles.count;
self.categoryView.contentEdgeInsetLeft = 0;
self.categoryView.cellSpacing = 0;
self.categoryView.titleLabelZoomScale = 1.1;
@@ -61,7 +62,11 @@
}
-(id<JXCategoryListContentViewDelegate>)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index{
QXRankHomeSubVC *vc = [[QXRankHomeSubVC alloc] init];
vc.rankType = index;
if (index == 3) {
vc.rankType = 4;
}else{
vc.rankType = index;
}
return vc;
}
- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {

9
QXLive/HomePage(声播)/Controlller/房间/QXRoomViewController.m
View File

@@ -541,6 +541,8 @@ QXRoomUserInfoViewDelegate
if (self.roomModel.room_info.type_id.intValue == 1 || self.roomModel.room_info.type_id.intValue == 3 || self.roomModel.room_info.type_id.intValue == 4){
hasSong = YES;
}
/// 暂时不要pk
hasPK = NO;
/// 普通麦位
if (self.seatContentView.myPitNumber <= 0) {
self.bottomView.status = 1;
@@ -1234,6 +1236,9 @@ QXRoomUserInfoViewDelegate
}
if (md.pit_number.intValue == 9) {
compereModel = md;
if (md.user_id.longValue > 0 && ![md.user_id isEqualToString:[QXGlobal shareGlobal].loginModel.user_id]) {
[pitArr insertObject:md atIndex:0];
}
continue;
}else if (md.pit_number.intValue == 10) {
guestModel = md;
@@ -1243,6 +1248,7 @@ QXRoomUserInfoViewDelegate
[pitArr addObject:md];
}
}
}
// k歌麦位
@@ -1604,13 +1610,14 @@ QXRoomUserInfoViewDelegate
_sendGiftView.roomId = self.roomId;
// [_sendGiftView reloadData];
MJWeakSelf
_sendGiftView.roomSendSuccessBlock = ^(QXSendGiftViewType sendType, QXGiftModel * _Nonnull giftModel, NSString * _Nonnull userId, NSString * _Nonnull optionId) {
_sendGiftView.roomSendSuccessBlock = ^(QXSendGiftViewType sendType, QXGiftModel * _Nonnull giftModel, NSString * _Nonnull giftCount, NSString * _Nonnull userId, NSString * _Nonnull optionId) {
// if (self->_continuousView == nil) {
[weakSelf.view addSubview:weakSelf.continuousView];
// }
weakSelf.continuousView.giftModel = giftModel;
weakSelf.continuousView.sendType = sendType;
weakSelf.continuousView.userId = userId;
weakSelf.continuousView.giftCount = giftCount;
switch (sendType) {
case QXSendGiftViewTypeFriend:{
weakSelf.continuousView.heartId = optionId;