This commit is contained in:
启星
2025-09-08 08:49:04 +08:00
parent ddeec09ea5
commit 349cab1499
290 changed files with 8627 additions and 760 deletions

View File

@@ -97,8 +97,8 @@
-(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
if (self.type == 0) {
QXGiftCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXGiftCell" forIndexPath:indexPath];
cell.cellType = QXGiftCellTypeBackpack;
cell.roomGiftModel = self.dataArray[indexPath.row];
cell.cellType = QXGiftCellTypeBackpack;
return cell;
}else{
QXBackpackRecordCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"QXBackpackRecordCell" forIndexPath:indexPath];

View File

@@ -26,6 +26,10 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)NSString *rule;
@property (nonatomic,strong)NSString *gift_bag_name;
@property (nonatomic,strong)NSString *rule_url;
/// 活动id 5 跳转对应活动
@property (nonatomic,strong)NSString *activities_id;
/// 活动类型 10 天空之境 11 岁月之城 12时空之巅
@property (nonatomic,strong)NSString *gift_bag;
@property (nonatomic,assign)BOOL isSelected;
@end

View File

@@ -314,6 +314,7 @@ NS_ASSUME_NONNULL_BEGIN
礼物列表
*/
+(void)giftListWithLabel:(NSString*)label
roomId:(NSString*)roomId
successBlock:(void (^)(NSArray<QXGiftModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock;

View File

@@ -639,10 +639,12 @@
*/
+(void)giftListWithLabel:(NSString*)label
roomId:(NSString*)roomId
successBlock:(void (^)(NSArray<QXGiftModel*>* list))successBlock
failBlock:(void (^)(NSError * error, NSString * msg))failBlock{
NSDictionary *parameters =@{
@"label":label
@"label":label,
@"room_id":roomId?roomId:@""
};
[[QXRequset shareInstance] postWithUrl:QXGiftList parameters:parameters needCache:NO success:^(id responseObject) {
if (successBlock) {

View File

@@ -110,6 +110,7 @@
self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
self.collectionView.delegate = self;
self.collectionView.dataSource = self;
self.collectionView.backgroundColor = UIColor.clearColor;
[self.collectionView registerClass:[QXTagImageCell class] forCellWithReuseIdentifier:@"QXTagImageCell"];
[self addSubview:self.collectionView];
[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -152,6 +153,7 @@
self.inCollectionView.delegate = self;
self.inCollectionView.dataSource = self;
self.inCollectionView.showsHorizontalScrollIndicator = NO;
self.inCollectionView.backgroundColor = UIColor.clearColor;
[self.inCollectionView registerClass:[QXSearchCell class] forCellWithReuseIdentifier:@"QXSearchCell"];
[self addSubview:self.inCollectionView];
[self.inCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -184,9 +186,9 @@
}];
self.playBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.playBtn.left-6-91, self.whiteBgView.top+10, 91, 35)];
[self.playBtn setTitle:QXText(@"私信") forState:(UIControlStateNormal)];
[self.playBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
self.playBtn.backgroundColor = RGB16(0x333333);
// [self.playBtn setTitle:QXText(@"私信") forState:(UIControlStateNormal)];
// [self.playBtn setTitleColor:UIColor.whiteColor forState:(UIControlStateNormal)];
// self.playBtn.backgroundColor = RGB16(0x333333);
self.playBtn.hidden = YES;
self.playBtn.titleLabel.font = [UIFont systemFontOfSize:14];
[self.playBtn addRoundedCornersWithRadius:17.5];

View File

@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
-(void)didClickLoginWithModel:(QXLoginModel*)model;
-(void)didHugSeatWithModel:(QXRoomUserInfoModel*)model;
-(void)didHugSeatWithModel:(QXRoomUserInfoModel*)model isUpSeat:(BOOL)isUpSeat;
@end
@interface QXBlackListCell : UITableViewCell
@@ -55,6 +55,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
@property (weak, nonatomic) IBOutlet UILabel *roleLabel;
@property (nonatomic,assign)BOOL isUpSeat;
@property (nonatomic,strong)QXRoomUserInfoModel *onlineUser;
@property (nonatomic,strong)QXRoomOnlineList *rankModel;

View File

@@ -41,8 +41,8 @@
}
break;
case QXBlackListCellTypeHugSeat:{
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithModel:)]) {
[self.delegate didHugSeatWithModel:self.onlineUser];
if (self.delegate && [self.delegate respondsToSelector:@selector(didHugSeatWithModel:isUpSeat:)]) {
[self.delegate didHugSeatWithModel:self.onlineUser isUpSeat:self.isUpSeat];
}
}
break;
@@ -52,6 +52,9 @@
}
}
-(void)setIsUpSeat:(BOOL)isUpSeat{
_isUpSeat = isUpSeat;
}
-(void)setLoginModel:(QXLoginModel *)loginModel{
_loginModel = loginModel;