From 665df1a770a7e1a23a352ac707bdae0dd1bd130a Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Wed, 20 Sep 2023 14:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Podfile                                                     | 2 +-
 xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m | 6 ++++++
 .../Main/Room/View/AnimationView/XPRoomAnimationView.h      | 1 +
 .../Main/Room/View/AnimationView/XPRoomAnimationView.m      | 4 +++-
 xplan-ios/Main/Room/View/XPRoomViewController.m             | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Podfile b/Podfile
index b2f57e76..0e1579e3 100644
--- a/Podfile
+++ b/Podfile
@@ -34,7 +34,7 @@ target 'xplan-ios' do
 	#文字自动滚动
 	pod 'MarqueeLabel-ObjC'
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 3.0.1'
+  pod 'AgoraRtcEngine_iOS', '~> 4.2.2'
   #TRTC
 	pod 'TXLiteAVSDK_TRTC', '~> 10.3.12271'
 	#pop动画
diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
index b429cb4b..660bc384 100644
--- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
+++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
@@ -395,6 +395,9 @@
 			GiftSendType sendType = GiftSendType_OnMic;
 			///礼物来源
 			GiftSourceType sourceType = giftInfo.sourceType;
+            if(sourceType != GiftSourceType_Normal && sourceType != GiftSourceType_Pack){
+                sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack :GiftSourceType_Normal;
+            }
 			///送一个人 还是全麦 还是多人非全麦
 			RoomSendGiftType roomSendType = [self dealRoomSendGiftType:giftInfo giftCount:giftCount];
 			if (roomSendType == -1) {
@@ -418,6 +421,9 @@
 		GiftSendType sendType = GiftSendType_Chat;
 		///礼物来源
 		GiftSourceType sourceType = giftInfo.sourceType;
+        if(sourceType != GiftSourceType_Normal && sourceType != GiftSourceType_Pack){
+            sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack :GiftSourceType_Normal;
+        }
 		///送一个人 还是全麦 还是多人非全麦
 		RoomSendGiftType roomSendType = RoomSendGiftType_ToOne;
 		self.giftBarView.sendButtonIsEnable = NO;
diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.h b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.h
index f2cae8ec..f9310845 100644
--- a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.h
+++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.h
@@ -12,6 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XPRoomAnimationView : XPRoomAnimationHitView <RoomGuestDelegate>
+-(void)resumeTimer;
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate;
 @end
 
diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
index 154f2b46..d0fa422f 100644
--- a/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
+++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomAnimationView.m
@@ -144,6 +144,9 @@
 - (void)dealloc {
 	[NSObject cancelPreviousPerformRequestsWithTarget:self];
 	[[NIMSDK sharedSDK].broadcastManager removeDelegate:self];
+    
+}
+-(void)resumeTimer{
     if(self.giftEffectTimer != nil){
         dispatch_resume(self.giftEffectTimer);
         self.giftEffectTimer = nil;
@@ -157,7 +160,6 @@
         self.giftTimer = nil;
     }
 }
-
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
 	self = [super init];
 	if (self) {
diff --git a/xplan-ios/Main/Room/View/XPRoomViewController.m b/xplan-ios/Main/Room/View/XPRoomViewController.m
index 480f9340..9b927754 100644
--- a/xplan-ios/Main/Room/View/XPRoomViewController.m
+++ b/xplan-ios/Main/Room/View/XPRoomViewController.m
@@ -1378,6 +1378,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 
 - (void)exitRoom {
 	[self.menuContainerView menuResignFirstResponder];
+    [self.animationView resumeTimer];
 	if (self.roomInfo.roomModeType == RoomModeType_Open_Micro_Mode || self.roomInfo.roomModeType == RoomModeType_Open_Blind) {
 		NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
 		NSString * uid = [AccountInfoStorage instance].getUid;