From 95716a8d808d3a0f7ebc94fc2bb15f1f98a30b34 Mon Sep 17 00:00:00 2001
From: fengshuo <963787902@qq.com>
Date: Wed, 26 Oct 2022 19:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=B9=E6=95=88?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E9=85=8D=E7=BD=AE=E5=87=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/AnimationView/XPRoomAnimationView.m  | 24 +++++++------------
 .../XPRoomBackContainerView.m                 |  3 ++-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
index f9eed897..0fc586c3 100644
--- a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
+++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
@@ -1284,20 +1284,12 @@
 			giftTotal = receiveInfo.giftNum * giftInfo.goldPrice;
 		}
 		
-		///房间横幅
-		if (giftTotal >= 520) {
-			///房间横幅和 房间特效的关闭没有关系
-            receiveInfo.vggUrl = giftInfo.vggUrl;
-            receiveInfo.viewUrl = giftInfo.viewUrl;
+		if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && giftInfo.viewUrl.length > 0 && roomInfor.hasAnimationEffect) {
+			receiveInfo.viewUrl = giftInfo.viewUrl;
+			[self.giftEffectQueue addObject:receiveInfo];
+		} else if (giftInfo.hasVggPic && giftInfo.vggUrl.length > 0  && roomInfor.hasAnimationEffect) {///SVGA动画
+			receiveInfo.vggUrl = giftInfo.vggUrl;
 			[self.giftEffectQueue addObject:receiveInfo];
-		} else  {
-            if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && giftInfo.viewUrl.length > 0 && roomInfor.hasAnimationEffect) {
-                receiveInfo.viewUrl = giftInfo.viewUrl;
-                [self.giftEffectQueue addObject:receiveInfo];
-            } else if (giftInfo.hasVggPic && roomInfor.hasAnimationEffect) {///SVGA动画
-                receiveInfo.vggUrl = giftInfo.vggUrl;
-                [self.giftEffectQueue addObject:receiveInfo];
-            }
 		}
 	}
 	
@@ -1369,10 +1361,10 @@
 		[springAnimation setAnimationDidStartBlock:^(POPAnimation *anim) {
 			@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 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 playGiftEffect:giftInfo.vggUrl];
 			}
@@ -1380,7 +1372,7 @@
 		
 		[view pop_addAnimation:springAnimation forKey:@"spingOutAnimation"];
 	} else {
-        if (receiveInfo.viewUrl.length > 0) {//播放vap动效
+        if (giftInfo.otherViewType == GiftOtherViewTypeMp4 && receiveInfo.viewUrl.length > 0) {//播放vap动效
 			[self largeGiftStopCarEffect:giftInfo.goldPrice];
             [self playGiftEffectWithVapUrl:receiveInfo.viewUrl];
         } else if (receiveInfo.vggUrl.length > 0) {///如果有特效的话就播放特效
diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m
index 1be60b03..357eb892 100644
--- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m
+++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomBackContainerView.m
@@ -132,7 +132,8 @@
                 [XCHUDTool showErrorWithMessage:@"个播背景图加载失败"];
             }];
             return;
-        }
+		}
+		self.backImageView.image = [UIImage imageNamed:@"room_background"];
         [self.svgDisplayView stopAnimation];
         self.svgDisplayView.hidden = YES;
         self.backImageView.contentMode = UIViewContentModeScaleAspectFill;