feat: 修正初步 debug 问题

YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "麦克风@3x(1).png",
+      "filename" : "麦克风@3x-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close_but_music.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "麦克风@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h

@@ -67,6 +67,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic,copy) NSString *introduction;
 @property(nonatomic,strong) UserLevelVo *userLevelVo;
 @property (nonatomic, copy) NSString *roomDesc;
+
+@property (nonatomic, assign) BOOL roomBoom;
+@property (nonatomic, copy) NSString *roomBoomPic;
+@property (nonatomic, copy) NSString *roomBoomVapUrl;
 @end
 
 @interface HomePlayMicUserModel : PIBaseModel
@@ -79,6 +83,9 @@ NS_ASSUME_NONNULL_BEGIN
 ///用户的uid
 @property (nonatomic,copy) NSString *uid;
 @property(nonatomic,copy) NSString *erbanNo;
+
+
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m

@@ -30,6 +30,8 @@
 
 @property (nonatomic, assign) NSInteger membersCount;
 
+@property (nonatomic,strong) NetImageView *boomImageView;
+
 @end
 @implementation XPNewHomePartyCollectionViewCell
 -(instancetype)initWithFrame:(CGRect)frame{
@@ -74,7 +76,9 @@
     [self.contentView addSubview:self.subView];
     [self.contentView addSubview:self.heatGifView];
     [self.contentView addSubview:self.heatView];
-    
+
+    [self.contentView addSubview:self.boomImageView];
+
     @kWeakify(self);
     [self.parser parseWithNamed:@"pi_home_new_pk" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
         @kStrongify(self);
@@ -131,6 +135,12 @@
         make.trailing.mas_equalTo(-kGetScaleWidth(6));
         make.bottom.equalTo(self.avatarView.mas_bottom).mas_offset(-kGetScaleWidth(6));
     }];
+
+    [self.boomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.contentView).offset(11);
+        make.trailing.mas_equalTo(self.contentView).offset(-8);
+        make.size.mas_equalTo(CGSizeMake(40, 40));
+    }];
 }
 - (void)setRoomInfo:(HomePlayRoomModel *)roomInfo{
     _roomInfo = roomInfo;
@@ -174,6 +184,13 @@
     [self.heatView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(self.roomInfo.width);
     }];
+
+    if (roomInfo.roomBoom) {
+        self.boomImageView.hidden = NO;
+        self.boomImageView.imageUrl = [roomInfo roomBoomPic];
+    } else {
+        self.boomImageView.hidden = YES;
+    }
 }
 #pragma mark - 懒加载
 - (NetImageView *)avatarView{
@@ -198,6 +215,13 @@
     }
     return _tagavatarView;
 }
+- (NetImageView *)boomImageView{
+    if(!_boomImageView){
+        _boomImageView = [NetImageView new];
+        _boomImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _boomImageView;
+}
 - (UILabel *)nameView{
     if(!_nameView){
         _nameView = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0x1E1E1F)];

YuMi/Modules/YMRTC/RtcImpl/AgoraRtcImpl.m

@@ -150,6 +150,10 @@
 	[self.engine adjustRecordingSignalVolume:soundVol];
 }
 
+- (NSInteger)loadUserSound {
+    return -1;
+}
+
 - (void)updateMusicSound:(int)soundVol {
 	[self.engine adjustAudioMixingVolume:soundVol];
 }

YuMi/Modules/YMRTC/RtcImpl/RtcInterface.h

@@ -68,6 +68,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 ///背景人声的音量大小
 - (void)updateUserSound:(int)soundVol;
+
+///获取人声音量大小
+- (NSInteger)loadUserSound;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRTC/RtcImpl/TRTCRtcImpl.m

@@ -215,6 +215,10 @@
 	[self.engine setAudioCaptureVolume:soundVol];
 }
 
+- (NSInteger)loadUserSound {
+    return self.engine.getAudioCaptureVolume;
+}
+
 - (void)updateMusicSound:(int)soundVol {
 	[self.musicManager setMusicPublishVolume:self.musicId volume:soundVol * 1.5];
 	[self.musicManager setMusicPlayoutVolume:self.musicId volume:soundVol * 1.5];

YuMi/Modules/YMRTC/RtcImpl/ZegoRtcImpl.m

@@ -156,6 +156,10 @@
 	}
 }
 
