新增游戏
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
#import "RoomGuestDelegate.h"
|
||||
#import "XPRedPacketModel.h"
|
||||
#import "RoomInfoModel.h"
|
||||
|
||||
#import "ActivityInfoModel.h"
|
||||
|
||||
typedef void(^OpenRedPacketHandle)(XPRedPacketModel *_Nullable,RoomType type ,BOOL isChangeRoom);
|
||||
|
||||
@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@interface XPRoomActivityContainerView : UIView<RoomGuestDelegate>
|
||||
@property(nonatomic,strong) NSMutableArray *redPacketList;
|
||||
@property(nonatomic,copy)OpenRedPacketHandle openRedPacketHandle;
|
||||
@property(nonatomic,strong) NSMutableArray<ActivityInfoModel *> *playList;
|
||||
- (instancetype)initWithdelegate:(id<RoomHostDelegate>)delegate;
|
||||
@end
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
///Model
|
||||
#import "UserInfoModel.h"
|
||||
#import "RoomInfoModel.h"
|
||||
#import "ActivityInfoModel.h"
|
||||
|
||||
#import "AttachmentModel.h"
|
||||
#import "FirstRechargeModel.h"
|
||||
#import "TreasureFairyLimitModel.h"
|
||||
@@ -59,7 +59,6 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
@property (nonatomic,weak) id<RoomHostDelegate>hostDelegate;
|
||||
///房间活动的列表
|
||||
@property (nonatomic,strong) NSMutableArray<ActivityInfoModel *> *activityList;
|
||||
@property(nonatomic,strong) NSMutableArray<ActivityInfoModel *> *playList;
|
||||
///是否加载了活动
|
||||
@property (nonatomic,assign) BOOL isLoadActivity;
|
||||
@property(nonatomic,assign) BOOL isShowChoosePlayView;
|
||||
@@ -180,9 +179,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
if(self.playList.count > 0){
|
||||
ActivityInfoModel *playModel = self.playList.firstObject;
|
||||
self.clickPlayView.model = playModel;
|
||||
if(self.isShowChoosePlayView == NO){
|
||||
self.clickPlayView.hidden = NO;
|
||||
}
|
||||
// if(self.isShowChoosePlayView == NO){
|
||||
// self.clickPlayView.hidden = NO;
|
||||
// }
|
||||
}else{
|
||||
self.clickPlayView.hidden = YES;
|
||||
}
|
||||
@@ -196,11 +195,11 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
|
||||
|
||||
NSMutableArray *list = [NSMutableArray array];
|
||||
[list addObjectsFromArray:self.playList];
|
||||
|
||||
[list addObjectsFromArray:self.activityList];
|
||||
NSMutableArray *picArray = [NSMutableArray array];
|
||||
for (ActivityInfoModel *model in list) {
|
||||
[picArray addObject:model.icon];
|
||||
[picArray addObject:model.icon ?: @""];
|
||||
}
|
||||
self.pi_cycleScrollView.imageURLStringsGroup = picArray;
|
||||
if (self.activityList.count > 1) {
|
||||
@@ -257,9 +256,9 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
if(self.playList.count > 0){
|
||||
ActivityInfoModel *playModel = self.playList.firstObject;
|
||||
self.clickPlayView.model = playModel;
|
||||
if(self.isShowChoosePlayView == NO){
|
||||
self.clickPlayView.hidden = NO;
|
||||
}
|
||||
// if(self.isShowChoosePlayView == NO){
|
||||
// self.clickPlayView.hidden = NO;
|
||||
// }
|
||||
}else{
|
||||
self.clickPlayView.hidden = YES;
|
||||
}
|
||||
@@ -613,7 +612,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
|
||||
[UIView animateWithDuration:0.1 animations:^{
|
||||
view.frame = isMSRTL() ? CGRectMake(-201, y, 201, 124) : CGRectMake(KScreenWidth, y, 201, 124);
|
||||
}completion:^(BOOL finished) {
|
||||
self.clickPlayView.hidden = NO;
|
||||
// self.clickPlayView.hidden = NO;
|
||||
[view removeFromSuperview];
|
||||
}];
|
||||
}
|
||||
|
Reference in New Issue
Block a user