yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了礼物面板贵族开通不会滚动的问题

Browse Source
This commit is contained in:
fengshuo
2023-03-15 18:11:39 +08:00
parent cfc8ed0922
commit b6c880bbab
5 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
xplan-ios/Main/Home/View/XPHomeViewController.m
View File

@@ -142,21 +142,22 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey;
- (void)xPHomeNavView:(XPHomeNavView *)view didClickOpenRoom:(UIButton *)sender { - (void)xPHomeNavView:(XPHomeNavView *)view didClickOpenRoom:(UIButton *)sender {
NSString* roomUid = [AccountInfoStorage instance].getUid; NSString* roomUid = [AccountInfoStorage instance].getUid;
[Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [XPRoomViewController openRoom:roomUid viewController:self];
if (code == 200) { // [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; // if (code == 200) {
if (roomInfo.isReselect) { // RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data];
XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; // if (roomInfo.isReselect) {
roomOpenView.roomInfo = roomInfo; // XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init];
roomOpenView.currentVC = self; // roomOpenView.roomInfo = roomInfo;
[TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; // roomOpenView.currentVC = self;
} else { // [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet];
[XPRoomViewController openRoom:roomUid viewController:self]; // } else {
} // [XPRoomViewController openRoom:roomUid viewController:self];
} else { // }
[self showErrorToast:msg]; // } else {
} // [self showErrorToast:msg];
} uid:roomUid intoUid:roomUid]; // }
// } uid:roomUid intoUid:roomUid];
} }
#pragma mark - Event Response #pragma mark - Event Response

2
xplan-ios/Main/Message/View/SessionList/SessionListViewController.m
View File

@@ -399,7 +399,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
if (value > 0) { if (value > 0) {
[self.tabBarController.tabBar.items[3] setBadgeValue:[NSString stringWithFormat:@"%ld", value]]; [self.tabBarController.tabBar.items[3] setBadgeValue:[NSString stringWithFormat:@"%ld", value]];
} else { } else {
[self.tabBarController.tabBar.items[3] setBadgeValue:@"0"]; [self.tabBarController.tabBar.items[3] setBadgeValue:nil];
} }
} }

31
xplan-ios/Main/Mine/View/XPMineViewController.m
View File

@@ -201,21 +201,22 @@
case XPMineItemType_My_Room: case XPMineItemType_My_Room:
{ {
NSString* roomUid = [NSString stringWithFormat:@"%ld", (long)self.userInfo.uid]; NSString* roomUid = [NSString stringWithFormat:@"%ld", (long)self.userInfo.uid];
[Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { [XPRoomViewController openRoom:roomUid viewController:self];
if (code == 200) { // [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; // if (code == 200) {
if (roomInfo.isReselect) { // RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data];
XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; // if (roomInfo.isReselect) {
roomOpenView.roomInfo = roomInfo; // XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init];
roomOpenView.currentVC = self; // roomOpenView.roomInfo = roomInfo;
[TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; // roomOpenView.currentVC = self;
} else { // [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet];
[XPRoomViewController openRoom:roomUid viewController:self]; // } else {
} // [XPRoomViewController openRoom:roomUid viewController:self];
} else { // }
[self showErrorToast:msg]; // } else {
} // [self showErrorToast:msg];
} uid:roomUid intoUid:roomUid]; // }
// } uid:roomUid intoUid:roomUid];
} }
break; break;
case XPMineItemType_Collect_Room://收藏房间 case XPMineItemType_Collect_Room://收藏房间

21
xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftBarView.m
View File

@@ -37,8 +37,6 @@
@property (nonatomic,strong) UIButton *arrowButton; @property (nonatomic,strong) UIButton *arrowButton;
///赠送 ///赠送
@property (nonatomic,strong) UIButton *sendGiftButton; @property (nonatomic,strong) UIButton *sendGiftButton;
///首充
@property (nonatomic,strong) UIButton *firstRechargeButton;
///自定义个数 ///自定义个数
@property (nonatomic,strong) UIView *customCountView; @property (nonatomic,strong) UIView *customCountView;
//输入框 //输入框
@@ -121,7 +119,6 @@
- (void)initSubViews { - (void)initSubViews {
self.backgroundColor= [UIColor clearColor]; self.backgroundColor= [UIColor clearColor];
[self addSubview:self.rechargeView]; [self addSubview:self.rechargeView];
[self addSubview:self.firstRechargeButton];
[self addSubview:self.sendOperationView]; [self addSubview:self.sendOperationView];
[self.rechargeView addSubview:self.rechargeStackView]; [self.rechargeView addSubview:self.rechargeStackView];
@@ -163,12 +160,6 @@
make.size.mas_equalTo(CGSizeMake(15, 15)); make.size.mas_equalTo(CGSizeMake(15, 15));
}]; }];
[self.firstRechargeButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(50, 14));
make.left.mas_equalTo(self.rechargeStackView.mas_right).offset(4);
make.centerY.mas_equalTo(self.rechargeStackView);
}];
[self.sendOperationView mas_makeConstraints:^(MASConstraintMaker *make) { [self.sendOperationView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(self).offset(-15); make.right.mas_equalTo(self).offset(-15);
make.top.mas_equalTo(11); make.top.mas_equalTo(11);
@@ -321,7 +312,7 @@
} }
- (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge { - (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge {
self.firstRechargeButton.hidden = !isShowFirstRecharge;
} }
- (void)setType:(GiftSegmentType)type { - (void)setType:(GiftSegmentType)type {
@@ -513,14 +504,4 @@
return _giftCountView; return _giftCountView;
} }
- (UIButton *)firstRechargeButton {
if (!_firstRechargeButton) {
_firstRechargeButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_firstRechargeButton setImage:[UIImage imageNamed:@"gift_first_recharge_bg"] forState:UIControlStateNormal];
[_firstRechargeButton setImage:[UIImage imageNamed:@"gift_first_recharge_bg"] forState:UIControlStateSelected];
[_firstRechargeButton addTarget:self action:@selector(firstRechargeButtonAction:) forControlEvents:UIControlEventTouchUpInside];
}
return _firstRechargeButton;
}
@end @end

1
xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m
View File

@@ -172,6 +172,7 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否
self.titleArray = [NSMutableArray arrayWithObjects:@"贵族特权", nil]; self.titleArray = [NSMutableArray arrayWithObjects:@"贵族特权", nil];
self.cycleScrollView.imageURLStringsGroup = @[@"room_gift_noble_entrance"]; self.cycleScrollView.imageURLStringsGroup = @[@"room_gift_noble_entrance"];
} }
[self.cycleScrollView autoScroll];
} }
#pragma mark - getter #pragma mark - getter