diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h
index 3041f7e0..d7fb9681 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h
+++ b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.h
@@ -9,7 +9,7 @@
 
 @protocol PIRoomGiftBroadcastWindowDelegate <NSObject>
 
--(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roodUid;
+-(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roomUid;
 
 @end
 
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m
index 047ef130..e94af891 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/PIRoomGiftBroadcastWindow.m
@@ -94,7 +94,21 @@
 -(void)pi_cancelAction{
     [self removeFromSuperview];
 }
+-(void)selectAction:(UIButton *)sender{
+    sender.selected = !sender.selected;
+    if(sender.selected == YES){
+        [[NSUserDefaults standardUserDefaults]setValue:@(YES) forKey:@"kSaveBrooadcastSelectState"];
+        [[NSUserDefaults standardUserDefaults]synchronize];
+    }else{
+        [[NSUserDefaults standardUserDefaults]removeObjectForKey:@"kSaveBrooadcastSelectState"];
+    }
+}
+- (void)setRoomName:(NSString *)roomName{
+    _roomName = roomName;
+    self.roomNameView.text = [NSString stringWithFormat:@"“%@”",_roomName];
+}
 -(void)piConfirmAction{
+    [self removeFromSuperview];
     if(self.delegate && [self.delegate respondsToSelector:@selector(confirmLeaveForTheRoom:)]){
         [self.delegate confirmLeaveForTheRoom:self.roodUid];
     }
@@ -124,7 +138,7 @@
 }
 - (UILabel *)roomNameView{
     if(!_roomNameView){
-        _roomNameView = [UILabel labelInitWithText:YMLocalizedString(@"“我是房间名房间名”") font:kFontRegular(14) textColor:UIColorFromRGB(0x9168FA)];
+        _roomNameView = [UILabel labelInitWithText:YMLocalizedString(@"") font:kFontRegular(14) textColor:UIColorFromRGB(0x9168FA)];
         _roomNameView.textAlignment = NSTextAlignmentCenter;
     }
     return _roomNameView;
@@ -135,6 +149,7 @@
         [_pi_selectView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
         [_pi_selectView setImage:kImage(@"pi_room_gift_broadcast_window_select") forState:UIControlStateSelected];
         [_pi_selectView setImage:kImage(@"pi_room_gift_broadcast_window_no_select") forState:UIControlStateNormal];
+        [_pi_selectView addTarget:self action:@selector(selectAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _pi_selectView;
 }
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
index bb3b0fe5..e7c3e4e0 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m
@@ -62,7 +62,11 @@
 #import "PIFullScreenBannerAnimation.h"
 #import "XPTreasureFairyGiftView.h"
 #import "XPRoomTarrowBannerView.h"
-@interface XPRoomAnimationView ()<SVGAPlayerDelegate,NIMBroadcastManagerDelegate, XPRoomGiftBroadcastViewDelegate, HWDMP4PlayDelegate, XPRoomLuckyBigPrizeViewDelegate, XPRoomGraffitiGiftAnimationViewDelegate, XPRoomStarKitchenBannerViewDelegate,PAGViewListener,XPRoomAnchorRankBannerViewDelegate>
+#import "PIRoomGiftBroadcastWindow.h"
+
+
+
+@interface XPRoomAnimationView ()<SVGAPlayerDelegate,NIMBroadcastManagerDelegate, XPRoomGiftBroadcastViewDelegate, HWDMP4PlayDelegate, XPRoomLuckyBigPrizeViewDelegate, XPRoomGraffitiGiftAnimationViewDelegate, XPRoomStarKitchenBannerViewDelegate,PAGViewListener,XPRoomAnchorRankBannerViewDelegate,PIRoomGiftBroadcastWindowDelegate>
 ///展示的不同层级
 ///最底层的
 @property (nonatomic,strong) XPRoomAnimationHitView * lowLevelView;
@@ -150,7 +154,7 @@
 ///animationListA播放完后，如果有animationListB，那么要在animationListA的位置上播放animationListB，只播放一次
 //@property(nonatomic,assign) BOOL isAnimationListAFinish;
 @property(nonatomic,strong) NSMutableArray *svgaQueue;
-
+@property(nonatomic,assign) CGFloat broadCastHieght;
 @end
 
 @implementation XPRoomAnimationView
@@ -404,7 +408,7 @@
 
 - (void)createStarKitchenBannerAnimation:(PIBaseAnimationViewModel *)attacment{
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomStarKitchenBannerView *starKitchenView = [[XPRoomStarKitchenBannerView alloc]initWithFrame:CGRectMake(0, top, KScreenWidth, kGetScaleWidth(60))];
     starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_Server;
     XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
@@ -475,7 +479,7 @@
     
     CGFloat kscale = (CGFloat)55 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
     tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Common_H5_Advanced;
     tarrowVeiw.giftH5Info = attatchment;
@@ -537,7 +541,7 @@
     
     CGFloat kscale = (CGFloat)55 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:NO];
     tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Tarot_Advanced;
     tarrowVeiw.giftInfo = attatchment;
@@ -599,7 +603,7 @@
 - (void)createTreasureFairyBannerAnimation:(PIBaseAnimationViewModel *)attatchment {
     self.isPlayOfB = YES;
     CGFloat kscale = (CGFloat)60 / (CGFloat)375;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPTreasureFairyGiftView *treasureView = [[XPTreasureFairyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)];
     //最大礼物
     if ((attatchment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5) || (attatchment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {
@@ -1017,7 +1021,7 @@
 - (void)createCandyTreeBannerAnimation:(PIBaseAnimationViewModel *)attatchment {
     CGFloat kscale = (CGFloat)60 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomCandyGiftView *candyTreeView = [[XPRoomCandyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)];
     candyTreeView.isMaxLargeGift = attatchment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend;
     candyTreeView.candyInfo = attatchment.data;
@@ -1121,7 +1125,7 @@
 
 - (void)createNobleLevelUpBannerAnimation:(PIBaseAnimationViewModel *)model {
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     
     XPRoomNobleLevelUpView *nobleLevelUpView = [[XPRoomNobleLevelUpView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, 90)];
     nobleLevelUpView.nobleInfo = model.data;
@@ -1232,7 +1236,7 @@
 }
 - (void)createAnchorHourRankAnimation:(PIBaseAnimationViewModel *)attachment {
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomAnchorRankBannerView *anchorRankView = [[XPRoomAnchorRankBannerView alloc] initWithFrame:CGRectMake(KScreenWidth,top, KScreenWidth, kGetScaleWidth(55))];
     anchorRankView.anchorRankInfo = [RoomHalfHourRankModel modelWithDictionary:attachment.data];
     anchorRankView.delegate = self;
@@ -1504,7 +1508,7 @@
     self.isPlayOfA = YES;
     XPRoomGiftBroadcastView * view = [[XPRoomGiftBroadcastView alloc] init];
     view.delegate = self;
-    view.frame = CGRectMake(KScreenWidth, 35 + statusbarHeight, KScreenWidth, 150);
+    view.frame = CGRectMake(KScreenWidth, 35 + statusbarHeight, KScreenWidth, kGetScaleWidth(69));
     view.broadcastModel = giftModel;
     [self.highLevleView addSubview:view];
     [self beginGiftBraodcastViewAnimation:view notifyStaySecond:giftModel.notifyStaySecond];
@@ -1552,7 +1556,17 @@
 }
 
 #pragma mark - XPRoomGiftBroadcastViewDelegate
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid {
+- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid roomName:(NSString *)roomName{
+    id isShowBroadcastView = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveBrooadcastSelectState"];
+    if(isShowBroadcastView == nil){
+        PIRoomGiftBroadcastWindow *broadcastView = [[PIRoomGiftBroadcastWindow alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
+        broadcastView.roodUid = roomUid;
+        broadcastView.roomName = roomName;
+        broadcastView.delegate = self;
+        [kWindow addSubview:broadcastView];
+        return;
+    }
+    
     if (roomUid.length > 0 && self.delegate.getRoomInfo.uid != roomUid.integerValue) {
         [self.delegate exitRoom];
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -1561,18 +1575,15 @@
     }
 }
 
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view didClickClose:(GiftReceiveInfoModel *)broadcastModel {
-    [view removeFromSuperview];
-    [view pop_removeAllAnimations];
-    self.isPlayOfA = NO;
-    if (self.animationListA.count > 0) {
-        [self.animationListA removeObjectAtIndex:0];
-    }
-    if (self.animationListA.count > 0 && self.isPlayOfB == NO && self.isPlayOfA == NO) {
-        [self createGiftBroadcastViewAnimation:self.animationListA.firstObject];
+#pragma mark - PIRoomGiftBroadcastWindowDelegate
+-(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roomUid{
+    if (roomUid.length > 0 && self.delegate.getRoomInfo.uid != roomUid.integerValue) {
+        [self.delegate exitRoom];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
+        });
     }
 }
-
 #pragma mark - 福袋中 四级奖品
 - (void)receiveLuckyGiftBigPrize:(AttachmentModel *)attachment {
     if ([self isInSudGame]) {return;}
@@ -1594,7 +1605,7 @@
 - (void)createBigPrizeAnimation:(PIBaseAnimationViewModel *)prizeModel {
     
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     
     
     self.isLuckyGiftAnimation = YES;
@@ -2704,4 +2715,10 @@
     }
     return _carPagView;
 }
+- (CGFloat)broadCastHieght{
+    if(_broadCastHieght == 0){
+        _broadCastHieght = 190 - 150 + kGetScaleWidth(69);
+    }
+    return _broadCastHieght;
+}
 @end
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h
index 1b0d61e4..308c662a 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.h
@@ -11,10 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 @class  XPRoomGiftBroadcastView;
 
 @protocol XPRoomGiftBroadcastViewDelegate <NSObject>
-/// 点击了关闭
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view didClickClose:(GiftReceiveInfoModel *)broadcastModel;
+
 ///点击了进入房间
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid;
+- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid roomName:(NSString *)roomName;
 
 @end
 
diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m
index 3ab51b4e..581d5da9 100644
--- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m
+++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m
@@ -54,15 +54,11 @@
     return self;
 }
 #pragma mark - Response
-- (void)closeButtonAction:(UIButton *)sender {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomGiftBroadcastView:didClickClose:)]) {
-        [self.delegate xPRoomGiftBroadcastView:self didClickClose:self.broadcastModel];
-    }
-}
+
 
 - (void)didClickEnterRoom {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomGiftBroadcastView:enterRoom:)]) {
-        [self.delegate xPRoomGiftBroadcastView:self enterRoom:[NSString stringWithFormat:@"%ld", self.broadcastModel.roomUid]];
+    if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomGiftBroadcastView:enterRoom:roomName:)]) {
+        [self.delegate xPRoomGiftBroadcastView:self enterRoom:[NSString stringWithFormat:@"%ld", self.broadcastModel.roomUid] roomName:self.broadcastModel.roomTitle];
     }
 }
 
@@ -209,19 +205,21 @@
 #pragma mark - Getters And Setters
 - (void)setBroadcastModel:(GiftReceiveInfoModel *)broadcastModel {
     _broadcastModel = broadcastModel;
+    NSString *sendUserNick = @"";
+    NSString *recvUserNick = @"";
     if (_broadcastModel) {
-        if (broadcastModel.sendUserNick.length > 6) {
-            broadcastModel.sendUserNick = [broadcastModel.sendUserNick substringToIndex:6];
-        }
         self.senderAvatarView.imageUrl = _broadcastModel.sendUserAvatar;
-        if (broadcastModel.recvUserNick.length > 6) {
-            broadcastModel.recvUserNick = [broadcastModel.recvUserNick substringToIndex:6];
-        }
-
-        
-        self.giftImageView.imageUrl = broadcastModel.giftUrl;
-        self.countLabel.text = [NSString stringWithFormat:@"x%ld", broadcastModel.giftNum];
-        [self updateSubviews:broadcastModel.levelNum];
+        sendUserNick = _broadcastModel.sendUserNick.length > 6 ? [_broadcastModel.sendUserNick substringToIndex:6] : _broadcastModel.sendUserNick;
+        recvUserNick = _broadcastModel.recvUserNick.length > 6 ? [_broadcastModel.recvUserNick substringToIndex:6] : _broadcastModel.recvUserNick;
+        NSString *giftName = [NSString stringWithFormat:@"%@ %@ %@ %@",_broadcastModel.sendUserNick,YMLocalizedString(@"XPRoomYearActivityView0"),_broadcastModel.recvUserNick,_broadcastModel.giftName];
+        NSMutableAttributedString *giftNameAtt = [[NSMutableAttributedString alloc]initWithString:giftName attributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:[UIColor whiteColor]}];
+        [giftNameAtt addAttributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0xFFE468)} range:[giftName rangeOfString:sendUserNick]];
+        [giftNameAtt addAttributes:@{NSFontAttributeName:kFontMedium(14),NSForegroundColorAttributeName:UIColorFromRGB(0xFFE468)} range:[giftName rangeOfString:recvUserNick]];
+        self.pi_contentView.attributedText = giftNameAtt;
+        self.giftImageView.imageUrl = _broadcastModel.giftUrl;
+        self.roomNameLabel.text = _broadcastModel.roomTitle;
+        self.countLabel.text = [NSString stringWithFormat:@"x%ld", _broadcastModel.giftNum];
+        [self updateSubviews:_broadcastModel.levelNum];
     }
 }
 
@@ -257,9 +255,8 @@
 
 - (NetImageView *)giftImageView {
     if (!_giftImageView) {
-        NetImageConfig * config = [[NetImageConfig alloc]init];
-        config.imageType = ImageTypeUserIcon;
-        _giftImageView = [[NetImageView alloc] initWithConfig:config];
+     
+        _giftImageView = [[NetImageView alloc] init];
     }
     return _giftImageView;
 }
@@ -298,6 +295,7 @@
         [_circuseeBtn setTitle:YMLocalizedString(@"XPAcrpssRoomPKPanelView3") forState:UIControlStateNormal];
         _circuseeBtn.titleLabel.font = kFontRegular(10);
         _circuseeBtn.layer.cornerRadius = kGetScaleWidth(20)/2;
+        _circuseeBtn.layer.borderWidth = 1;
         _circuseeBtn.layer.masksToBounds = YES;
     }
     return _circuseeBtn;
diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h
index 9b946c7c..05bcb22b 100644
--- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h
+++ b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftReceiveInfoModel.h
@@ -47,6 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface GiftReceiveInfoModel : NSObject
+@property(nonatomic,copy) NSString *roomTitle;
 ///目标的uid
 @property(nonatomic,copy)NSString * targetUid;
 ///目标的头像
diff --git a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
index 9f49ada5..5e61ffbd 100644
--- a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
+++ b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
@@ -61,7 +61,8 @@
 #import "XPSkillCardPlayerManager.h"
 #import "XPTreasureFairyGiftView.h"
 #import "XPRoomTarrowBannerView.h"
-@interface PIFullScreenBannerAnimation()<XPRoomGiftBroadcastViewDelegate,XPRoomLuckyBigPrizeViewDelegate, XPRoomStarKitchenBannerViewDelegate,XPRoomAnchorRankBannerViewDelegate>
+#import "PIRoomGiftBroadcastWindow.h"
+@interface PIFullScreenBannerAnimation()<XPRoomGiftBroadcastViewDelegate,XPRoomLuckyBigPrizeViewDelegate, XPRoomStarKitchenBannerViewDelegate,XPRoomAnchorRankBannerViewDelegate,PIRoomGiftBroadcastWindowDelegate>
 ///礼物飘屏 PresentAchieveAbstractMatrix
 @property(nonatomic,strong)  NSMutableArray<GiftReceiveInfoModel *> *animationListA;
 ///玩法飘屏 YUMIPresentBigCaptureMatrix
@@ -72,6 +73,7 @@
 @property(nonatomic,assign) BOOL isPlayOfB;
 ///animationListA播放完后，如果有animationListB，那么要在animationListA的位置上播放animationListB，只播放一次
 //@property(nonatomic,assign) BOOL isAnimationListAFinish;
+@property(nonatomic,assign) CGFloat broadCastHieght;
 @end
 @implementation PIFullScreenBannerAnimation
 
@@ -80,7 +82,7 @@
     self.isPlayOfA = YES;
     XPRoomGiftBroadcastView * view = [[XPRoomGiftBroadcastView alloc] init];
     view.delegate = self;
-    view.frame = CGRectMake(KScreenWidth, 35 + statusbarHeight, KScreenWidth, 150);
+    view.frame = CGRectMake(KScreenWidth, 35 + statusbarHeight, KScreenWidth, kGetScaleWidth(69));
     view.broadcastModel = giftModel;
     [kWindow addSubview:view];
     [self beginGiftBraodcastViewAnimation:view notifyStaySecond:giftModel.notifyStaySecond];
@@ -132,20 +134,26 @@
     [view pop_addAnimation:moveAnimation forKey:@"moveOutAnimation"];
 }
 
