From d0263744392567860b470e88ae92e97a402ef615 Mon Sep 17 00:00:00 2001
From: fengshuo <963787902@qq.com>
Date: Wed, 24 Aug 2022 16:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B6=82=E9=B8=A6?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m   | 4 ++--
 .../Main/ModuleKit/SendGiftView/View/XPGraffitiGiftView.m     | 1 +
 xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m   | 1 +
 .../Room/View/AnimationView/XPRoomGraffitiGiftAnimationView.m | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m
index 32254892..654a59f5 100644
--- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m
+++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m
@@ -141,8 +141,8 @@
 	[self.segmentStackView addArrangedSubview:self.luckyGiftButton];
     [self.segmentStackView addArrangedSubview:self.nobleGiftButton];
     [self.segmentStackView addArrangedSubview:self.weekStarButton];
-	[self.segmentStackView addArrangedSubview:self.packGiftButton];
 	[self.segmentStackView addArrangedSubview:self.graffitiButton];
+	[self.segmentStackView addArrangedSubview:self.packGiftButton];
 	[self.segmentStackView addArrangedSubview:self.segmentPlaceView];
 	[self.segmentStackView addArrangedSubview:self.playRuleButton];
 	[self.segmentStackView addArrangedSubview:self.totalValueLabel];
@@ -401,7 +401,7 @@
 		[self.delegate xPGiftInfoView:self didClickSegment:_segmentType];
 	}
 
-	if (self.delegate && [self.delegate respondsToSelector:@selector(xPGiftInfoView:didClickItem:type:)]) {
+	if (self.segmentType != GiftSegmentType_Graffiti && self.delegate && [self.delegate respondsToSelector:@selector(xPGiftInfoView:didClickItem:type:)]) {
 		[self.delegate xPGiftInfoView:self didClickItem:self.lastSelectGift type:_segmentType];
 	}
 }
diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGraffitiGiftView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGraffitiGiftView.m
index 93af17bf..bec5531f 100644
--- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGraffitiGiftView.m
+++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGraffitiGiftView.m
@@ -223,6 +223,7 @@
 }
 #pragma mark - Event Response
 - (void)changeButtonAction{
+	[self clearData];
 	if (self.delegate && [self.delegate respondsToSelector:@selector(xPGraffitiGiftView:didClickChange:)]) {
 		[self.delegate xPGraffitiGiftView:self didClickChange:self.changeButton];
 	}
diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
index e3aafded..fc23d52e 100644
--- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
+++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
@@ -404,6 +404,7 @@
 - (void)xPGiftInfoView:(XPGiftInfoView *)view didClickSegment:(GiftSegmentType)type {
 	self.segmentType = type;
 	self.giftBarView.type = type;
+	self.giftBarView.drawGiftCount = 0;
 }
 
 - (void)xPGiftInfoViewDidClickNobleEntrance:(XPGiftInfoView *)view {
diff --git a/xplan-ios/Main/Room/View/AnimationView/XPRoomGraffitiGiftAnimationView.m b/xplan-ios/Main/Room/View/AnimationView/XPRoomGraffitiGiftAnimationView.m
index 95bd5d45..984e5b40 100644
--- a/xplan-ios/Main/Room/View/AnimationView/XPRoomGraffitiGiftAnimationView.m
+++ b/xplan-ios/Main/Room/View/AnimationView/XPRoomGraffitiGiftAnimationView.m
@@ -21,6 +21,7 @@
 - (instancetype)initWithFrame:(CGRect)frame {
 	self = [super initWithFrame:frame];
 	if (self) {
+		self.userInteractionEnabled = NO;
 		self.timer = [XPWeakTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(dramGraffitiAnimationView) userInfo:@"" repeats:YES];
 	}
 	return self;