企业包版本修改 此commit置顶 1.4.0

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动画

xplan-ios.xcodeproj/project.pbxproj

@@ -11357,7 +11357,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.nnbc123.voice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -11390,7 +11390,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.nnbc123.voice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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;

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
 

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) {

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;