+- (NSInteger)loadUserSound {
+    return self.engine.getCaptureSoundLevel;
+}
+
 - (void)updateMusicSound:(int)soundVol {
 	if (soundVol) {
 		[self.mediaPlayer setVolume:soundVol];

YuMi/Modules/YMRTC/RtcManager.h

@@ -137,6 +137,8 @@ typedef NS_ENUM(NSInteger, BackMusicPlayState) {
 ///背景人声的音量大小
 - (void)updateUserSound:(int)soundVol;
 
+- (NSInteger)loadUserSound;
+
 @property (nonatomic,assign) BOOL broadcast;
 @end
 

YuMi/Modules/YMRTC/RtcManager.m

@@ -140,6 +140,10 @@
 	[self.engine updateUserSound:soundVol];
 }
 
+- (NSInteger)loadUserSound {
+    return [self.engine loadUserSound];
+}
+
 - (void)usersSpeaking:(NSMutableArray *)uids {
     if (self.engineDelegate) {
         [self.engineDelegate usersSpeaking:uids];

YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface BoomInfoViewController : MvpViewController
 
 //+ (BoomInfoViewController *)vcFromBoomProgress:(NSArray <BoomDetailModel *>*)models;
+@property (nonatomic, copy) void(^showGiftPanel)(void);
 
 @end
 

YuMi/Modules/YMRoom/Features/Boom/BoomInfoViewController.m

@@ -123,6 +123,9 @@
 @property (nonatomic, strong) UIImageView *progressBar;
 
 @property (nonatomic, strong) UIView *rankingView;
+//@property (nonatomic, strong) UIImageView *wear_1;
+//@property (nonatomic, strong) UIImageView *wear_2;
+//@property (nonatomic, strong) UIImageView *wear_3;
 @property (nonatomic, strong) NetImageView *rankAvatar_1;
 @property (nonatomic, strong) NetImageView *rankAvatar_2;
 @property (nonatomic, strong) NetImageView *rankAvatar_3;
@@ -551,7 +554,13 @@
 }
 
 - (void)handleTapBottomButton {
-    [self dismissViewControllerAnimated:YES completion:nil];
+    @kWeakify(self);
+    [self dismissViewControllerAnimated:YES completion:^{
+        @kStrongify(self);
+        if (self.showGiftPanel) {
+            self.showGiftPanel();
+        }
+    }];
 }
 
 - (void)handleTapHelpButton {
@@ -618,6 +627,14 @@
     if (boom.roomBoomRankVos.count > 0) {
         self.rankingView.hidden = NO;
         self.giftsView.hidden = YES;
+
+        self.rankName_1.text = @"";
+        self.rankName_2.text = @"";
+        self.rankName_3.text = @"";
+        self.rankAvatar_1.image = nil;
+        self.rankAvatar_2.image = nil;
+        self.rankAvatar_3.image = nil;
+
         for (roomBoomRankVo *rank in boom.roomBoomRankVos) {
             switch (rank.position) {
                 case 1:
@@ -639,25 +656,33 @@
     } else {
         self.rankingView.hidden = YES;
         self.giftsView.hidden = NO;
+
+        self.giftBig.image = nil;
+        self.giftSmall_1.image = nil;
+        self.giftSmall_2.image = nil;
+        self.giftSmall_3.image = nil;
+        self.giftSmall_4.image = nil;
+
         for (roomBoomLevelAwardVo *award in boom.roomBoomLevelAwardVos) {
             if (award.isShow != 1) {
                 continue;
             }
+            NSString *pic = [award.awardPic stringByRemovingPercentEncoding];
             switch (award.seq) {
                 case 1:
-                    self.giftBig.imageUrl = award.awardPic;
+                    self.giftBig.imageUrl = pic;
                     break;
                 case 2:
-                    self.giftSmall_1.imageUrl = award.awardPic;
+                    self.giftSmall_1.imageUrl = pic;
                     break;
                 case 3:
-                    self.giftSmall_2.imageUrl = award.awardPic;
+                    self.giftSmall_2.imageUrl = pic;
                     break;
                 case 4:
-                    self.giftSmall_3.imageUrl = award.awardPic;
+                    self.giftSmall_3.imageUrl = pic;
                     break;
                 case 5:
-                    self.giftSmall_4.imageUrl = award.awardPic;
+                    self.giftSmall_4.imageUrl = pic;
                     break;
                 default:
                     break;

YuMi/Modules/YMRoom/Features/Boom/RoomBoomBannerAnimation.m

@@ -94,12 +94,13 @@
                 return;
             }
 
+            __block NSString *targetRoomUid = @(self.model.roomUid).stringValue;
             @kWeakify(self);
             [TTPopup alertWithMessage:YMLocalizedString(@"Combo_10") confirmHandler:^{
                 @kStrongify(self);
                 [roomVC exitRoom];
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [XPRoomViewController openRoom:@(self.model.roomUid).stringValue
+                    [XPRoomViewController openRoom:targetRoomUid
                                     viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
                 });
             } cancelHandler:^{}];
@@ -196,6 +197,7 @@
 - (NetImageView *)rocket {
     if (!_rocket) {
         _rocket = [[NetImageView alloc] init];
+        _rocket.contentMode = UIViewContentModeScaleAspectFit;
     }
     return _rocket;
 }

YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-@class AttachmentModel, BoomInfoModel, BoomDetailModel;
+@class AttachmentModel, BoomInfoModel, BoomDetailModel, UserInfoModel;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -19,6 +19,8 @@ typedef void(^BoomEventBlock)(id sth);
 
 - (NSArray *)loadBoomDetails;
 
+- (void)saveUserInfo:(UserInfoModel *)userInfo;
+
 - (void)leaveRoom;
 
 - (void)updateBoomDetailArray:(NSArray <BoomDetailModel *> *)array;

YuMi/Modules/YMRoom/Features/Boom/RoomBoomManager.m

@@ -8,7 +8,9 @@
 #import "RoomBoomManager.h"
 
 #import "BoomInfoModel.h"
+#import "UserInfoModel.h"
 #import "AttachmentModel.h"
+#import "XPSkillCardPlayerManager.h"
 
 @interface RoomBoomManager () <NIMChatManagerDelegate, NIMBroadcastManagerDelegate>
 
@@ -25,9 +27,11 @@
 @property (nonatomic, strong) NSMutableArray *bannerEventsQueue;
 
 @property (nonatomic, assign) BOOL isBooming;
-@property (nonatomic, assign) BOOL isGitfing;
+@property (nonatomic, assign) BOOL isGifting;
 @property (nonatomic, assign) BOOL isBannering;
 
+@property (nonatomic,strong) UserInfoModel *userInfo;
+
 @end
 
 @implementation RoomBoomManager
@@ -55,6 +59,10 @@
     return instance;
 }
 
+- (void)saveUserInfo:(UserInfoModel *)userInfo {
+    _userInfo = userInfo;
+}
+
 - (void)test {
     [self handleBannerUpdate:nil];
     [self handleExplosionUpdate:nil];
@@ -118,44 +126,58 @@
 }
 
 - (void)checkAndStartBoomEvent {
-    if (self.isBooming) {
+    if (self.isBooming ||
+        self.isGifting ||
+        self.boomEventsQueue.count == 0) {
         return;
     }
-    if (self.boomEventsQueue.count > 0) {
-        id obj = self.boomEventsQueue.firstObject;
 
-        NSString *url_1 = @"";
+    self.isBooming = YES;
-        NSString *url_2 = @"";
+    NSString *url_1 = @"";
-
+    NSString *url_2 = @"";
-        if ([obj isKindOfClass:[AttachmentModel class]]) {
+    id obj = self.boomEventsQueue.firstObject;
-            Boom632Model *m = [Boom632Model modelWithJSON:[(AttachmentModel *)obj data]];
+    [self.boomEventsQueue removeObjectAtIndex:0];
-            url_1 = m.countDownVapUrl;
+    if ([obj isKindOfClass:[AttachmentModel class]]) {
-            url_2 = m.endVapUrl;
+        Boom632Model *m = [Boom632Model modelWithJSON:[(AttachmentModel *)obj data]];
-        } else if ([obj isKindOfClass:[RoomBoomSignVo class]]) {
+        if ([XPSkillCardPlayerManager shareInstance].roomUid.integerValue != m.roomUid) {
-            url_1 = [(RoomBoomSignVo *)obj countDownVapUrl];
+            [self explosionEnd];
-            url_2 = [(RoomBoomSignVo *)obj endVapUrl];
+            return;
         }
 
-        if (url_1.length > 0 && url_2.length > 0) {
+        url_1 = m.countDownVapUrl;
-            self.isBooming = YES;
+        url_2 = m.endVapUrl;
-            [self handleExplosionUpdate:@[url_1, url_2]];
+    } else if ([obj isKindOfClass:[RoomBoomSignVo class]]) {
-        }
+        url_1 = [(RoomBoomSignVo *)obj countDownVapUrl];
-
+        url_2 = [(RoomBoomSignVo *)obj endVapUrl];
-        [self.boomEventsQueue removeObjectAtIndex:0];
+    }
+    if (url_1.length > 0 && url_2.length > 0) {
+        [self handleExplosionUpdate:@[url_1, url_2]];
+    }else {
+        [self explosionEnd];
     }
 }
 
 - (void)explosionEnd {
-    self.isBooming = NO;
     if (self.giftEventsQueue.count > 0) {
+        if (self.isGifting) {
+            return;
+        }
+        self.isGifting = YES;
         id obj = self.giftEventsQueue.firstObject;
-        [self handleBoomGiftUpdate:obj];
         [self.giftEventsQueue removeObjectAtIndex:0];
+        [self handleBoomGiftUpdate:obj];
     } else {
+        self.isBooming = NO;
         [self checkAndStartBoomEvent];
     }
 }
 
+- (void)giftDisplayEnd {
+    self.isBooming = NO;
+    self.isGifting = NO;
+    [self checkAndStartBoomEvent];
+}
+
 - (void)checkAndStartBannerEvent {
     if (self.isBannering) {
         return;
@@ -163,15 +185,11 @@
     if (self.bannerEventsQueue.count > 0) {
         self.isBannering = YES;
         id obj = self.bannerEventsQueue.firstObject;
-        [self handleBannerUpdate:obj];
         [self.bannerEventsQueue removeObjectAtIndex:0];
+        [self handleBannerUpdate:obj];
     }
 }
 
-- (void)giftDisplayEnd {
-    [self checkAndStartBoomEvent];
-}
-
 - (void)bannerDisplayEnd {
     self.isBannering = NO;
     [self checkAndStartBannerEvent];
@@ -326,9 +344,14 @@
     if ([AccountInfoStorage instance].getUid.length == 0) {
         return;
     }
+
     if (broadcastMessage.content) {
         NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject];
         AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]];
+        NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]];
+        if(![partitionId isEqualToString:self.userInfo.partitionId]){
+            return;
+        }
         if (attachment.first == CustomMessageType_RoomBoom) {
             [self receiveNIMResponse:attachment];
         }

YuMi/Modules/YMRoom/Features/Boom/RoomBoomResultView.m

@@ -41,7 +41,7 @@
 
 - (void)setModel:(BoomGiftModel *)model {
     _model = model;
-    self.giftPic.imageUrl = model.awardPic;
+    self.giftPic.imageUrl = [model.awardPic stringByRemovingPercentEncoding];
 }
 
 - (UIImageView *)bgView {
@@ -111,6 +111,7 @@
     if (!attachment ||
         ![attachment.data isKindOfClass:[NSArray class]] ||
         [attachment.data count] == 0) {
+        [[RoomBoomManager sharedManager] giftDisplayEnd];
         return;
     }
 
@@ -224,6 +225,7 @@
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     RoomBoomResultCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"GiftCell" forIndexPath:indexPath];
+    cell.model = [self.dataSource xpSafeObjectAtIndex:indexPath.row];
     return cell;
 }
 

YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPRoomActivityContainerView : UIView<RoomGuestDelegate>
 @property(nonatomic,copy)OpenRedPacketHandle openRedPacketHandle;
+@property (nonatomic, copy) void(^showSendGiftView)(void);
 @property(nonatomic,strong) NSMutableArray *redPacketList;
 @property(nonatomic,strong) NSMutableArray<ActivityInfoModel *> *playList;
 @property(nonatomic,strong) NSMutableArray<LittleGameInfoModel *> *littleGameList;

YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m

@@ -643,6 +643,14 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView;
     BoomInfoViewController *vc = [[BoomInfoViewController alloc] init];
     vc.modalPresentationStyle = UIModalPresentationOverFullScreen;
     [self.hostDelegate.getCurrentNav presentViewController:vc animated:YES completion:nil];
+
+    @kWeakify(self);
+    [vc setShowGiftPanel:^{
+        @kStrongify(self);
+        if (self.showSendGiftView) {
+            self.showSendGiftView();
+        }
+    }];
 }
 
 - (void)didTapConfigEntranceButton {

YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m

@@ -463,6 +463,7 @@ HWDMP4PlayDelegate>
 }
 
 - (void)playLuckyWinningBanner:(AttachmentModel *)nextAttachment {
+//    [self receiveRoomGeneralFloatingScreen]
     RoomInfoModel *roomInfo = self.delegate.getRoomInfo;
     // 执行 display 方法
     @kWeakify(self);

YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m

@@ -51,6 +51,7 @@
 	
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.mas_equalTo(self.playButton.mas_trailing).offset(5);
+        make.trailing.mas_equalTo(self.settingButton.mas_leading).offset(-5);
 		make.centerY.mas_equalTo(self.playButton);
 	}];
 	

YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m

@@ -70,11 +70,11 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey;
 	self.playView.isPlaying = self.isPlaying;
 	
 	NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
-	NSInteger musicVolum  = [defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey];
+    NSInteger musicVolum  = [defaults integerForKey:kRoomBackMusicAudioMixingVolumeKey];
 	musicVolum = musicVolum > 0 ? musicVolum : 50;
 	self.voiceSettingView.musicVolum = musicVolum;
 	
-	NSInteger captureVolum  = [defaults integerForKey:kRoomBackMusicCaptureVolumeKey];
+	NSInteger captureVolum  = [[RtcManager instance] loadUserSound]; //[defaults integerForKey:kRoomBackMusicCaptureVolumeKey];
 	captureVolum = captureVolum > 0 ? captureVolum : 50;
 	self.voiceSettingView.captureVolum = captureVolum;
 }
@@ -87,15 +87,16 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey;
 }
 
 - (void)initSubViewConstraints {
+    [self.playView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(55);
+        make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight );
+        make.leading.trailing.mas_equalTo(self.view);
+    }];
+
 	[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.leading.top.trailing.mas_equalTo(self.view);
 		make.bottom.mas_equalTo(self.playView.mas_top);
 	}];
-	
-	[self.playView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.height.mas_equalTo(55);
-		make.bottom.leading.trailing.mas_equalTo(self.view);
-	}];
 
 	[self.voiceSettingView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.bottom.mas_equalTo(self.playView.mas_top);

YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.h

@@ -13,7 +13,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XPRoomMenuContainerView : UIView<RoomGuestDelegate>
+
 @property (nonatomic,strong) XPFreeGiftModel *freeModel;
+@property (nonatomic, copy) void(^updateHeight)(CGFloat height);
+
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate;
 -(void)showInputView:(NSString *)text;
 - (void)menuResignFirstResponder;

YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m

@@ -36,12 +36,17 @@
 #import "MSRoomMenuGameVC.h"
 #import "SVGA.h"
 
+UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey;
+
 @interface XPRoomMenuContainerView ()<XPRoomMessageBubbleViewDelegate>
 
 ///输入框
 @property (nonatomic,strong) UIButton *inputButton;
 ///麦
 @property (nonatomic,strong) UIButton *micButton;
+@property (nonatomic,strong) UIButton *micButton_open;
+@property (nonatomic,strong) UIButton *micButton_close_all;
+@property (nonatomic,strong) UIButton *micButton_close_butMusic;
 ///声音
 @property (nonatomic,strong) UIButton *voiceButton;
 ///表情
@@ -68,6 +73,10 @@
 
 @property (nonatomic, strong) UIStackView *stackView;
 
+@property (nonatomic, assign) NSInteger defaultVoiceVolume;
+
+@property (nonatomic, assign) BOOL isDisplayMicStatusControl;
+
 @end
 
 
@@ -76,6 +85,9 @@
 - (instancetype)initWithDelegate:(id<RoomHostDelegate>)delegate {
     self = [super init];
     if (self) {
+        self.clipsToBounds = NO;
+        self.defaultVoiceVolume = [[RtcManager instance] loadUserSound] > 0 ? [[RtcManager instance] loadUserSound] : 50;
+
         self.delegate = delegate;
         [self initSubViews];
         [self initSubViewConstraints];
@@ -109,15 +121,7 @@
             break;
             
         case XPRoomMenuItemType_Mic: {
-            [RtcManager instance].localMuted = !self.micButton.isSelected;
+            [self showMicControlMenu];
-            if([RtcManager instance].localMuted == NO){
-                for (MicroQueueModel *sequence in [self.delegate getMicroQueue].allValues) {
-                    if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) {
-                        [[RtcManager instance] broadcast:YES];
-                    }
-                }
-            }
-            self.micButton.selected = [RtcManager instance].isLocalMuted;
         }
             break;
             
@@ -219,6 +223,111 @@
     }
 }
 
