更换图片logo

YuMi.xcodeproj/project.pbxproj

@@ -402,6 +402,7 @@
 		23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */; };
 		23E9EB312A85E5D100B792F2 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */; };
 		23E9EB332A85E97C00B792F2 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */; };
+		23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */; };
 		23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */; };
 		23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */; };
 		23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25642ABC3B3B0064E904 /* XPHomeGameView.m */; };
@@ -2258,6 +2259,7 @@
 		23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_new_mine_info_online.svga; sourceTree = "<group>"; };
 		23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
 		23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
+		23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_crazy_zoo.svga; sourceTree = "<group>"; };
 		23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_home_new_pk.svga; sourceTree = "<group>"; };
 		23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_game_fine_love.svga; sourceTree = "<group>"; };
 		23FF25632ABC3B3B0064E904 /* XPHomeGameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeGameView.h; sourceTree = "<group>"; };
@@ -9396,6 +9398,7 @@
 		E8A1E45C276220B100B294CA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */,
 				23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */,
 				23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
 				23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
@@ -10550,6 +10553,7 @@
 				E8729EEF2A3B34D30076D80A /* images in Resources */,
 				E80EC86728ACD84000D133C5 /* emoji_11@2x.png in Resources */,
 				E80EC88B28ACD84000D133C5 /* emoji_58@2x.png in Resources */,
+				23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */,
 				E80EC85D28ACD84000D133C5 /* emoji_06@2x.png in Resources */,
 				E80EC83428ACD84000D133C5 /* emoji_128@2x.png in Resources */,
 				E80EC81C28ACD84000D133C5 /* emoji_92@2x.png in Resources */,
@@ -12185,7 +12189,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.11;
+				MARKETING_VERSION = 20.20.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12221,7 +12225,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.11;
+				MARKETING_VERSION = 20.20.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi/Appdelegate/AppDelegate.m

@@ -126,7 +126,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         NSString *userId = userInfo[@"uid"];
         if(userId){
-            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId}];
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
             ClientConfig *config = [ClientConfig shareConfig];
             config.pushChatId = userId;
         }

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"2.6.1"
+#define PI_App_Version @"2.6.3"
 ///渠道
 #define PI_App_Source @"appstore"
 //#define PI_App_Source @"pi_tf"

YuMi/Modules/YMMessage/Model/AttachmentModel.h

@@ -96,8 +96,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Gift_Compound = 93,
 	///涂鸦礼物
 	CustomMessageType_Graffiti_Gift = 94,
-	///星级厨房飘屏
-	CustomMessageType_Graffiti_Star_Kitchen = 95,
+	
     ///免费礼物倒计时重置时间
     CustomMessageType_Free_Gift_Star_Reset_Time = 96,
     ///精灵密藏
@@ -114,6 +113,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Guardian_Planet = 102,
     ///通用公屏信息
     CustomMessageType_General_Public_Screen = 103,
+    ///疯狂动物园飘屏
+    CustomMessageType_Graffiti_Star_Kitchen = 104,
 };
 
 
