From d88839e58ed72f6af809f197d537a7a2f4ce43bb Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Wed, 1 Nov 2023 10:36:21 +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

---
 .../YMRoom/View/AnimationView/XPRoomAnimationView.m  | 12 ++++++------
 .../XPRoomMessageContainerView.m                     |  6 +++++-
 .../View/SendRedPacket/PIRoomSendRedPacketVC.m       | 10 +++++-----
 .../View/SendRedPacket/XPReceiveRedPacketView.m      |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
index 3df9566a..af51ca3d 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
@@ -290,10 +290,10 @@
                 } else {
                     NSString * svgaString = receiveInfo.luckyGiftSvgaUrl.length > 0 ? receiveInfo.luckyGiftSvgaUrl : receiveInfo.gift.luckyGiftSvgaUrl;
                     NSURL * luckyGiftSvgaUrl = [NSURL URLWithString:svgaString];
-                    if (luckyGiftSvgaUrl.absoluteString.length <= 0) {
-                        luckyGiftSvgaUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@/room_lucky_gift_bg.svga", API_Image_URL]];
+                    if (luckyGiftSvgaUrl.absoluteString.length > 0) {
+                        [self playLuckyGiftEffect:luckyGiftSvgaUrl];
                     }
-                    [self playLuckyGiftEffect:luckyGiftSvgaUrl];
+                    
                 }
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [self receiveGift:receiveInfo];
@@ -313,10 +313,10 @@
                 } else {
                     NSString * svgaString = receiveInfo.luckyGiftSvgaUrl.length > 0 ? receiveInfo.luckyGiftSvgaUrl : receiveInfo.gift.luckyGiftSvgaUrl;
                     NSURL * luckyGiftSvgaUrl = [NSURL URLWithString:svgaString];
-                    if (luckyGiftSvgaUrl.absoluteString.length <= 0) {
-                        luckyGiftSvgaUrl = [NSURL URLWithString:[NSString stringWithFormat:@"%@/room_lucky_gift_bg.svga", API_Image_URL]];;
+                    if (luckyGiftSvgaUrl.absoluteString.length > 0) {
+                        [self playLuckyGiftEffect:luckyGiftSvgaUrl];
                     }
-                    [self playLuckyGiftEffect:luckyGiftSvgaUrl];
+                    
                 }
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [self receiveGift:receiveInfo];
diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
index aa504041..756660bd 100644
--- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
+++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
@@ -674,7 +674,11 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 			NIMChatroomNotificationMember *member = content.targets[0];
 			if (member.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
                 ///自己进房成功后拉取历史消息
-                if(self.datasource.count > 0)return;
+                if(self.datasource.count > 0)
+                {
+                    self.isLoadHistoryMessage = NO;
+                    return;
+                }
                 [self handleFetchHistoryMessage:message];
             } else {
                 self.isLoadHistoryMessage = NO;
diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m
index 2e2b3e5b..5a1ddd36 100644
--- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m
+++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m
@@ -306,7 +306,7 @@
         _titleView = [[JXCategoryTitleView alloc] init];
         _titleView.delegate = self;
         _titleView.titles = self.titles;
-        _titleView.backgroundColor = [UIColor whiteColor];
+        _titleView.backgroundColor = [UIColor clearColor];
         _titleView.titleColor = UIColorFromRGB(0x767585);
         _titleView.titleSelectedColor = UIColorFromRGB(0xFF285C);
         _titleView.titleFont =kFontMedium(18);
@@ -344,10 +344,10 @@
     if (!_contentView) {
         _contentView = [[JXPagerView alloc] initWithDelegate:self listContainerType:0];
         _contentView.mainTableView.gestureDelegate = self;
-        _contentView.backgroundColor = [UIColor whiteColor];
-        _contentView.listContainerView.backgroundColor = [UIColor whiteColor];
-        _contentView.listContainerView.listCellBackgroundColor = [UIColor whiteColor];
-        _contentView.mainTableView.backgroundColor = [UIColor whiteColor];
+        _contentView.backgroundColor = [UIColor clearColor];
+        _contentView.listContainerView.backgroundColor = [UIColor clearColor];
+        _contentView.listContainerView.listCellBackgroundColor = [UIColor clearColor];
+        _contentView.mainTableView.backgroundColor = [UIColor clearColor];
     }
     return _contentView;
 }
diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m
index 12679657..1b576210 100644
--- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m
+++ b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m
@@ -529,7 +529,7 @@
         _sendWishView.layer.cornerRadius = kGetScaleWidth(8);
         _sendWishView.layer.masksToBounds = YES;
         _sendWishView.layer.borderWidth = 1;
-        _sendWishView.layer.borderColor = [UIColor whiteColor].CGColor;
+        _sendWishView.layer.borderColor = [UIColor colorWithWhite:1 alpha:0.7].CGColor;
     }
     return _sendWishView;
 }