+- (void)showMicControlMenu {
+    if (self.isDisplayMicStatusControl) {
+        [self hideMicControlMenu];
+        return;
+    } else {
+        self.isDisplayMicStatusControl = YES;
+    }
+    self.defaultVoiceVolume = [[RtcManager instance] loadUserSound] > 0 ? [[RtcManager instance] loadUserSound] : 50;
+
+    if (self.updateHeight) {
+        self.updateHeight(180);
+    }
+    @kWeakify(self);
+    [self _micControlButton:self.micButton_open isShow:YES complete:^{
+        @kStrongify(self);
+        @kWeakify(self);
+        [self _micControlButton:self.micButton_close_all isShow:YES complete:^{
+            @kStrongify(self);
+            [self _micControlButton:self.micButton_close_butMusic isShow:YES complete:nil];
+        }];
+    }];
+}
+
+- (void)hideMicControlMenu {
+    self.isDisplayMicStatusControl = NO;
+
+    if (self.updateHeight) {
+        self.updateHeight(52);
+    }
+    @kWeakify(self);
+    [self _micControlButton:self.micButton_close_butMusic isShow:NO complete:^{
+        @kStrongify(self);
+        @kWeakify(self);
+        [self _micControlButton:self.micButton_close_all isShow:NO complete:^{
+            @kStrongify(self);
+            [self _micControlButton:self.micButton_open isShow:NO complete:nil];
+        }];
+    }];
+}
+
+- (void)_micControlButton:(UIButton *)button
+                   isShow:(BOOL)isShow
+                 complete:(void(^)(void))complete {
+    [UIView animateWithDuration:0.1 animations:^{
+        button.alpha = isShow ? 1 : 0;
+    } completion:^(BOOL finished) {
+        if (complete) {
+            complete();
+        }
+    }];
+}
+
+- (void)handleMicControl:(UIButton *)sender {
+    switch (sender.tag) {
+        case 1: {
+            [RtcManager instance].localMuted = NO;
+            [[RtcManager instance] updateUserSound:(int)self.defaultVoiceVolume];
+            for (MicroQueueModel *sequence in [self.delegate getMicroQueue].allValues) {
+                if ([AccountInfoStorage instance].getUid.integerValue == sequence.userInfo.uid) {
+                    [[RtcManager instance] broadcast:YES];
+                }
+            }
+        }
+            break;
+        case 2: {
+            [RtcManager instance].localMuted = YES;
+        }
+            break;
+        case 3: {
+//            self.defaultVoiceVolume = [[RtcManager instance] loadUserSound];
+            [RtcManager instance].localMuted = NO;
+            [[RtcManager instance] updateUserSound:0];
+//            [[NSUserDefaults standardUserDefaults] setInteger:0 forKey:kRoomBackMusicCaptureVolumeKey];
+//            [[NSUserDefaults standardUserDefaults] synchronize];
+        }
+            break;
+
+        default:
+            break;
+    }
+
+    [self micButtonUpdate:sender.tag];
+    [self hideMicControlMenu];
+}
+
+- (void)micButtonUpdate:(NSInteger)type {
+    switch (type) {
+        case 1:
+            // 开麦
+            [self.micButton setImage:kImage(@"room_menu_mic_open") forState:UIControlStateNormal];
+            break;
+        case 2:
+            // 闭麦
+            [self.micButton setImage:kImage(@"room_menu_mic_close") forState:UIControlStateNormal];
+            break;
+        case 3:
+            // 人声降为 0
+            [self.micButton setImage:kImage(@"room_menu_mic_close_but_music") forState:UIControlStateNormal];
+            break;
+
+        default:
+            break;
+    }
+}
+
 #pragma mark - notification
 - (void)showGiftView:(NSNotification *)noti {
     NSDictionary *dict = noti.object;
@@ -233,13 +342,28 @@
 }
 
 #pragma mark - Private Method
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
+    // 允许 subButton 响应点击事件
+    UIView *hitView = [super hitTest:point withEvent:event];
+
+    if (hitView == self) {
+        // 如果点击的是 parentView 的空白区域，返回 nil，允许事件透传到下层
+        return nil;
+    }
+
+    // 否则返回点击的子视图（如 subButton）
+    return hitView;
+}
+
 - (void)initSubViews {
+    [self setExclusiveTouch:YES];
+
     [self addSubview:self.stackView];
     [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self);
+        make.bottom.mas_equalTo(self).offset(-kSafeAreaBottomHeight);
         make.leading.mas_equalTo(self).offset(15);
         make.trailing.mas_equalTo(self).offset(-15);
-        make.height.mas_equalTo(46);
+        make.top.mas_equalTo(self);
     }];
 
     [self.stackView addArrangedSubview:self.inputButton];
@@ -251,6 +375,29 @@
     [self.stackView addArrangedSubview:self.giftButton];
 
     [self.stackView addSubview:self.faceButton];
+
+    [self.stackView addSubview:self.micButton_open];
+    [self.stackView addSubview:self.micButton_close_all];
+    [self.stackView addSubview:self.micButton_close_butMusic];
+
+
+    [self.micButton_open mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.micButton);
+        make.bottom.mas_equalTo(self.micButton.mas_top).offset(-10);
+        make.size.mas_equalTo(self.micButton);
+    }];
+
+    [self.micButton_close_all mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.micButton);
+        make.bottom.mas_equalTo(self.micButton_open.mas_top).offset(-10);
+        make.size.mas_equalTo(self.micButton);
+    }];
+
+    [self.micButton_close_butMusic mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.micButton);
+        make.bottom.mas_equalTo(self.micButton_close_all.mas_top).offset(-10);
+        make.size.mas_equalTo(self.micButton);
+    }];
 }
 
 - (void)initSubViewConstraints {
@@ -354,11 +501,14 @@
 
 #pragma mark - RoomGuestDelegate
 - (void)onMicroQueueUpdate:(NSMutableDictionary<NSString *,MicroQueueModel *> *)queue {
-    MicroQueueModel * model = [self findMySelfMicro:queue];
+    MicroQueueModel *model = [self findMySelfMicro:queue];
     if (model) {
         self.micButton.hidden = NO;
-        self.micButton.selected = model.microState.micState == MicroMicStateType_Close ? YES : [RtcManager instance].isLocalMuted;
+        if (model.microState.micState == MicroMicStateType_Close || [RtcManager instance].isLocalMuted) {
-        self.micButton.enabled = model.microState.micState == MicroMicStateType_Open;
+            [self micButtonUpdate:2];
+        } else {
+            [self micButtonUpdate:1];
+        }
         self.faceButton.hidden = NO;
     } else {
         self.micButton.hidden = YES;
@@ -537,8 +687,6 @@
     if (!_micButton) {
         _micButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_micButton setImage:[UIImage imageNamed:@"room_menu_mic_open"] forState:UIControlStateNormal];
-        [_micButton setImage:[UIImage imageNamed:@"room_menu_mic_close"] forState:UIControlStateSelected];
-        [_micButton setImage:[UIImage imageNamed:@"room_menu_mic_close"] forState:UIControlStateDisabled | UIControlStateSelected];
         _micButton.tag = XPRoomMenuItemType_Mic;
         [_micButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         _micButton.hidden = YES;
@@ -546,6 +694,39 @@
     return _micButton;
 }
 
+- (UIButton *)micButton_open {
+    if (!_micButton_open) {
+        _micButton_open = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_micButton_open setImage:[UIImage imageNamed:@"room_menu_mic_open"] forState:UIControlStateNormal];
+        _micButton_open.tag = 1;
+        [_micButton_open addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside];
+        _micButton_open.alpha = 0;
+    }
+    return _micButton_open;
+}
+
+- (UIButton *)micButton_close_all {
+    if (!_micButton_close_all) {
+        _micButton_close_all = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_micButton_close_all setImage:[UIImage imageNamed:@"room_menu_mic_close"] forState:UIControlStateNormal];
+        _micButton_close_all.tag = 2;
+        [_micButton_close_all addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside];
+        _micButton_close_all.alpha = 0;
+    }
+    return _micButton_close_all;
+}
+
+- (UIButton *)micButton_close_butMusic {
+    if (!_micButton_close_butMusic) {
+        _micButton_close_butMusic = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_micButton_close_butMusic setImage:[UIImage imageNamed:@"room_menu_mic_close_but_music"] forState:UIControlStateNormal];
+        _micButton_close_butMusic.tag = 3;
+        [_micButton_close_butMusic addTarget:self action:@selector(handleMicControl:) forControlEvents:UIControlEventTouchUpInside];
+        _micButton_close_butMusic.alpha = 0;
+    }
+    return _micButton_close_butMusic;
+}
+
 - (UIButton *)voiceButton {
     if (!_voiceButton) {
         _voiceButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -617,6 +798,7 @@
     if (!_stackView) {
         _stackView = [[UIStackView alloc] init];
         _stackView.spacing = 9;
+        _stackView.clipsToBounds = NO;
         _stackView.alignment = UIStackViewAlignmentBottom;
     }
     return _stackView;

YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPMessageInfoModel : PIBaseModel
 @property(nonatomic,assign) BOOL isChatHall;
+@property(nonatomic,assign) BOOL isBoom;
 @property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel;
 @property(nonatomic,copy) NSString *vipIcon;
 @property(nonatomic,strong) NSString *charmUrl;
@@ -38,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
 ///气泡url
 @property (nonatomic, copy) NSString *bubbleImageUrl;
 
+@property (nonatomic, copy) NSString *boomImageUrl;
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m

@@ -12,7 +12,10 @@
 #import "Api+Message.h"
 #import "AttachmentModel.h"
 #import "RoomInfoModel.h"
-@interface MsRoomMessageMainView()<XPRoomMessageContainerViewDelegate>
+#import "BoomInfoModel.h"
+#import "XPSkillCardPlayerManager.h"
+
+@interface MsRoomMessageMainView()<XPRoomMessageContainerViewDelegate, NIMBroadcastManagerDelegate>
 
 @property(nonatomic,strong) XPRoomMessageContainerView *messageListView;
 
@@ -36,9 +39,16 @@
         self.hostDelegate = delegate;
         [self installUI];
         [self installConstraints];
+
+        [[NIMSDK sharedSDK].broadcastManager addDelegate:self];
     }
     return self;
 }