@@ -547,12 +548,11 @@ typedef NS_ENUM(NSUInteger, CustomMessageGraffitiGift) {
 
 //first = CustomMessageType_Graffiti_Star_Kitchen
 typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) {
-	/// // 星级厨房礼物房间飘屏通知
-	Custom_Message_Sub_Star_Kitchen_Room = 950,
+
 	/// // 星级厨房礼物全服飘屏通知
-	Custom_Message_Sub_Star_Kitchen_Server = 951,
+	Custom_Message_Sub_Star_Kitchen_Server = 1041,
     /// // 星级厨房礼物全服飘屏通知
-    Custom_Message_Sub_Star_Kitchen_FullScreen = 952,
+    Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
 };
 ///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
 typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {

YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h

@@ -46,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 //是否为周榜top1
 @property(nonatomic,assign) BOOL isWeekTop1;
 @property(nonatomic,copy) NSString *inRoomUid;
-
 //是否在麦位
 @property(nonatomic,assign) BOOL inMic;
 ///是否在线

YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPNewHomePartyTableViewCell : UITableViewCell
 
 @property (nonatomic,strong) HomePlayRoomModel *roomInfo;
-@property (nonatomic,strong) HomeRecommendRoomModel *roomInfo1;
+
 @property(nonatomic,weak) id<XPNewHomePartyTableViewCellDelegate>delegate;
 ///声音卡时，svga是否播放动画
 -(void)setPlaySoundStatus:(BOOL)isPlay;

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

@@ -243,14 +243,7 @@
 -(void)setPlaySoundTime:(NSInteger)time{
     _audioView.voiceDura = @(time).stringValue;
 }
-- (void)setRoomInfo1:(HomeRecommendRoomModel *)roomInfo1 {
-	_roomInfo1 = roomInfo1;
-	if (_roomInfo1) {
-		
-		
-		
-	}
-}
+
 
 -(void)didSelectItemAction{
  

YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m

@@ -431,6 +431,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification;
 -(void)xPNewHomePartyTableViewCell:(XPNewHomePartyTableViewCell *_Nullable)cell didSelectChat:(HomePlayRoomModel *_Nonnull)roomModel{
     if(roomModel.inMic == YES){
         [XPRoomViewController openRoom:roomModel.inRoomUid fromNick:roomModel.nick fromType:UserEnterRoomFromType_Follow_User fromUid:roomModel.uid viewController:self];
+
         return;
     }
     

YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m

@@ -247,7 +247,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session];
             sessionVC.isAttention = !isNoAttention;
             [self.navigationController pushViewController:sessionVC animated:YES];
-            [ClientConfig shareConfig].chatId = nil;
+            if(isNoAttention == YES){
+                [ClientConfig shareConfig].pushChatId = nil;
+            }else{
+                [ClientConfig shareConfig].chatId = nil;
+            }
+           
         }
         return;
     }

YuMi/Modules/YMRTC/RtcImpl/AgoraRtcImpl.m

