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
2022-10-26 19:07:50 +08:00
parent 8715dfd968
commit 95716a8d80
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
View File

@@ -1284,22 +1284,14 @@
giftTotal = receiveInfo.giftNum * giftInfo.goldPrice; giftTotal = receiveInfo.giftNum * giftInfo.goldPrice;
} }
///房间横幅
if (giftTotal >= 520) {
///房间横幅和 房间特效的关闭没有关系
receiveInfo.vggUrl = giftInfo.vggUrl;
receiveInfo.viewUrl = giftInfo.viewUrl;
[self.giftEffectQueue addObject:receiveInfo];
} else {
if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && giftInfo.viewUrl.length > 0 && roomInfor.hasAnimationEffect) { if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && giftInfo.viewUrl.length > 0 && roomInfor.hasAnimationEffect) {
receiveInfo.viewUrl = giftInfo.viewUrl; receiveInfo.viewUrl = giftInfo.viewUrl;
[self.giftEffectQueue addObject:receiveInfo]; [self.giftEffectQueue addObject:receiveInfo];
} else if (giftInfo.hasVggPic && roomInfor.hasAnimationEffect) {///SVGA动画 } else if (giftInfo.hasVggPic && giftInfo.vggUrl.length > 0 && roomInfor.hasAnimationEffect) {///SVGA动画
receiveInfo.vggUrl = giftInfo.vggUrl; receiveInfo.vggUrl = giftInfo.vggUrl;
[self.giftEffectQueue addObject:receiveInfo]; [self.giftEffectQueue addObject:receiveInfo];
} }
} }
}
if (self.giftEffectTimer == nil && self.giftEffectQueue.count > 0) { if (self.giftEffectTimer == nil && self.giftEffectQueue.count > 0) {
[self startHandleGiftEffectTimer]; [self startHandleGiftEffectTimer];
@@ -1369,10 +1361,10 @@
[springAnimation setAnimationDidStartBlock:^(POPAnimation *anim) { [springAnimation setAnimationDidStartBlock:^(POPAnimation *anim) {
@kStrongify(self); @kStrongify(self);
if (giftInfo.viewUrl.length > 0 && [self.delegate getRoomInfo].hasAnimationEffect) { if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && giftInfo.viewUrl.length > 0 && [self.delegate getRoomInfo].hasAnimationEffect) {
[self largeGiftStopCarEffect:giftInfo.goldPrice]; [self largeGiftStopCarEffect:giftInfo.goldPrice];
[self playGiftEffectWithVapUrl:giftInfo.viewUrl]; [self playGiftEffectWithVapUrl:giftInfo.viewUrl];
} else if (giftInfo.hasVggPic && [self.delegate getRoomInfo].hasAnimationEffect) { } else if (giftInfo.hasVggPic && giftInfo.vggUrl.length > 0 && [self.delegate getRoomInfo].hasAnimationEffect) {
[self largeGiftStopCarEffect:giftInfo.goldPrice]; [self largeGiftStopCarEffect:giftInfo.goldPrice];
[self playGiftEffect:giftInfo.vggUrl]; [self playGiftEffect:giftInfo.vggUrl];
} }
@@ -1380,7 +1372,7 @@
[view pop_addAnimation:springAnimation forKey:@"spingOutAnimation"]; [view pop_addAnimation:springAnimation forKey:@"spingOutAnimation"];
} else { } else {
if (receiveInfo.viewUrl.length > 0) {//播放vap动效 if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && receiveInfo.viewUrl.length > 0) {//播放vap动效
[self largeGiftStopCarEffect:giftInfo.goldPrice]; [self largeGiftStopCarEffect:giftInfo.goldPrice];
[self playGiftEffectWithVapUrl:receiveInfo.viewUrl]; [self playGiftEffectWithVapUrl:receiveInfo.viewUrl];
} else if (receiveInfo.vggUrl.length > 0) {///如果有特效的话就播放特效 } else if (receiveInfo.vggUrl.length > 0) {///如果有特效的话就播放特效

1
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m
View File

@@ -133,6 +133,7 @@
}]; }];
return; return;
} }
self.backImageView.image = [UIImage imageNamed:@"room_background"];
[self.svgDisplayView stopAnimation]; [self.svgDisplayView stopAnimation];
self.svgDisplayView.hidden = YES; self.svgDisplayView.hidden = YES;
self.backImageView.contentMode = UIViewContentModeScaleAspectFill; self.backImageView.contentMode = UIViewContentModeScaleAspectFill;