+
+- (void)dealloc {
+    [[NIMSDK sharedSDK].broadcastManager removeDelegate:self];
+}
+
 -(void)installUI{
     [self addSubview:self.buttonRoom];
     [self addSubview:self.buttonChat];
@@ -48,29 +58,27 @@
 }
 -(void)installConstraints{
     [self.buttonRoom mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.top.mas_equalTo(self);
+        make.top.mas_equalTo(self);
-        make.width.mas_equalTo(100);
+        make.leading.mas_equalTo(self).offset(15);
-        make.height.mas_equalTo(40);
+        make.height.mas_equalTo(20);
     }];
 
     [self.buttonChat mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self);
-        make.leading.mas_equalTo(self.buttonRoom.mas_trailing).offset(8);
+        make.leading.mas_equalTo(self.buttonRoom.mas_trailing).offset(20);
-        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
-        make.height.mas_equalTo(40);
     }];
 
     [self.buttonGift mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self);
-        make.leading.mas_equalTo(self.buttonChat.mas_trailing).offset(8);
+        make.leading.mas_equalTo(self.buttonChat.mas_trailing).offset(20);
-        make.width.mas_equalTo(100);
+        make.height.mas_equalTo(20);
-        make.height.mas_equalTo(40);
     }];
 
     [self.selectedMark mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self).offset(40);
+        make.top.mas_equalTo(self).offset(19);
         make.centerX.mas_equalTo(self.buttonRoom);
-        make.size.mas_equalTo(CGSizeMake(10, 3));
+        make.size.mas_equalTo(CGSizeMake(9, 3));
     }];
 
     [self.messageListView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -87,7 +95,7 @@
 
     [UIView animateWithDuration:0.2 animations:^{
         [self.selectedMark mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.mas_equalTo(self).offset(40);
+            make.top.mas_equalTo(self).offset(19);
             if (sender.tag == 101) {
                 make.centerX.mas_equalTo(self.buttonRoom);
             } else if (sender.tag == 102) {
@@ -155,6 +163,19 @@
     }
 }
 
+#pragma mark -
+- (void)onReceiveBroadcastMessage:(NIMBroadcastMessage *)broadcastMessage {
+    if ([AccountInfoStorage instance].getUid.length == 0) {
+        return;
+    }
+    
+    if ([XPSkillCardPlayerManager shareInstance].roomUid != broadcastMessage.sender) {
+        return;
+    }
+
+    [self.messageListView handleBroadcastMessage:broadcastMessage];
+}
+
 #pragma mark - 懒加载
 - (NSInteger)type{
     return 0;
@@ -172,6 +193,7 @@
     if (!_buttonRoom) {
         _buttonRoom = [UIButton buttonWithType:UIButtonTypeCustom];
         _buttonRoom.tag = 101;
+        [_buttonRoom.titleLabel setFont:kFontMedium(14)];
         [_buttonRoom setTitle:YMLocalizedString(@"RoomMessageTitle_0") forState:UIControlStateNormal];
         [_buttonRoom addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -182,6 +204,7 @@
     if (!_buttonChat) {
         _buttonChat = [UIButton buttonWithType:UIButtonTypeCustom];
         _buttonChat.tag = 102;
+        [_buttonChat.titleLabel setFont:kFontMedium(14)];
         [_buttonChat setTitle:YMLocalizedString(@"RoomMessageTitle_1") forState:UIControlStateNormal];
         [_buttonChat addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -192,6 +215,7 @@
     if (!_buttonGift) {
         _buttonGift = [UIButton buttonWithType:UIButtonTypeCustom];
         _buttonGift.tag = 103;
+        [_buttonGift.titleLabel setFont:kFontMedium(14)];
         [_buttonGift setTitle:YMLocalizedString(@"RoomMessageTitle_2") forState:UIControlStateNormal];
         [_buttonGift addTarget:self action:@selector(didTapButton:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -201,7 +225,9 @@
 - (UIImageView *)selectedMark {
     if (!_selectedMark) {
         _selectedMark = [[UIImageView alloc] init];
-        _selectedMark.backgroundColor = [UIColor systemGreenColor];
+        _selectedMark.backgroundColor = UIColorFromRGB(0x04D5C6);
+        _selectedMark.layer.cornerRadius = 1;
+        _selectedMark.layer.masksToBounds = YES;
     }
     return _selectedMark;
 }

YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.h

@@ -9,13 +9,15 @@
 #import "RoomHostDelegate.h"
 NS_ASSUME_NONNULL_BEGIN
 
-@class NIMMessage, XPMessageInfoModel;
+@class NIMMessage, NIMBroadcastMessage, XPMessageInfoModel;
 
 @interface XPRoomMessageParser : NSObject
 
 - (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message;
 - (NSString *)parseMessageBubble:(NIMMessage *)message;
 
+- (XPMessageInfoModel*)parseBroadcastMessageAttribute:(NIMBroadcastMessage *)message;
+
 ///房间的代理
 @property (nonatomic,weak) id<RoomHostDelegate> hostDelegate;
 - (void)showUserCard:(NSInteger)uid;

YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m

@@ -54,6 +54,9 @@
 #import "XPTreasureFairyViewController.h"
 #import "PIGeneralPublicScreenModel.h"
 #import "QEmotionHelper.h"
+
+#import "BoomInfoModel.h"
+
 @implementation XPRoomMessageParser
 
 - (XPMessageInfoModel*)parseMessageAttributeForChatHall:(NIMMessage *)message{
@@ -79,6 +82,34 @@
     }
 }
 
+- (XPMessageInfoModel*)parseBroadcastMessageAttribute:(NIMBroadcastMessage *)message {
+    if (message.content) {
+        NSDictionary *msgDictionary = [message.content toJSONObject];
+        AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]];
+        if (attachment.first == CustomMessageType_RoomBoom) {
+            Boom632Model *model = [Boom632Model modelWithJSON:attachment.data];
+
+            XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init];
+
+
+            NSString *text = [NSString stringWithFormat:@"%@%@%@", YMLocalizedString(@"RoomMessageBoom_0"), model.nick, YMLocalizedString(@"RoomMessageBoom_1")];
+
+            NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:text];
+            [attributedString addAttribute:NSFontAttributeName value:kFontMedium(11) range:NSMakeRange(0, text.length)];
+            [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, text.length)];
+            [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xFF3B3B) range:NSMakeRange([YMLocalizedString(@"RoomMessageBoom_0") length], model.nick.length)];
+
+            messageInfo.content = attributedString;
+            messageInfo.isBoom = YES;
+            messageInfo.boomImageUrl = model.pic;
+            messageInfo.rowHeight = 80;
+            messageInfo.first = attachment.first;
+            return  messageInfo;
+        }
+    }
+    return nil;
+}
+
 - (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message {
     NIMMessageType messageType = message.messageType;
     XPMessageInfoModel * messageInfo = [[XPMessageInfoModel alloc] init];
@@ -316,7 +347,7 @@
         NSAttributedString * attribute = [self createTextAttribute:message.text color:UIColorFromRGB(0xFE5D7F) font:kRoomMessageDefalutFont];
         messageInfo.content = attribute;
     }
-    messageInfo.first = message.messageType;
+    messageInfo.first = 10;
     return  messageInfo;
 }
 
@@ -479,6 +510,7 @@
         [attribute appendAttributedString:nickAttriibute];
     }
     messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -522,6 +554,7 @@
         }
     }
     messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 - (XPMessageInfoModel *)createGuardianPlanetAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
@@ -538,6 +571,7 @@
     }];
     
     messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -557,6 +591,7 @@
     }];
     
     messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 #pragma mark - 红包