@@ -24,6 +24,9 @@
 - (instancetype)initWithDelegate:(id<RtcImplDelegate>)delegate {
     self = [super initWithDelegate:delegate];
     if (self) {
+        
+       
+        
         _engine = [AgoraRtcEngineKit sharedEngineWithAppId:KeyWithType(KeyType_Agora) delegate:self];
         [_engine setChannelProfile:AgoraChannelProfileLiveBroadcasting];
 //        [_engine enableLastmileTest];
@@ -102,11 +105,13 @@
 /// @param musicId TRTC自己要的
 - (BOOL)playBackMusic:(NSString *)filePath musicId:(int)musicId completion:(nonnull void (^)(NSString * _Nonnull))completion {
 	if (filePath) {
-		self.MusicCompletion = completion;
-		[self changePlayState:BackMusicPlayState_Stop];//切换歌曲need stop
-        
-//		[self.engine startAudioMixing:filePath loopback:NO replace:NO cycle:1];
-        [self.engine startAudioMixing:filePath loopback:NO cycle:1];
+		
+            self.MusicCompletion = completion;
+            [self changePlayState:BackMusicPlayState_Stop];//切换歌曲need stop
+          
+            [self.engine startAudioMixing:filePath loopback:NO cycle:1 startPos:0];
+
+		
 		return YES;
 	} else {
 		return NO;
@@ -182,12 +187,16 @@ channelMediaRelayStateDidChange:(AgoraChannelMediaRelayState)state
     [self.delegate usersSpeaking:uids];
 }
 
-- (void)rtcEngineLocalAudioMixingDidFinish:(AgoraRtcEngineKit *)engine {
-	if (self.MusicCompletion) {
-		self.MusicCompletion(self.filePath);
-	}
-	///这个用在最小化的时候  因为最小化没办法知道当前歌曲是否播放完毕了 目前没有想到其他的好的版本就用通知吧
-	[[NSNotificationCenter defaultCenter] postNotificationName:kRoomBackMusicPlayMusicFinishKey object:self.filePath];
-}
 
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine audioMixingStateChanged:(AgoraAudioMixingStateType)state reasonCode:(AgoraAudioMixingReasonCode)reasonCode{
+    if (reasonCode == 713 || reasonCode == 723){
+        if (self.MusicCompletion) {
+            self.MusicCompletion(self.filePath);
+        }
+        ///这个用在最小化的时候  因为最小化没办法知道当前歌曲是否播放完毕了 目前没有想到其他的好的版本就用通知吧
+        [[NSNotificationCenter defaultCenter] postNotificationName:kRoomBackMusicPlayMusicFinishKey object:self.filePath];
+    }
+        
+   
+}
 @end

YuMi/Modules/YMRTC/RtcManager.h

@@ -35,7 +35,8 @@ typedef NS_ENUM(NSInteger, BackMusicPlayState) {
   - ❌ 业务逻辑不要侵入 RctImpl 。
  */
 @interface RtcManager : NSObject
-
+///因为跨房pk结束后会闭麦，用这个限制不要关麦
+@property(nonatomic,assign) BOOL isAnckorPk;
 /**
  * 是否静音（静别人）
  * YES：🔇虽然你们麦位上在说话，但是我就是不听。🙉

YuMi/Modules/YMRoom/Model/RoomInfoModel.h

@@ -115,7 +115,7 @@ typedef NS_ENUM(NSInteger, RoomDatingStateChangeType)  {
 @property (nonatomic , copy) NSString              * roomPwd;
 @property (nonatomic , assign) BOOL              leaveMode;
 @property (nonatomic,  copy) NSString *backPic;
-@property (nonatomic , assign) RoomModeType              roomModeType;//房间模式
+@property (nonatomic , assign) RoomModeType  roomModeType;//房间模式
 ///房间介绍
 @property (nonatomic, copy) NSString *introduction;
 ///糖果树的配置

YuMi/Modules/YMRoom/View/AcrossRoomPK/Model/AcrossRoomPKPanelModel.m

@@ -18,10 +18,10 @@
 			 @"csRank" : [AcrossRoomPkRankModel class]
 			 };
 }
-///如果一个模型中需要字段映射的话  比如id -> ID  name -> other.name
-+ (NSDictionary *)replacedKeyFromPropertyName {
-    return @{@"aMicStatus":@"amicStatus"};
-}
+/////如果一个模型中需要字段映射的话  比如id -> ID  name -> other.name
+//+ (NSDictionary *)replacedKeyFromPropertyName {
+//    return @{@"aMicStatus":@"amicStatus"};
+//}
 @end
 
 

YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m

@@ -527,8 +527,12 @@
         } else {
             self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid];
         }
-        self.otherMicButton.selected = pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close;
-        [[RtcManager instance] muteOne:pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close userId:pkPanelInfo.aUid];
+
+            [RtcManager instance].isAnckorPk = YES;
+            self.otherMicButton.selected = pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close;
+            [[RtcManager instance] muteOne:pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close userId:pkPanelInfo.aUid];
+
+       
     } else {
         self.redCountLabel.text = @"0";
         self.blueCountLabel.text = @"0";

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

@@ -354,14 +354,6 @@
         } else if(attachment.first == CustomMessageType_Graffiti_Gift) {///涂鸦礼物
             [self receiveRoomGraffitiGift:attachment];
         } else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){///星级厨房飘屏
-            if(attachment.second == Custom_Message_Sub_Star_Kitchen_Room)return;
-            NSInteger uid = 0;
-            if(attachment.data[@"roomUid"] != nil){
-                uid = [attachment.data[@"roomUid"] integerValue];
-            }
-            if(attachment.second == Custom_Message_Sub_Star_Kitchen_Server && self.delegate.getRoomInfo.uid != uid){
-                return;
-            }
             [self receiveRoomGraffitiStarKitchen:attachment];
         }else if (attachment.first == CustomMessageType_Treasure_Fairy && (attachment.second == Custom_Message_Sub_Treasure_Fairy_Draw_Gift_L4 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L1 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L2 || attachment.second == Custom_Message_Sub_Treasure_Fairy_Convert_L3)) {  //夺宝精灵
             [self receiveTreasureFairyGiftHighLevel:attachment];
@@ -400,6 +392,8 @@
     PIBaseAnimationViewModel *roomGraffiti = [PIBaseAnimationViewModel new];
     roomGraffiti.data = attacment.data;
     roomGraffiti.type = GiftBannerType_kitchen;
+    roomGraffiti.first = attacment.first;
+    roomGraffiti.second = attacment.second;
     if(self.animationListB.count == 0 && self.isPlayOfB == NO){
         [self createStarKitchenBannerAnimation:roomGraffiti];
     }
@@ -410,7 +404,7 @@
     self.isPlayOfB = YES;
     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;
+    starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_FullScreen;
     XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
     starKitchenView.delegate = self;
     starKitchenView.starModel = starModel;

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

@@ -74,7 +74,7 @@
         self.titleView.hidden = NO;
         self.titleView.attributedText = att;
         @kWeakify(self);
-        [self.parser parseWithNamed:@"Star_kitchen" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
+        [self.parser parseWithNamed:@"pi_crazy_zoo" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
             @kStrongify(self);
             self.svgaView.loops = 1;
             self.svgaView.clearsAfterStop = NO;

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

@@ -200,10 +200,14 @@
 		NSMutableArray *artists = [[AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyArtist keySpace:AVMetadataKeySpaceCommon] mutableCopy];
 		NSArray *albumNames = [AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyArtwork keySpace:AVMetadataKeySpaceCommon];
 		NSArray *titles = [AVMetadataItem metadataItemsFromArray:mp3Asset.commonMetadata withKey:AVMetadataCommonKeyTitle keySpace:AVMetadataKeySpaceCommon];
+        NSString *randomNum = @"";
+        
 		if (artists.count > 0) {
 			AVMetadataItem *artist = [artists safeObjectAtIndex1:0];
 			singer = [artist.value copyWithZone:nil];
 		}else{
+            int64_t i = random() % 1000000000;
+            randomNum = [NSString stringWithFormat:@"%lld",i];
 			singer = YMLocalizedString(@"XPRoomTransferMusicViewController11");
 		}
 		
@@ -222,7 +226,7 @@
 		}
 		
 		NSUUID * uuid = [UIDevice currentDevice].identifierForVendor;
-		NSString * musicId = [uuid.UUIDString stringByAppendingString:songName];
+		NSString * musicId = [uuid.UUIDString stringByAppendingString:[NSString stringWithFormat:@"%@%@",songName,randomNum]];
 		self.currentMusic.author = singer;
 		self.currentMusic.musicId = musicId;
 		self.currentMusic.songName = songName;

YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m

@@ -609,6 +609,10 @@
 		[Api getAcrossRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 			if (code == 200) {
                 AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data];
+                if (data.data[@"amicStatus"] != nil){
+                    acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue];
+                }
+                
                 [self updateAnchorPkInfo:acrossPKPanelInfo];
                 if (acrossPKPanelInfo.pkType == AcrossRoomPkTypeAnchor) {
                     if (acrossPKPanelInfo.aUid.integerValue > 0) {
@@ -623,6 +627,9 @@
                     }
                 } else {
                     AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data];
+                    if (data.data[@"amicStatus"] != nil){
+                        acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue];
+                    }
                     if (acrossPKPanelInfo.aUid.integerValue > 0) {
                         if (!self.acrossPKPanelView.superview) {
                             [self addSubview:self.acrossPKPanelView];
@@ -786,6 +793,9 @@
 						}];
 					}
 					AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
+                    if (attachment.data[@"amicStatus"] != nil){
+                        acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue];
+                    }
 					self.acrossPKPanelView.pkPanelInfo = acrossPKPanelInfo;
 				}
 					break;
@@ -796,6 +806,9 @@
 					[self.acrossPKPanelView resetAcrossPKViewData];
 					[self.acrossPKPanelView removeFromSuperview];
 					AcrossRoomPKPanelModel * model = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
+                    if (attachment.data[@"amicStatus"] != nil){
+                        model.aMicStatus = [attachment.data[@"amicStatus"] intValue];
+                    }
 					if (model.isForce) {
 						XPAcrossRoomPKForceEndResultView *view = [[XPAcrossRoomPKForceEndResultView alloc] initWithFrame:CGRectMake(0, 0, 281, 208)];
 						view.data = model;
@@ -837,6 +850,9 @@
                             NIMChatroomMember * member = [members firstObject];
                             if (member.type == NIMTeamMemberTypeOwner) {
                                 AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
+                                if (attachment.data[@"amicStatus"] != nil){
+                                    acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue];
+                                }
                                 [[RtcManager instance] connectOtherRoom:acrossPKPanelInfo.aRoomId userId:acrossPKPanelInfo.aUid];
                                 [self updateAnchorPkInfo:acrossPKPanelInfo];
                             }
@@ -881,6 +897,9 @@
                         }];
                     }
                     AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
+                    if (attachment.data[@"amicStatus"] != nil){
+                        acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue];
+                    }
                     self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo;
                     [self updateAnchorPkInfo:acrossPKPanelInfo];
                 }
@@ -895,6 +914,9 @@
                         }];
                     }
                     AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:attachment.data];
+                    if (attachment.data[@"amicStatus"] != nil){
+                        acrossPKPanelInfo.aMicStatus = [attachment.data[@"amicStatus"] intValue];
+                    }
                     self.anchorPKPanelView.pkPanelInfo = acrossPKPanelInfo;
                     [self updateAnchorPkInfo:acrossPKPanelInfo];
                     if (acrossPKPanelInfo.isForce) {

YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m

@@ -104,9 +104,6 @@
 #else
 	isTestEnv = NO;
 #endif
-    if(isEnterprise == NO){
-    [[SudMGP getCfg]setBackgroundMode:NO];
-    }
 	[SudMGP initSDK:KeyWithType(KeyType_SudGameAppID) appKey:KeyWithType(KeyType_SudGameAppKey) isTestEnv:isTestEnv listener:^(int retCode, const NSString *retMsg) {
 		if (retCode == 0) {
 			if (!self.currentmgId) {

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

@@ -114,6 +114,7 @@
 	XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]];
 	messageInfo.bubbleImageUrl = [self parseMessageBubble:message];
 	int first = attachment.first;
+    int second = attachment.second;
 	if (first == CustomMessageType_Gift) {///单人送
 		return [self createSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo];
 	} else if(first == CustomMessageType_AllMicroSend) {///全麦送 多人送
@@ -154,9 +155,7 @@
 		return [self createRoomSailingAttribute:attachment messageInfo:messageInfo];
     } else if (first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_OpenRedPacketSuccess) {
         return [self createRedPacketAttribute:attachment messageInfo:messageInfo];
-    } else if (first == CustomMessageType_Graffiti_Star_Kitchen){
-		return [self createStarredKitchenAttribute:attachment messageInfo:messageInfo];
-     }else if (first == CustomMessageType_Treasure_Fairy) {
+    } else if (first == CustomMessageType_Treasure_Fairy) {
          return [self createTreasureFairyAttribute:attachment messageInfo:messageInfo];
      }else if (first == CustomMessageType_Room_Album) {
          NSDictionary *userInfo = attachment.data[@"user"];

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

@@ -382,8 +382,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 			if (self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq > prizeModel.userLevelLimit) {
 				return YES;
 			}
-		} else if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen){
-			return YES;
 		} else if(attachment.first == CustomMessageType_Room_Album){
             return YES;
         }else if(attachment.first == CustomMessageType_Gift) {

YuMi/Modules/YMRoom/View/StageView/AnchorPKStageView.m

@@ -170,6 +170,9 @@
                             [Api getAcrossRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
                                 if (code == 200) {
                                     AcrossRoomPKPanelModel * acrossPKPanelInfo = [AcrossRoomPKPanelModel modelWithJSON:data.data];
+                                    if (data.data[@"amicStatus"] != nil){
+                                        acrossPKPanelInfo.aMicStatus = [data.data[@"amicStatus"] intValue];
+                                    }
                                     if (acrossPKPanelInfo.pkType == AcrossRoomPkTypeAnchor) {
                                         self.hostDelegate.getRoomInfo.roundId = acrossPKPanelInfo.roundId;
                                         self.hostDelegate.getRoomInfo.pkUid = acrossPKPanelInfo.aUid;

YuMi/Modules/YMRoom/View/StageView/StageView.m

@@ -76,6 +76,15 @@
 	if (self) {
 		_hostDelegate = delegate;
 		_isMiniEnter = NO;
+        
+        RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
+        if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode ){
+            NSLog(@"%d",[RtcManager instance].isAnckorPk);
+            if ([RtcManager instance].isAnckorPk == NO){
+                [RtcManager instance].localMuted = YES;
+            }
+            
+        }
 		NSInteger microCount = self.countOfMircoView;
 		for (int i = 0; i < microCount; i++) {
 			UIView* microView = [self microViewForIndex:i];
@@ -277,7 +286,11 @@
 		if (self.hostDelegate.getUserInfo.uid && model.userInfo.uid == self.hostDelegate.getUserInfo.uid) {
 			selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open;
             if (model.microState.micState == MicroMicStateType_Close) {
-                [RtcManager instance].localMuted = YES;
+               
+                if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode){
+                    [RtcManager instance].localMuted = YES;
+                }
+               
             }
             if (roomInfo.type == RoomType_Anchor && [[AccountInfoStorage instance].getUid isEqualToString:[NSString stringWithFormat:@"%ld", roomInfo.uid]]) {
                 selfNeedBroadcast = YES;///个播房房主默认角色为主播
@@ -493,8 +506,21 @@
 					sequence.userInfo = nil;
 				}
 			}
-            
-			if (changeType == 1) { // 上麦
+            RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
+            if (changeType == 2){
+                if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && roomInfo.roomModeType == RoomModeType_Open_Blind){
+                    if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode  ){
+                        if ([RtcManager instance].isAnckorPk == NO){
+                            [RtcManager instance].localMuted = YES;
+                            
+                        }
+                        
+                            [RtcManager instance].isAnckorPk = NO;
+                        
+                        
+                    }
+                }
+            }else if (changeType == 1) { // 上麦
 				MicroQueueModel *sequence = [self.micQueue objectForKey:position];
 				sequence.userInfo = userInfo;
 				if (self.hostDelegate.getRoomInfo.showGiftValue && userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
@@ -523,8 +549,14 @@
 					} roomUid:roomUid micUid:uid position:position uid:uid];
 				}
                 //如果是当前用户上麦，关闭自己的麦克风
-                if (sequence && sequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && userInfo.isNoProhibitMic == NO) {
-                    [RtcManager instance].localMuted = YES;
+                if (sequence && sequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
+                    if (roomInfo.roomModeType != RoomModeType_Open_Blind){
+                        if (userInfo.isNoProhibitMic == NO){
+                            if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode){
+                                [RtcManager instance].localMuted = YES;
+                            }
+                        }
+                    }       
                 }
 			}
             if(userInfo.isNoProhibitMic == YES){

YuMi/Modules/YMRoom/View/XPRoomViewController.m

@@ -1674,9 +1674,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
         NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject];
         AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]];
         BOOL isHave = NO;
-        if(attachment.first == CustomMessageType_Graffiti_Star_Kitchen && attachment.second ==  Custom_Message_Sub_Star_Kitchen_FullScreen){
-            isHave = YES;
-        }else if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
+         if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){
             isHave = YES;
         }else if(attachment.first == CustomMessageType_Guardian_Planet && attachment.second == Custom_Message_Sub_Guardian_Planet_All_Room){
             isHave = YES;

YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m

@@ -623,6 +623,8 @@
     PIBaseAnimationViewModel *roomGraffiti = [PIBaseAnimationViewModel new];
     roomGraffiti.data = attacment.data;
     roomGraffiti.type = GiftBannerType_kitchen;
+    roomGraffiti.first = attacment.first;
+    roomGraffiti.second = attacment.second;
     if(self.animationListB.count == 0 && self.isPlayOfB == NO){
         [self createStarKitchenBannerAnimation:roomGraffiti];
     }
@@ -633,7 +635,7 @@
     self.isPlayOfB = YES;
     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;
+    starKitchenView.isSvga = attacment.second == Custom_Message_Sub_Star_Kitchen_FullScreen;
     XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attacment.data];
     starKitchenView.delegate = self;
     starKitchenView.starModel = starModel;

YuMi/zh-Hans.lproj/Localizable.strings

@@ -47,7 +47,7 @@
 ///LoginPresenter.m
 "LoginPresenter0" = "登录取消";
 "LoginPresenter1" = "登录失败，请重试";
-"XPRoomStarKitchenBannerView0"="恭喜%@在星级厨房抽中%@倍奖励，获得 %@钻石！";
+"XPRoomStarKitchenBannerView0"="恭喜%@在疯狂动物园抽中%@倍奖励，获得 %@钻石！";
 "XPRoomMessageParser1033333"="恭喜%@在星级厨房抽中 %@倍奖励，获得 %@钻石！";
 "XPRoomMessageParser1033334"="恭喜 %@ 在守护星球中成功击败怪兽，获得%@钻石奖励";
 ///XPShareView.m

YuMi/zh-Hant.lproj/Localizable.strings

@@ -47,7 +47,7 @@
 ///LoginPresenter.m
 "LoginPresenter0" = "登錄取消";
 "LoginPresenter1" = "登錄失敗，請重試";
-"XPRoomStarKitchenBannerView0"="恭喜%@在星級廚房抽中%@倍獎勵，獲得 %@鉆石！";
+"XPRoomStarKitchenBannerView0"="恭喜%@在瘋狂動物園抽中%@倍獎勵，獲得 %@鉆石！";
 "XPRoomMessageParser1033333"="恭喜%@在星級廚房抽中 %@倍獎勵，獲得 %@鉆石！";
 "XPRoomMessageParser1033334"="恭喜 %@ 在守護星球中成功擊敗怪獸，獲得%@鉆石獎勵";
 ///XPShareView.m