From b835a2f3758875ae859c4b2281b3ff9407c64c2f Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Wed, 27 Sep 2023 21:41:03 +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

---
 YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h             | 1 +
 YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m  | 2 +-
 YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h
index 96fdc01f..053cb876 100644
--- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h
+++ b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h
@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,assign) BOOL isHourTop1;
 //是否为周榜top1
 @property(nonatomic,assign) BOOL isWeekTop1;
+@property(nonatomic,copy) NSString *inRoomUid;
 
 //是否在麦位
 @property(nonatomic,assign) BOOL inMic;
diff --git a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m
index e966ffeb..7a61796b 100644
--- a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m
@@ -457,7 +457,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification;
 ///点击聊天
 -(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel{
     if(roomModel.inMic == YES){
-        [XPRoomViewController openRoom:roomModel.uid fromNick:nil fromType:UserEnterRoomFromType_Home_Recommend fromUid:nil viewController:self];
+        [XPRoomViewController openRoom:roomModel.inRoomUid fromNick:roomModel.nick fromType:UserEnterRoomFromType_Home_Recommend fromUid:roomModel.uid viewController:self];
         return;
     }
     
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
index 1eae0204..e4f2f9eb 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
@@ -248,7 +248,7 @@
             [self receiveTreasureFairyGiftHighLevel:attachment];
         }else if (attachment.first == CustomMessageType_Tarot && (attachment.second == Custom_Message_Sub_Tarot_Advanced || attachment.second == Custom_Message_Sub_Tarot_Intermediate)){
             [self receiveTarotBanner:attachment];
-        }else if (attachment.first == Custom_Message_Sub_Common_H5_Novice &&(attachment.second == Custom_Message_Sub_Common_H5_Novice || attachment.second == Custom_Message_Sub_Common_H5_Advanced)){
+        }else if (attachment.first == CustomMessageType_Common_H5 &&(attachment.second == Custom_Message_Sub_Common_H5_Novice || attachment.second == Custom_Message_Sub_Common_H5_Advanced)){
             [self receiveCommonH5Banner:attachment];
         }
     }
@@ -367,7 +367,7 @@
                 return;
             }
             [self receiveTarotBanner:attachment];
-        }else if (attachment.first == Custom_Message_Sub_Common_H5_Novice &&(attachment.second == Custom_Message_Sub_Common_H5_Novice || attachment.second == Custom_Message_Sub_Common_H5_Advanced)){
+        }else if (attachment.first == CustomMessageType_Common_H5 &&(attachment.second == Custom_Message_Sub_Common_H5_Novice || attachment.second == Custom_Message_Sub_Common_H5_Advanced)){
             [self receiveCommonH5Banner:attachment];
         }
     }