@@ -571,6 +606,7 @@
          [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser11"), info.amount] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
     }
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -587,6 +623,7 @@
 	}
 	[self attributeAddHihtLight:attribute uid:info.uid.integerValue];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -600,6 +637,7 @@
     [attribute appendAttributedString:[self createTextAttribute:info.giftName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
     [self attributeAddHihtLight:attribute uid:info.uid.integerValue];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -613,6 +651,7 @@
     NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor],NSParagraphStyleAttributeName:[self paragraphStyle]}];
     [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor]} range:[text rangeOfString:info.nick]];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -743,6 +782,7 @@
 		}
 	}
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -781,6 +821,7 @@
 		}
 	}
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -796,6 +837,7 @@
 	}
 	[attribute appendAttributedString:[self createTextAttribute:tipString color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -853,6 +895,7 @@
         [self attributeAddHihtLight:attribute uid:uid];
 		messageInfo.content = attribute;
     }
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -916,6 +959,7 @@
 		[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser76") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
 	}
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -941,6 +985,7 @@
 	
 	[self attributeAddHihtLight:attribute uid:giftInfo.uid.integerValue];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -968,6 +1013,7 @@
     }
     [self attributeAddHihtLight:attribute uid:uid];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -988,6 +1034,7 @@
 
     }
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -1019,6 +1066,7 @@
     }
     [self attributeAddHihtLight:attribute uid:uid];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
     return messageInfo;
 }
 
@@ -1047,7 +1095,7 @@
 - (XPMessageInfoModel *)createShareOrAttentionRoomAttribute:(AttachmentModel *)attachment sendInfo:(XPMessageRemoteExtModel *)sendInfo uid:(NSString *)uid messageInfo:(XPMessageInfoModel *)messageInfo{
 	NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
 	NSDictionary *data = attachment.data;
-	NSString *nick = [NSString stringWithFormat:@"%@",data[@"data"][@"nick"]];
+	NSString *nick = [NSString stringWithFormat:@"%@",data[@"nick"]];
 	[attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
 	NSString *tipString = @"";
 	if (attachment.second == Custom_Message_Sub_Room_Tip_ShareRoom) {
@@ -1058,6 +1106,7 @@
 	[attribute appendAttributedString:[self createTextAttribute:tipString color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
 	[self attributeAddHihtLight:attribute uid:uid.integerValue];
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -1154,6 +1203,7 @@
 		}
 	}
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 
@@ -1214,6 +1264,7 @@
 		[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
 	}
 	messageInfo.content = attribute;
+    messageInfo.first = attachment.first;
 	return messageInfo;
 }
 

YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.h

@@ -19,6 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface XPRoomMessageTableViewCell : UITableViewCell
+
+@property (nonatomic, assign) BOOL isLeftBigImage;
+
 ///当前房间的类型
 @property (nonatomic,assign) RoomType roomType;
 

YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m

@@ -22,6 +22,7 @@
 @property(nonatomic,strong) UIButton *clickBtn;
 ///气泡
 @property (nonatomic,strong) NetImageView *bubbleImageView;
+@property (nonatomic, strong) NetImageView *leftBigImageView;
 ///展示的内容
 @property (nonatomic,strong) XPNetImageYYLabel *contentLabel;
 ///点击空白区域的手势
@@ -48,15 +49,17 @@
 	tap.delegate = self;
 	self.tapEmptyRecognizer = tap;
 	[self.contentView addGestureRecognizer:self.tapEmptyRecognizer];
+
+    [self.contentView addSubview:self.leftBigImageView];
 }
 
 - (void)initSubViewConstraints {
- 
+
     [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(self.contentLabel).offset(-12);
+            make.leading.mas_equalTo(self.contentLabel).offset(-12);
-        make.top.mas_equalTo(self.contentLabel).offset(-10);
+            make.top.mas_equalTo(self.contentLabel).offset(-10);
-        make.bottom.mas_equalTo(self.contentLabel).offset(10);
+            make.bottom.mas_equalTo(self.contentLabel).offset(10);
-        make.trailing.mas_equalTo(self.contentLabel).offset(10);
+            make.trailing.mas_equalTo(self.contentLabel).offset(10);
     }];
 
     [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -69,6 +72,33 @@
     }];
 }
 
+- (void)setIsLeftBigImage:(BOOL)isLeftBigImage {
+    _isLeftBigImage = isLeftBigImage;
+    if (isLeftBigImage) {
+
+        [self.bubbleImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.leading.mas_equalTo(0);
+            make.top.mas_equalTo(0);
+            make.bottom.mas_equalTo(-10);
+            make.trailing.mas_equalTo(self.contentLabel).offset(10);
+        }];
+
+        [self.leftBigImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.leading.mas_equalTo(0);
+            make.centerY.mas_equalTo(self.contentView);
+            make.size.mas_equalTo(CGSizeMake(50, 50));
+        }];
+
+        [self.contentLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.leading.mas_equalTo(self.leftBigImageView.mas_trailing);
+            make.centerY.mas_equalTo(self.contentView);
+            if (isMSRTL()) {
+                make.width.mas_equalTo(20);
+            }
+        }];
+    }
+}
+
 #pragma mark - tool
 - (UIImage*)resizableImage:(UIImage *)image {
     //图片拉伸区域
@@ -103,7 +133,6 @@
 	if (_messageInfo) {
 		self.contentLabel.attributedText = _messageInfo.content;
 
-
 		if (_messageInfo.bubbleImageUrl.length) {
             @kWeakify(self);
 			[self.bubbleImageView loadImageWithUrl:_messageInfo.bubbleImageUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
@@ -112,30 +141,33 @@
                 UIImage *cutImage = [image1 cropRightAndBottomPixels:2];
 				self.bubbleImageView.image =  [self resizableImage:cutImage];
 			}];
-		} 
+		}
-//        else {
-//            _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]];
-//
-//            [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) {
-//                make.leading.mas_equalTo(12);
-//                make.bottom.mas_equalTo(-20);
-//                make.top.mas_equalTo(10);
-//                // MARK: 可能会有性能问题，但已经使用了更新 layout 的方案
-//                make.width.mas_equalTo([self RTLLabelWidth]);
-//            }];
-//
-//		}
 
-        [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+        if (self.isLeftBigImage) {
-            make.leading.mas_equalTo(self.bubbleImageView).offset(self.messageInfo.contentLeftMargin);
+            self.leftBigImageView.imageUrl = messageInfo.boomImageUrl;
-            make.top.mas_equalTo(self.bubbleImageView).offset(self.messageInfo.contentTopMargin);
+            [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.bottom.mas_equalTo(self.bubbleImageView).offset(-self.messageInfo.contentBottomMargin);
+                make.leading.mas_equalTo(self.leftBigImageView.mas_trailing);
-            if (isMSRTL()) { // MARK: 可能会有性能问题，但源代码已经使用了更新 layout 的方案，推测是头像框和气泡会导致卡顿
+                make.trailing.mas_equalTo(-self.messageInfo.contentRightMargin - 8);
-                make.width.mas_equalTo([self RTLLabelWidth]);
+//                make.centerY.mas_equalTo(self.contentView);
-            }
+                make.top.mas_equalTo(self.bubbleImageView).offset(self.messageInfo.contentTopMargin);
-        }];
+                make.bottom.mas_equalTo(self.bubbleImageView).offset(-self.messageInfo.contentBottomMargin);
+//                if (isMSRTL()) {
+//                    make.width.mas_equalTo([self RTLLabelWidth] - 65);
+//                }
+            }];
+        } else {
+            [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.leading.mas_equalTo(self.bubbleImageView).offset(self.messageInfo.contentLeftMargin);
+                make.top.mas_equalTo(self.bubbleImageView).offset(self.messageInfo.contentTopMargin);
+                make.bottom.mas_equalTo(self.bubbleImageView).offset(-self.messageInfo.contentBottomMargin);
+                if (isMSRTL()) { // MARK: 可能会有性能问题，但源代码已经使用了更新 layout 的方案，推测是头像框和气泡会导致卡顿
+                    make.width.mas_equalTo([self RTLLabelWidth]);
+                }
+            }];
+        }
 
 		_bubbleImageView.hidden =  _messageInfo.isHiddenBubble;
+//        [self layoutIfNeeded];
 	}
 }
 
@@ -182,6 +214,15 @@
 	return _bubbleImageView;
 }
 