-/// 点击了关闭
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view didClickClose:(GiftReceiveInfoModel *)broadcastModel{
-    [view removeFromSuperview];
-    [view pop_removeAllAnimations];
-    self.isPlayOfA = NO;
-    if (self.animationListA.count > 0) {
-        [self.animationListA removeObjectAtIndex:0];
+
+///点击了进入房间
+- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid roomName:(NSString *)roomName{
+    id isShowBroadcastView = [[NSUserDefaults standardUserDefaults]valueForKey:@"kSaveBrooadcastSelectState"];
+    if(isShowBroadcastView == nil){
+        PIRoomGiftBroadcastWindow *broadcastView = [[PIRoomGiftBroadcastWindow alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
+        broadcastView.roodUid = roomUid;
+        broadcastView.roomName = roomName;
+        broadcastView.delegate = self;
+        [kWindow addSubview:broadcastView];
+        return;
     }
-    if (self.animationListA.count > 0 && self.isPlayOfB == NO && self.isPlayOfA == NO) {
-        [self createGiftBroadcastViewAnimation:self.animationListA.firstObject];
+    if (roomUid.length > 0) {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
+        });
     }
 }
-///点击了进入房间
-- (void)xPRoomGiftBroadcastView:(XPRoomGiftBroadcastView *)view enterRoom:(NSString *)roomUid{
+#pragma mark -PIRoomGiftBroadcastWindowDelegate
+-(void)confirmLeaveForTheRoom:(NSString *_Nonnull)roomUid{
     if (roomUid.length > 0) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [XPRoomViewController openRoom:roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
@@ -231,7 +239,7 @@
    
     CGFloat kscale = (CGFloat)55 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
 
     
     XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)isH5:YES];
@@ -293,7 +301,7 @@
    
     CGFloat kscale = (CGFloat)55 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomTarrowBannerView *tarrowVeiw = [[XPRoomTarrowBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale) isH5:NO];
     tarrowVeiw.isBig = attatchment.second == Custom_Message_Sub_Tarot_Advanced;
     tarrowVeiw.giftInfo = attatchment;
@@ -354,7 +362,7 @@
 - (void)createTreasureFairyBannerAnimation:(PIBaseAnimationViewModel *)attatchment {
     CGFloat kscale = (CGFloat)60 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPTreasureFairyGiftView *treasureView = [[XPTreasureFairyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)];
     //最大礼物
     if ((attatchment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L5) || (attatchment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {
@@ -424,7 +432,7 @@
 
 - (void)createBigPrizeAnimation:(PIBaseAnimationViewModel *)prizeModel {
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomLuckyBigPrizeView * luckyGiftEffectView = [[XPRoomLuckyBigPrizeView alloc] initWithFrame:CGRectMake(KScreenWidth, top, 375, 60)];
     luckyGiftEffectView.delegate = self;
     [kWindow addSubview:luckyGiftEffectView];
@@ -486,7 +494,7 @@
 - (void)createCandyTreeBannerAnimation:(PIBaseAnimationViewModel *)attatchment {
     CGFloat kscale = (CGFloat)60 / (CGFloat)375;
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
    
     
     XPRoomCandyGiftView *candyTreeView = [[XPRoomCandyGiftView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth , KScreenWidth * kscale)];
@@ -544,7 +552,7 @@
 
 - (void)createNobleLevelUpBannerAnimation:(PIBaseAnimationViewModel *)model {
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     
     XPRoomNobleLevelUpView *nobleLevelUpView = [[XPRoomNobleLevelUpView alloc] initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, 90)];
     nobleLevelUpView.nobleInfo = model.data;
@@ -599,7 +607,7 @@
 
 - (void)createStarKitchenBannerAnimation:(PIBaseAnimationViewModel *)attacment{
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomStarKitchenBannerView *starKitchenView = [[XPRoomStarKitchenBannerView alloc]initWithFrame:CGRectMake(0, top, KScreenWidth, kGetScaleWidth(60))];
     starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_Server;
     XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
@@ -671,7 +679,7 @@
 }
 - (void)createAnchorHourRankAnimation:(PIBaseAnimationViewModel *)attachment {
     self.isPlayOfB = YES;
-    CGFloat top = self.isPlayOfA == YES ? (190 + statusbarHeight) : (kNavigationHeight + 15);
+    CGFloat top = self.isPlayOfA == YES ? (self.broadCastHieght + statusbarHeight) : (kNavigationHeight + 15);
     XPRoomAnchorRankBannerView *anchorRankView = [[XPRoomAnchorRankBannerView alloc] initWithFrame:CGRectMake(KScreenWidth,top, KScreenWidth, kGetScaleWidth(55))];
     anchorRankView.anchorRankInfo = [RoomHalfHourRankModel modelWithDictionary:attachment.data];
     anchorRankView.delegate = self;
@@ -731,5 +739,10 @@
     }
     return _animationListB;
 }
-
+- (CGFloat)broadCastHieght{
+    if(_broadCastHieght == 0){
+        _broadCastHieght = 190 - 150 + kGetScaleWidth(69);
+    }
+    return _broadCastHieght;
+}
 @end
diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m
index 74ea8ef1..73bef70b 100644
--- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m
+++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m
@@ -84,7 +84,7 @@
 #import <SVGA.h>
 #import "Api+Gift.h"
 #import "PIReceiveRedPacketSuccessView.h"
-#import "PIRoomGiftBroadcastWindow.h"
+
 
 
 NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey";
@@ -176,10 +176,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
     
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        PIRoomGiftBroadcastWindow *view = [[PIRoomGiftBroadcastWindow alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
-
-
-        [kWindow addSubview:view];
+       
     });
    
 }