This commit is contained in:
启星
2025-09-24 09:14:50 +08:00
parent 3b6b02f950
commit d361de3687
18 changed files with 71 additions and 33 deletions

View File

@@ -508,8 +508,8 @@ NSInteger maxMessageCount = 20;
make.top.equalTo(self.nameLabel.mas_bottom).offset(2);
}];
CGFloat iconWidth = 38;
CGFloat iconHeight = 16;
CGFloat iconWidth = UserIconWidth;
CGFloat iconHeight = UserIconHeight;
CGFloat margin = 6;
for (int i = 0; i < 3; i++) {
UIImageView *iconImageView = [[UIImageView alloc] init];
@@ -731,8 +731,8 @@ NSInteger maxMessageCount = 20;
make.top.equalTo(self.nameLabel.mas_bottom).offset(2);
}];
CGFloat iconWidth = 38;
CGFloat iconHeight = 16;
CGFloat iconWidth = UserIconWidth;
CGFloat iconHeight = UserIconHeight;
CGFloat margin = 6;
for (int i = 0; i < 3; i++) {
UIImageView *iconImageView = [[UIImageView alloc] init];

View File

@@ -308,8 +308,8 @@
self.nameLabel.text = md.nickname?md.nickname:@"";
[self.iconBgView removeAllSubviews];
[self.rankBtn setTitle:[NSString stringWithFormat:@" %@",md.total?md.total:md.gift_prices] forState:(UIControlStateNormal)];
CGFloat iconWidth = 38;
CGFloat iconHeight = 16;
CGFloat iconWidth = UserIconWidth;
CGFloat iconHeight = UserIconHeight;
CGFloat margin = 6;
for (int i = 0 ; i < md.icon.count; i++) {
UIImageView *iconImageView = [[UIImageView alloc] init];
@@ -326,7 +326,7 @@
make.width.mas_equalTo(iconWidth);
make.height.mas_equalTo(iconHeight);
make.centerY.equalTo(self.iconBgView);
make.centerX.equalTo(self.iconBgView).offset(-38/2+(margin+iconWidth)*i);
make.centerX.equalTo(self.iconBgView).offset(-UserIconWidth/2+(margin+iconWidth)*i);
}];
}else{
[iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {

View File

@@ -9,12 +9,14 @@
#import "QXRoomSeatContentView.h"
#import "QXRoomSeatDelegate.h"
#import "QXUserModel.h"
#import "QXSelectAuctionInfoView.h"
NS_ASSUME_NONNULL_BEGIN
@interface QXRoomSeatTypeAuctionView : UIView
@property (nonatomic,weak)id<QXRoomSeatDelegate>delegate;
@property (nonatomic,strong)QXRoomModel *roomModel;
@property (nonatomic,assign)NSInteger myPitNumber;
@property (nonatomic,strong)QXSelectAuctionInfoView *auctionInfoView;
-(void)didUpDownSeatWithUser:(QXUserHomeModel *)user isUpSeat:(BOOL)isUpSeat pit_number:(NSInteger)pit_number;

View File

@@ -8,7 +8,6 @@
#import "QXRoomSeatTypeAuctionView.h"
#import "QXRoomSeatContentView.h"
#import "UIButton+QX.h"
#import "QXSelectAuctionInfoView.h"
#import "QXMineNetwork.h"
#import "QXTimer.h"
#import "QXRoomAuctionResultView.h"
@@ -63,7 +62,6 @@
@property (nonatomic,strong)QXRoomSeatContentView *sixthSeatView;
@property (nonatomic,strong)UIButton *moreBtn;
@property (nonatomic,strong)QXSelectAuctionInfoView *auctionInfoView;
@property (nonatomic,strong)NSMutableArray *seatArray;
@property (nonatomic,strong)QXTimer *timer;

View File

@@ -103,6 +103,9 @@
animations:^{
self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01);
} completion:^(BOOL finished) {
if (self->_auctionView.auctionInfoView != nil) {
[self->_auctionView.auctionInfoView hide];
}
[self->_auctionView destroyViews];
[self->_auctionView removeFromSuperview];
self->_auctionView = nil;
@@ -390,6 +393,9 @@
animations:^{
self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01);
} completion:^(BOOL finished) {
if (self->_auctionView.auctionInfoView != nil) {
[self->_auctionView.auctionInfoView hide];
}
[self->_auctionView destroyViews];
[self->_auctionView removeFromSuperview];
self->_auctionView = nil;
@@ -608,6 +614,9 @@
animations:^{
self->_auctionView.transform = CGAffineTransformMakeScale(0.01, 0.01);
} completion:^(BOOL finished) {
if (self->_auctionView.auctionInfoView != nil) {
[self->_auctionView.auctionInfoView hide];
}
[self->_auctionView destroyViews];
[self->_auctionView removeFromSuperview];
self->_auctionView = nil;