+- (NetImageView *)leftBigImageView {
+    if (!_leftBigImageView) {
+        _leftBigImageView = [[NetImageView alloc] init];
+        _leftBigImageView.userInteractionEnabled = YES;
+        _leftBigImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _leftBigImageView;
+}
+
 - (XPNetImageYYLabel *)contentLabel {
 	if (!_contentLabel) {
 		_contentLabel = [[XPNetImageYYLabel alloc] init];

YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.h

@@ -11,7 +11,7 @@
 #import <JXCategoryView/JXCategoryListContainerView.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@class XPRoomMessageContainerView;
+@class XPRoomMessageContainerView, AttachmentModel, NIMBroadcastMessage;
 @protocol XPRoomMessageContainerViewDelegate <NSObject>
 
 - (void)xPRoomMessageContainerViewlDidTapEmpty:(XPRoomMessageContainerView *)view;
@@ -27,6 +27,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)changeType:(NSInteger)type;
 
+- (void)handleBroadcastMessageAttachment:(AttachmentModel *)attachment;
+- (void)handleBroadcastMessage:(NIMBroadcastMessage *)message;
+
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m

@@ -45,6 +45,9 @@
 #import "SDPhotoBrowser.h"
 #import "XPSkillCardPlayerManager.h"
 
+// Boom
+#import "BoomInfoModel.h"
+
 NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 
 @interface XPRoomMessageContainerView ()<UITableViewDelegate, UITableViewDataSource, XPRoomMessageTableViewCellDelegate, UIGestureRecognizerDelegate,PIRoomMessagePhotoAlbumCellDelegate,SDPhotoBrowserDelegate,PIRoomMessageUnlockPhotoAlbumViewDelegate>
@@ -67,7 +70,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 @property (nonatomic,strong) NSMutableArray<XPMessageInfoModel *> *datasource_chat;
 @property (nonatomic,strong) NSMutableArray<XPMessageInfoModel *> *datasource_gift;
 ///临时存放消息的数组
-@property (nonatomic,strong) NSMutableArray<NIMMessage *> *incomingMessages;
+@property (nonatomic,strong) NSMutableArray *incomingMessages;
 ///有多少人at我
 @property (nonatomic, assign) NSInteger atCount;
 ///@我的消息位置集合
@@ -122,7 +125,11 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
                 [self.datasource_chat addObject:model];
                 break;
             case CustomMessageType_Gift:
+            case CustomMessageType_RoomBoom:
+            case CustomMessageType_Candy_Tree:
+            case CustomMessageType_Super_Gift:
             case CustomMessageType_AllMicroSend:
+            case CustomMessageType_Treasure_Fairy:
                 [self.datasource_gift addObject:model];
                 break;
         }
@@ -329,22 +336,32 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 
 #pragma mark - 添加数据并且做自动滚动
 ///添加信息
-- (void)addRoomMessage:(NIMMessage *)message {
+- (void)addRoomMessage:(id)messageData {
     if(self.isLoadHistoryMessage == YES)return;
-	[self.incomingMessages addObject:message];
+	[self.incomingMessages addObject:messageData];
-	if (!self.isMiniEnter) {/// 最小化进房的话 不需要重新保存
+
-		if (self.hostDelegate.getRoomInfo.isCloseScreen) {
+    if ([messageData isKindOfClass:[NIMBroadcastMessage class]]) {
-			NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
+        NIMBroadcastMessage *broadcastMessage = (NIMBroadcastMessage *)messageData;
-			if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
+        [[XPRoomMiniManager shareManager] saveRoomMessage:broadcastMessage];
-				AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
+    } else if ([messageData isKindOfClass:[NIMMessage class]]) {
-				if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState){
+        NIMMessage *message = (NIMMessage *)messageData;
-					[[XPRoomMiniManager shareManager] saveRoomMessage:message];
+        if (!self.isMiniEnter) {/// 最小化进房的话 不需要重新保存
-				}
+            if (self.hostDelegate.getRoomInfo.isCloseScreen) {
-			}
+                NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
-		} else {
+                if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
-			[[XPRoomMiniManager shareManager] saveRoomMessage:message];
+                    AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
-		}
+                    if (attachment.first == CustomMessageType_Update_RoomInfo &&
-	}
+                        attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState){
+                        [[XPRoomMiniManager shareManager] saveRoomMessage:message];
+                    }
+                }
+            } else {
+                [[XPRoomMiniManager shareManager] saveRoomMessage:message];
+            }
+        }
+    }
+
+
     if (self.isPending) {
         self.messageTipsBtn.hidden = NO;
         [self findAtMeNumber];
@@ -368,10 +385,21 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 	}
 	
 	// 执行插入
-	for (NIMMessage *item in self.incomingMessages) {
+    //    for (NIMMessage *item in self.incomingMessages) {
-        XPMessageInfoModel *model = [self.messageParser parseMessageAttribute:item];
+    //        XPMessageInfoModel *model = [self.messageParser parseMessageAttribute:item];
-        [self.datasource addObject:model];
+    //        [self.datasource addObject:model];
-	}
+    //    }
+    [self.incomingMessages enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        if ([obj isKindOfClass:[NIMMessage class]]) {
+            XPMessageInfoModel *model = [self.messageParser parseMessageAttribute:(NIMMessage *)obj];
+            [self.datasource addObject:model];
+        } else if ([obj isKindOfClass:[NIMBroadcastMessage class]]) {
+            XPMessageInfoModel *model = [self.messageParser parseBroadcastMessageAttribute:(NIMBroadcastMessage *)obj];
+            if (model) {
+                [self.datasource addObject:model];
+            }
+        }
+    }];
 
     [self updateAllDataSource];
 
@@ -675,6 +703,22 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 	[self addRoomMessage:message];
 }
 
+- (void)handleBroadcastMessageAttachment:(AttachmentModel *)attachment; {
+//    if (attachment.first == CustomMessageType_RoomBoom) {
+//        Boom632Model *m = [Boom632Model modelWithJSON:attachment.data];
+//        NIMMessage * message = [[NIMMessage alloc] init];
+//        message.text = YMLocalizedString(@"XPRoomMessageContainerView5");
+//        message.localExt = @{@"isRoomTopic": @(YES)};
+//        [message setValue:@(NIMMessageTypeTip) forKey:@"messageType"];
+//        [message setValue:[NIMSession session:[NSString stringWithFormat:@"%ld", roomInfo.roomId] type:NIMSessionTypeChatroom] forKey:@"session"];
+//        [self addRoomMessage:message];
+//    }
+}
+
+- (void)handleBroadcastMessage:(NIMBroadcastMessage *)message {
+    [self addRoomMessage:message];
+}
+
 #pragma mark - RoomGuestDelegate
 - (void)handleNIMCustomAttachment:(AttachmentModel *)attachment{
     
@@ -953,9 +997,21 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 	dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
 		NSArray * temArray = [XPRoomMiniManager shareManager].getLocalCurrentRoomMessage;
 		// 执行插入
-		for (NIMMessage *item in temArray) {
+//		for (NIMMessage *item in temArray) {
-			[self.datasource addObject:[self.messageParser parseMessageAttribute:item]];
+//			[self.datasource addObject:[self.messageParser parseMessageAttribute:item]];
-		}
+//		}
+
+        [temArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ([obj isKindOfClass:[NIMMessage class]]) {
+                XPMessageInfoModel *model = [self.messageParser parseMessageAttribute:(NIMMessage *)obj];
+                [self.datasource addObject:model];
+            } else if ([obj isKindOfClass:[NIMBroadcastMessage class]]) {
+                XPMessageInfoModel *model = [self.messageParser parseBroadcastMessageAttribute:(NIMBroadcastMessage *)obj];
+                if (model) {
+                    [self.datasource addObject:model];
+                }
+            }
+        }];
 
         [self updateAllDataSource];
 
@@ -1028,6 +1084,35 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 
 
 #pragma mark - UITableViewDelegate And UITableViewDataSource
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    NSArray *source = @[];
+    switch (self.displayType) {
+        case 1:
+            source = self.datasource;
+            break;
+        case 2:
+            source = self.datasource_chat;
+            break;
+        case 3:
+            source = self.datasource_gift;
+            break;
+
+        default:
+            source = self.datasource;
+            break;
+    }
+
+    XPMessageInfoModel *model = [source xpSafeObjectAtIndex:indexPath.row];
+
+    // 如果 model 中有高度数据，使用 model 的高度
+    if (model.rowHeight > 0) {
+        return model.rowHeight;
+    }
+
+    // 否则，使用自适应高度
+    return UITableViewAutomaticDimension;
+}
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     switch (self.displayType) {
         case 1:
@@ -1063,20 +1148,48 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
             source = self.datasource;
             break;
     }
-
     XPMessageInfoModel *model = [source xpSafeObjectAtIndex:indexPath.row];
+    NSString *cellKey = NSStringFromClass([XPRoomMessageTableViewCell class]);
     if(model.first == CustomMessageType_Room_Album){
         PIRoomMessagePhotoAlbumCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PIRoomMessagePhotoAlbumCell class])];
         cell.delegate = self;
         cell.messageInfo = model;
         cell.roomType = self.hostDelegate.getRoomInfo.type;
         return cell;
-    } else {
+    }
-        XPRoomMessageTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPRoomMessageTableViewCell class])];
+    else if (model.isBoom) {
-        cell.delegate = self;
+        cellKey = @"XPRoomMessageTableViewCell_Boom";
-        cell.messageInfo = model;
+    }
-        cell.roomType = self.hostDelegate.getRoomInfo.type;
+
-        return cell;
+    XPRoomMessageTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:cellKey];
+    cell.delegate = self;
+    cell.isLeftBigImage = model.isBoom;
+    cell.messageInfo = model;
+    cell.roomType = self.hostDelegate.getRoomInfo.type;
+
+    return cell;
+}
+
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
+    NSArray *source = @[];
+    switch (self.displayType) {
+        case 1:
+            source = self.datasource;
+            break;
+        case 2:
+            source = self.datasource_chat;
+            break;
+        case 3:
+            source = self.datasource_gift;
+            break;
+
+        default:
+            source = self.datasource;
+            break;
+    }
+    XPMessageInfoModel *model = [source xpSafeObjectAtIndex:indexPath.row];
+    if (model.rowHeight == 0) {
+        model.rowHeight = CGRectGetHeight(cell.frame);
     }
 }
 
@@ -1188,6 +1301,8 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 		_messageTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
 		_messageTableView.delegate = self;
 		_messageTableView.dataSource = self;
+        _messageTableView.rowHeight = UITableViewAutomaticDimension;
+        _messageTableView.estimatedRowHeight = 44; // 预估高度
 		_messageTableView.tableFooterView = [UIView new];
 		_messageTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
 		_messageTableView.backgroundColor = [UIColor clearColor];
@@ -1196,6 +1311,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 		if (@available(iOS 11.0, *)) {
 			_messageTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 		}
+        [_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:@"XPRoomMessageTableViewCell_Boom"];
 		[_messageTableView registerClass:[XPRoomMessageTableViewCell class] forCellReuseIdentifier:NSStringFromClass([XPRoomMessageTableViewCell class])];
         [_messageTableView registerClass:[PIRoomMessagePhotoAlbumCell class] forCellReuseIdentifier:NSStringFromClass([PIRoomMessagePhotoAlbumCell class])];
         
@@ -1261,7 +1377,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
     return _datasource_gift;
 }
 
