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

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

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

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

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

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

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

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

@@ -37,8 +37,6 @@
 @property (nonatomic,strong) UIButton *arrowButton;
 ///赠送
 @property (nonatomic,strong) UIButton *sendGiftButton;
-///首充
-@property (nonatomic,strong) UIButton *firstRechargeButton;
 ///自定义个数
 @property (nonatomic,strong) UIView *customCountView;
 //输入框
@@ -121,7 +119,6 @@
 - (void)initSubViews {
 	self.backgroundColor= [UIColor clearColor];
 	[self addSubview:self.rechargeView];
-	[self addSubview:self.firstRechargeButton];
 	[self addSubview:self.sendOperationView];
 
 	[self.rechargeView addSubview:self.rechargeStackView];
@@ -163,12 +160,6 @@
 		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) {
 		make.right.mas_equalTo(self).offset(-15);
 		make.top.mas_equalTo(11);
@@ -321,7 +312,7 @@
 }
 
 - (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge {
-	self.firstRechargeButton.hidden = !isShowFirstRecharge;
+	
 }
 
 - (void)setType:(GiftSegmentType)type {
@@ -513,14 +504,4 @@
 	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

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

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