2.1.3版本发版 此commit置顶

This commit is contained in:
liyuhua
2023-11-01 16:25:32 +08:00
parent 768e0ed477
commit 0e0bee0a33
2 changed files with 8 additions and 2 deletions

View File

@@ -31,7 +31,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"

View File

@@ -1330,7 +1330,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
if(data.kind == 0){ if(data.kind == 0){
data.kind = 1; data.kind = 1;
} }
if((data.validityType == 0 && data.type == RedPacketType_RoomDiamond)|| data.type == RedPacketType_AllDiamond){ 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)]; XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
view.receiveModel = data; view.receiveModel = data;
view.delegate = self; view.delegate = self;
@@ -1351,6 +1351,12 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
} }
} }
-(BOOL)isShowRedPacketView:(XPRedPacketModel *)model{
if(model.state == 1 || model.state == 5){
return YES;
}
return NO;
}
-(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel{ -(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel{
self.freeModel = freeModel; self.freeModel = freeModel;
self.menuContainerView.freeModel = freeModel; self.menuContainerView.freeModel = freeModel;