-- (NSMutableArray<NIMMessage *> *)incomingMessages {
+- (NSMutableArray *)incomingMessages {
 	if (!_incomingMessages) {
 		_incomingMessages = [NSMutableArray array];
 	}

YuMi/Modules/YMRoom/View/XPRoomMiniManager.h

@@ -23,8 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)configUserInfo:(UserInfoModel * _Nullable)userInfo;
 ///保存一下 房间的公屏防止最小化出去之后 被清空了
-- (void)saveRoomMessage:(NIMMessage *)message;
+///MARK: 原类型是 NIMMessage, 改为 id 兼容 NIMBroadcastMessage
-- (NSArray<NIMMessage *> *)getLocalCurrentRoomMessage;
+- (void)saveRoomMessage:(id)message;
+- (NSArray *)getLocalCurrentRoomMessage;
 - (void)resetLocalMessage;
 
 ///获取当前播放的歌曲

YuMi/Modules/YMRoom/View/XPRoomMiniManager.m

@@ -64,7 +64,7 @@
 }
 
 ///保存一下 房间的公屏防止最小化出去之后 被清空了
-- (void)saveRoomMessage:(NIMMessage *)message {
+- (void)saveRoomMessage:(id)message {
 	[self.messageArray addObject:message];
 	if (self.messageArray.count > kRoomMessageMaxLength) {
 		NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, kRoomMessageMaxLength/2)];
@@ -72,7 +72,7 @@
 		[self.messageArray removeObjectsInArray:needRemoveMsgArray];
 	}
 }
