2.1.3版本发版 此commit置顶
This commit is contained in:
@@ -1326,37 +1326,31 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
|
||||
if (list.count == 0) {
|
||||
return;
|
||||
}
|
||||
for (XPRedPacketModel *data in list) {
|
||||
if(data.kind == 0){
|
||||
data.kind = 1;
|
||||
}
|
||||
if((data.validityType == 0 && data.type == RedPacketType_RoomDiamond && [self isShowRedPacketView:data] == YES) || data.type == RedPacketType_AllDiamond){
|
||||
XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
|
||||
view.receiveModel = data;
|
||||
view.delegate = self;
|
||||
self.isShowRedPacket = YES;
|
||||
for (UIView *subView in self.view.subviews) {
|
||||
if([subView isKindOfClass:[XPReceiveRedPacketView class]]) {
|
||||
view.alphaView.backgroundColor = [UIColor clearColor];
|
||||
break;
|
||||
}
|
||||
}
|
||||
[self.view addSubview:view];
|
||||
[self.view bringSubviewToFront:view];
|
||||
}
|
||||
|
||||
}
|
||||
// for (XPRedPacketModel *data in list) {
|
||||
// if(data.kind == 0){
|
||||
// data.kind = 1;
|
||||
// }
|
||||
// if((data.validityType == 0 && data.type == RedPacketType_RoomDiamond && [self isShowRedPacketView:data] == YES) || data.type == RedPacketType_AllDiamond){
|
||||
// XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
|
||||
// view.receiveModel = data;
|
||||
// view.delegate = self;
|
||||
// self.isShowRedPacket = YES;
|
||||
// for (UIView *subView in self.view.subviews) {
|
||||
// if([subView isKindOfClass:[XPReceiveRedPacketView class]]) {
|
||||
// view.alphaView.backgroundColor = [UIColor clearColor];
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// [self.view addSubview:view];
|
||||
// [self.view bringSubviewToFront:view];
|
||||
// }
|
||||
//
|
||||
// }
|
||||
if(list.count > 0){
|
||||
self.activityContainerView.redPacketList = [NSMutableArray arrayWithArray:list];
|
||||
|
||||
}
|
||||
}
|
||||
-(BOOL)isShowRedPacketView:(XPRedPacketModel *)model{
|
||||
if(model.state == 1 || model.state == 5){
|
||||
return YES;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
-(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel{
|
||||
self.freeModel = freeModel;
|
||||
self.menuContainerView.freeModel = freeModel;
|
||||
|
Reference in New Issue
Block a user