-- (NSArray<NIMMessage *> *)getLocalCurrentRoomMessage {
+- (NSArray *)getLocalCurrentRoomMessage {
 	return [self.messageArray copy];
 }
 

YuMi/Modules/YMRoom/View/XPRoomViewController.m

@@ -22,6 +22,7 @@
 #import "StatisticsServiceHelper.h"
 #import "NSArray+Safe.h"
 #import "NSMutableDictionary+Saft.h"
+#import "XPSkillCardPlayerManager.h"
 #import "XCCurrentVCStackManager.h"
 #import "CountDownHelper.h"
 ///Model
@@ -89,6 +90,8 @@
 #import "RoomBoomExplosionView.h"
 #import "RoomBoomResultView.h"
 
+#import "XPSendGiftView.h"
+
 UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
 UIKIT_EXTERN NSString * const kRoomMiniNotificationKey;
 UIKIT_EXTERN NSString * kNewUserRechargeKey;
@@ -288,6 +291,15 @@ XPCandyTreeInsufficientBalanceViewDelegate>
 
     [[RoomBoomManager sharedManager] leaveRoom];
 
+    [XPSkillCardPlayerManager shareInstance].photoIdList = nil;
+    [XPSkillCardPlayerManager shareInstance].isInRoomVC = NO;
+    [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = NO;
+    [XPSkillCardPlayerManager shareInstance].isInRoom = NO;
+    [XPSkillCardPlayerManager shareInstance].roomUid = @"";
+    if([[XPRoomMiniManager shareManager] getRoomInfo]==nil){
+        [XPSkillCardPlayerManager shareInstance].isMineInMic = NO;
+    }
+
     [[CountDownHelper shareHelper] stopCountDown];
     [CountDownHelper shareHelper].delegate = nil;
     [[NIMSDK sharedSDK].chatroomManager removeDelegate:self];
@@ -330,11 +342,13 @@ XPCandyTreeInsufficientBalanceViewDelegate>
     ///获取房间超管列表
     [self.presenter getRoomSuperAdmin:self.roomUid];
 
+    [XPSkillCardPlayerManager shareInstance].isInRoom = YES;
+
     [self startCheckOnlineCountTimer];
 
     [CountDownHelper shareHelper].delegate = self;
 
-    [self setupFroBoom];
+    [self setupForBoom];
 
 
 //#if DEBUG
@@ -344,11 +358,67 @@ XPCandyTreeInsufficientBalanceViewDelegate>
 //    [b addTarget:self action:@selector(test) forControlEvents:UIControlEventTouchUpInside];
 //#endif
 }
-//- (void)test {
+- (void)test {
-//
+    // 创建 UITextView
-//}
+    UITextView *textView = [[UITextView alloc] initWithFrame:CGRectMake(20, 100, 300, 100)];
+    textView.editable = NO;
+    textView.backgroundColor = [UIColor clearColor]; // 设置背景为透明
 
-- (void)setupFroBoom {
+    // 创建 NSMutableAttributedString
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
+
+    // 创建 NSTextAttachment 并添加图片
+    NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
+    attachment.image = [UIImage imageNamed:@"room_boom_progress_avatar"]; // 替换成你的图片名字
+
+    // 调整图片的 bounds 以让图片和文字在视觉上居中对齐
+    CGFloat imageOffsetY = -5.0; // 调整这个值来垂直对齐文本和图片
+    attachment.bounds = CGRectMake(0, imageOffsetY, 40, 40); // 设定图片的大小
+
+    // 创建图片的 attributed string
+    NSAttributedString *imageString = [NSAttributedString attributedStringWithAttachment:attachment];
+
+    // 添加图片到 attributed string
+    [attributedString appendAttributedString:imageString];
+
+    // 创建文本
+    NSString *text1 = @" 恭喜！";
+    NSString *text2 = @" 八六八八八本";
+    NSString *text3 = @" 触发超级大奖BOOM，所有在房用户将获得奖励！";
+
+    // 创建段落样式以调整文本与图片的对齐
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    paragraphStyle.alignment = NSTextAlignmentLeft; // 左对齐
+    paragraphStyle.lineSpacing = 5.0; // 行间距
+    paragraphStyle.paragraphSpacing = 10.0; // 段落间距
+
+    // 创建文本的 attributed string 并设置段落样式
+    NSDictionary *attributes1 = @{NSFontAttributeName: [UIFont systemFontOfSize:17],
+                                  NSParagraphStyleAttributeName: paragraphStyle};
+
+    NSAttributedString *attributedText1 = [[NSAttributedString alloc] initWithString:text1 attributes:attributes1];
+    [attributedString appendAttributedString:attributedText1];
+
+    // 设置红色字体
+    NSDictionary *attributes2 = @{NSFontAttributeName: [UIFont boldSystemFontOfSize:17],
+                                  NSForegroundColorAttributeName: [UIColor redColor],
+                                  NSParagraphStyleAttributeName: paragraphStyle};
+
+    NSAttributedString *attributedText2 = [[NSAttributedString alloc] initWithString:text2 attributes:attributes2];
+    [attributedString appendAttributedString:attributedText2];
+
+    // 设置默认字体
+    NSAttributedString *attributedText3 = [[NSAttributedString alloc] initWithString:text3 attributes:attributes1];
+    [attributedString appendAttributedString:attributedText3];
+
+    // 将 attributedString 设置为 UITextView 的内容
+    textView.attributedText = attributedString;
+
+    // 添加 UITextView 到视图
+    [self.view addSubview:textView];
+}
+
+- (void)setupForBoom {
     @kWeakify(self);
     [[RoomBoomManager sharedManager] registerBoomExplosion:^(id  _Nonnull sth) {
         @kStrongify(self);
@@ -478,11 +548,13 @@ XPCandyTreeInsufficientBalanceViewDelegate>
 - (void)viewDidDisappear:(BOOL)animated{
     [super viewDidDisappear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    [XPSkillCardPlayerManager shareInstance].isInRoomVC = NO;
 }
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     self.freeView.hidden = NO;
     self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    [XPSkillCardPlayerManager shareInstance].isInRoomVC = YES;
 }
 
 #pragma mark - Private Method
@@ -552,7 +624,8 @@ XPCandyTreeInsufficientBalanceViewDelegate>
         quickMsgHeight = 30;
     }
     [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.mas_equalTo(self.menuContainerView.mas_top);
+        make.bottom.mas_equalTo(self.view).offset(- 52 - kSafeAreaBottomHeight);
+//        make.bottom.mas_equalTo(self.menuContainerView.mas_top);
         make.height.mas_equalTo(0);
         make.leading.trailing.mas_equalTo(self.view);
     }];
@@ -648,6 +721,60 @@ XPCandyTreeInsufficientBalanceViewDelegate>
         [self.view addSubview:view];
         [self.view bringSubviewToFront:view];
     };
+
+    self.activityContainerView.showSendGiftView = ^{
+        @kStrongify(self);
+        NSString * roomUid = [NSString stringWithFormat:@"%ld", [self getRoomInfo].uid];
+        XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid];
+        giftView.delegate = self;
+        NSArray * giftUses = [self configGiftUsers:[self getMicroQueue]];
+        [giftView configGiftUsers:giftUses];
+        [self.getCurrentNav presentViewController:giftView animated:YES completion:nil];
+    };
+}
+
+- (NSArray<XPGiftUserInfoModel *> *)configGiftUsers:(NSMutableDictionary<NSString *,MicroQueueModel *> *)queue {
+    NSMutableArray * array = [NSMutableArray array];
+    for (MicroQueueModel * microModel in queue.allValues) {
+        if (microModel.userInfo && microModel.userInfo.uid >0) {
+            UserInfoModel * userInfo = microModel.userInfo;
+            XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init];
+            userModel.avatar = userInfo.avatar;
+            userModel.vipMic = userInfo.vipMic;
+            userModel.position = [NSString stringWithFormat:@"%d",  microModel.microState.position];
+            userModel.uid = userInfo.uid;
+            if (self.getRoomInfo.type == RoomType_Anchor && microModel.microState.position == -1) {///个播房一直为离开模式，不需要添加房主位
+                continue;
+            }
+            [array addObject:userModel];
+        }
+    }
+
+    if (self.getRoomInfo.leaveMode) {
+        RoomInfoModel * roomInfo= self.getRoomInfo;
+        XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init];
+        userModel.avatar = roomInfo.avatar;
+        userModel.position = @"-1";
+        userModel.uid = roomInfo.uid;
+        [array addObject:userModel];
+    } else if (self.getRoomInfo.type == RoomType_Anchor) {
+        RoomInfoModel * roomInfo= self.getRoomInfo;
+        BOOL hadContainerOwner = NO;
+        for (UserInfoModel *userModel in array) {
+            if (userModel.uid == roomInfo.uid) {
+                hadContainerOwner = YES;
+                break;
+            }
+        }
+        if (!hadContainerOwner) {
+            XPGiftUserInfoModel * userModel = [[XPGiftUserInfoModel alloc] init];
+            userModel.avatar = roomInfo.avatar;
+            userModel.position = @"-1";
+            userModel.uid = roomInfo.uid;
+            [array addObject:userModel];
+        }
+    }
+    return array;
 }
 
 - (void)exitOldRoom {
@@ -1272,6 +1399,8 @@ XPCandyTreeInsufficientBalanceViewDelegate>
 - (void)initEnterRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo {
     [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view];
 
+    [XPSkillCardPlayerManager shareInstance].roomUid = @(roomInfo.uid).stringValue;
+
     userInfo.fromUid = self.fromUid;
     userInfo.fromType = self.fromType;
     userInfo.fromNick = self.fromNick;
@@ -1815,6 +1944,11 @@ XPCandyTreeInsufficientBalanceViewDelegate>
             [self.menuContainerView handleNIMNotificationMessage:message];
             [self.functionView handleNIMNotificationMessage:message];
             [self.littleGameView handleNIMNotificationMessage:message];
+            if([self.stageView findMicroViewByUid:@(self.userInfo.uid).stringValue] != nil){
+                [XPSkillCardPlayerManager shareInstance].isMineInMic = YES;
+            }else{
+                [XPSkillCardPlayerManager shareInstance].isMineInMic = NO;
+            };
         } else if (message.messageType == NIMMessageTypeCustom) {
             NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
             if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
@@ -2527,6 +2661,14 @@ XPCandyTreeInsufficientBalanceViewDelegate>
 - (XPRoomMenuContainerView *)menuContainerView {
     if (!_menuContainerView) {
         _menuContainerView = [[XPRoomMenuContainerView alloc] initWithDelegate:self];
+        @kWeakify(self);
+        [_menuContainerView setUpdateHeight:^(CGFloat height) {
+            @kStrongify(self);
+            [self.menuContainerView mas_updateConstraints:^(MASConstraintMaker *make) {
+//                make.leading.trailing.bottom.mas_equalTo(self.view);
+                make.height.mas_equalTo(height + kSafeAreaBottomHeight);
+            }];
+        }];
     }
     return _menuContainerView;
 }

YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m

@@ -249,7 +249,7 @@
   
     PIUniversalBannerModel *model = [PIUniversalBannerModel modelWithDictionary:attacment.data];
     BOOL isSvga = [model.resourceType isEqualToString:@"SVGA"];
-   __block PIUniversalBannerView *bannerView;
+    __block PIUniversalBannerView *bannerView;
     @kWeakify(self);
     if (isSvga == YES) {
         SVGAParser *parser = [SVGAParser new];

YuMi/Modules/YMTabbar/View/TabbarViewController.m

@@ -183,7 +183,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
 
 
     [[RoomBoomManager sharedManager] registerBoomBanner:^(id  _Nonnull sth) {
-//        @kStrongify(self);
         dispatch_async(dispatch_get_main_queue(), ^{
             [RoomBoomBannerAnimation display:[UIApplication sharedApplication].keyWindow with:sth tapToRoom:YES complete:^{
 
@@ -314,6 +313,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
         return;
     }
     self.userInfo = userInfo;
+    [[RoomBoomManager sharedManager] saveUserInfo:userInfo];
     [self getRoomGameInfo];
     [AccountInfoStorage instance].name = self.userInfo.nick;
     
@@ -673,11 +673,12 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
             if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
             [self.roomAnimation receiveAnchorHourRank:attachment];
         }else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Noble_LevelUp_Suspend) {///VIP升级全服飘屏
-            if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
+//            if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
-            [self.roomAnimation receiveNobleLevelUp:attachment];
+//            [self.roomAnimation receiveNobleLevelUp:attachment];
         }else if (attachment.first == CustomMessageType_General_Floating_Screen && attachment.second == Custom_Message_Sub_General_Floating_Screen_All_Room){
-            if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return;
+            if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES) {
-            [self.roomAnimation receiveRoomGeneralFloatingScreen:attachment];
+                [self.roomAnimation receiveRoomGeneralFloatingScreen:attachment];
+            }
         }
     }
 }

YuMi/Network/MSParamsDecode.m

@@ -20,7 +20,6 @@
 
 + (NSString *)msSign:(NSMutableDictionary *)dic  {
     [dic removeObjectForKey:@"Accept-Language"];
-    [dic removeObjectForKey:@"ticket"];
     [dic removeObjectForKey:@"pub_uid"];
     [dic removeObjectForKey:@"appVersion"];
     [dic removeObjectForKey:@"appVersionCode"];

YuMi/ar.lproj/Localizable.strings

@@ -135,7 +135,7 @@
 
 "MvpViewController5" = "المصادقة بالاسم الحقيقي";
 "MvpViewController6" = "لقد تم حظرك";
-"MvpViewController7" = "تم حظر حسابك بسبب %@\nوقت فتح الحظر: %@";
+"MvpViewController7" = "%@\nوقت فتح الحظر: %@";
 
 "XPRoomInsidekfjdskfjks" = "يتم بذل الجهود للعثور على غرفة مناسبة ~";
 
@@ -2958,7 +2958,7 @@ ineHeadView12" = "الحمل";
 
 "MvpViewController5" = "التحقق من الهوية";
 "MvpViewController6" = "تم حظر حسابك";
-"MvpViewController7" = "تم حظر حسابك بسبب %@\nوقت فك الحظر: %@";
+"MvpViewController7" = "%@\nوقت فتح الحظر: %@";
 
 "XPRoomInsidekfjdskfjks" = "جاري البحث عن غرفة مناسبة ~";
 
@@ -3939,6 +3939,8 @@ ineHeadView12" = "الحمل";
 "RoomBoom_5" = "房間暱稱：";
 "RoomBoom_6" = "Reset time: 0:00 (GMT+3) daily";
 
-"RoomMessageTitle_0" = "房間";
+"RoomMessageTitle_0" = "الكل";
-"RoomMessageTitle_1" = "聊天";
+"RoomMessageTitle_1" = "رسالة خاصة";
-"RoomMessageTitle_2" = "禮物";
+"RoomMessageTitle_2" = "إرسال";
+"RoomMessageBoom_0" = "تهانينا! ";
+"RoomMessageBoom_1" = " إطلاق الجائزة الكبرى السوبر بووم، ستتم مكافأة جميع المستخدمين في الغرفة!";

YuMi/en.lproj/Localizable.strings

@@ -2563,7 +2563,7 @@
 
 "MvpViewController5" = "Real-name Authentication";
 "MvpViewController6" = "You have been banned";
-"MvpViewController7" = "Your account has been banned due to %@\nUnban time: %@";
+"MvpViewController7" = "%@\nUnban time: %@";
 
 "XPRoomInsidekfjdskfjks" = "Efforts are being made to find a suitable room~";
 
@@ -3735,6 +3735,8 @@
 "RoomBoom_5" = "房間暱稱：";
 "RoomBoom_6" = "Reset time: 0:00 (GMT+3) daily";
 
-"RoomMessageTitle_0" = "房間";
+"RoomMessageTitle_0" = "All";
-"RoomMessageTitle_1" = "聊天";
+"RoomMessageTitle_1" = "Chat";
-"RoomMessageTitle_2" = "禮物";
+"RoomMessageTitle_2" = "Gift";
+"RoomMessageBoom_0" = "Congratulations! ";
+"RoomMessageBoom_1" = " has triggered the super jackpot BOOM, and all users in the room will receive rewards!";

YuMi/zh-Hans.lproj/Localizable.strings

@@ -2281,7 +2281,7 @@
 
 "MvpViewController5" = "实名认证";
 "MvpViewController6" = "您被封号了";
-"MvpViewController7" = "您的账号因%@被封禁\n解封时间：%@";
+"MvpViewController7" = "%@\n解封时间：%@";
 
 "XPRoomInsidekfjdskfjks" = "努力寻找合适房间中~";
 
@@ -3399,6 +3399,9 @@
 "RoomBoom_5" = "房間暱稱：";
 "RoomBoom_6" = "Reset time: 0:00 (GMT+3) daily";
 
-"RoomMessageTitle_0" = "房間";
+"RoomMessageTitle_0" = "全部";
 "RoomMessageTitle_1" = "聊天";
 "RoomMessageTitle_2" = "禮物";
+"RoomMessageBoom_0" = "恭喜！";
+"RoomMessageBoom_1" = "触发超级大奖BOOM，所有在房用户将获得奖励！";
+

YuMi/zh-Hant.lproj/Localizable.strings

@@ -2274,7 +2274,7 @@
 
 "MvpViewController5" = "實名認證";
 "MvpViewController6" = "您被封號了";
-"MvpViewController7" = "您的賬號因%@被封禁\n解封時間：%@";
+"MvpViewController7" = "%@\n解封時間：%@";
 
 "XPRoomInsidekfjdskfjks" = "努力尋找合適房間中~";
 
@@ -3391,6 +3391,8 @@
 "RoomBoom_5" = "房間暱稱：";
 "RoomBoom_6" = "Reset time: 0:00 (GMT+3) daily";
 
-"RoomMessageTitle_0" = "房間";
+"RoomMessageTitle_0" = "全部";
 "RoomMessageTitle_1" = "聊天";
 "RoomMessageTitle_2" = "禮物";
+"RoomMessageBoom_0" = "恭喜！";
+"RoomMessageBoom_1" = "触发超级大奖BOOM，所有在房用户将获得奖励！";