音萌企业包2.1.5发版

xplan-ios.xcodeproj/project.pbxproj

@@ -11695,7 +11695,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -11950,7 +11950,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.2;
+				MARKETING_VERSION = 2.1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

xplan-ios/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,11 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

xplan-ios/Main/RTC/RtcManager.h

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

xplan-ios/Main/Room/View/MenuContainerView/XPRoomSendTextView.m

@@ -25,7 +25,7 @@
 //公屏限制最大字数
 #define MAX_STARWORDS_LENGTH 300
 
-@interface XPRoomSendTextView ()
+@interface XPRoomSendTextView ()<UITextFieldDelegate>
 ///
 @property (nonatomic,strong) UIStackView *stackView;
 ///输入框
@@ -195,7 +195,10 @@
 		self.sendButton.enabled = NO;
 	}
 }
-
+- (BOOL)textFieldShouldReturn:(UITextField *)textField{
+    [self.editTextFiled resignFirstResponder];
+    return YES;
+}
 #pragma mark - Public Method
 + (instancetype)showTextView:(UIView *)view delegate:(id<RoomHostDelegate>)delegate atUid:(NSString *)uid atNick:(NSString *)nick {
 	__block XPRoomSendTextView * textView;
@@ -263,8 +266,10 @@
 	NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}];
 		_editTextFiled.attributedPlaceholder = attribute;
 		_editTextFiled.borderStyle = UITextBorderStyleNone;
+        _editTextFiled.returnKeyType = UIReturnKeyDone;
 		_editTextFiled.textColor = [ThemeColor alertTitleColor];
 		_editTextFiled.font = [UIFont systemFontOfSize:15];
+        _editTextFiled.delegate = self;
 		[_editTextFiled setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
 		
 	}

xplan-ios/Main/Room/View/RoomHeaderView/RoomHeaderView.m

@@ -81,7 +81,7 @@
 
 ///是否已发送过收藏房间公屏消息
 @property (nonatomic, assign) BOOL hadShowCollectInScreen;
-
+@property(nonatomic,strong) UIButton *clickBnt;
 @end
 
 @implementation RoomHeaderView
@@ -141,7 +141,7 @@
 //    [self addSubview:self.backButton];
     [self addSubview:self.nickBgStackView];
 	[self addSubview:self.settingButton];
-    
+   
     [self.nickBgStackView addArrangedSubview:self.avatarImageView];
     [self.nickBgStackView addArrangedSubview:self.nickStackView];
     [self.nickBgStackView addArrangedSubview:self.collectButton];
@@ -157,7 +157,7 @@
 	[self.titleStackView addArrangedSubview:self.titleLabel];
 	[self.titleStackView addArrangedSubview:self.giftEffectImageView];
 	[self.titleStackView addArrangedSubview:self.lockRoomImageView];
-   
+    [self addSubview:self.clickBnt];
 }
 
 - (void)initSubViewConstraints {
@@ -210,6 +210,9 @@
 	[self.lockRoomImageView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.size.mas_equalTo(CGSizeMake(10,10));
 	}];
+    [self.clickBnt mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.onlineStackView);
+    }];
 }
 #pragma mark - RoomGuestDelegate
 - (void)onRoomEntered {
@@ -489,8 +492,7 @@
 		_titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
 		_titleLabel.textColor = [ThemeColor roomOwnerNickColor];
         _titleLabel.userInteractionEnabled = YES;
-        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onlineTapRecognizer)];
-        [_titleLabel addGestureRecognizer:tap];
+        
 	}
 	return _titleLabel;
 }
@@ -521,8 +523,7 @@
 		_onlineStackView.distribution = UIStackViewDistributionFill;
 		_onlineStackView.alignment = UIStackViewAlignmentCenter;
 		_onlineStackView.spacing = 2;
-		UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onlineTapRecognizer)];
-		[_onlineStackView addGestureRecognizer:tap];
+	
 	}
 	return _onlineStackView;
 }
@@ -599,5 +600,11 @@
     }
     return _spaceView;
 }
-
+- (UIButton *)clickBnt{
+    if(!_clickBnt){
+        _clickBnt = [UIButton new];
+        [_clickBnt addTarget:self action:@selector(onlineTapRecognizer) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _clickBnt;
+}
 @end

xplan-ios/Main/Room/View/RoomHostDelegate.h

@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSArray *)getRoomPKGroupTeamList;
 ///房间内PK是否正在进行
 - (BOOL)isRoomPKPlaying;
+-(BOOL)getIsMiniEnter;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Room/View/StageView/StageView.m

@@ -74,6 +74,16 @@
     if (self) {
         _hostDelegate = delegate;
         _isMiniEnter = NO;
+        [RtcManager instance].isMiniEnterk = self.hostDelegate.getIsMiniEnter;
+        RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo;
+            if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode ){
+                if ([RtcManager instance].isAnckorPk == NO){
+                    if ([RtcManager instance].isMiniEnterk == NO){
+                        [RtcManager instance].localMuted = YES;
+                    }
+                    
+                }
+        }
         NSInteger microCount = self.countOfMircoView;
         for (int i = 0; i < microCount; i++) {
             UIView* microView = [self microViewForIndex:i];
@@ -590,8 +600,19 @@
                     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) {
@@ -617,7 +638,19 @@
                 }
                 //如果是当前用户上麦，关闭自己的麦克风
                 if (sequence && sequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue && userInfo.isNoProhibitMic == NO) {
-                    [RtcManager instance].localMuted = YES;
+                    if (roomInfo.roomModeType != RoomModeType_Open_Blind){
+                        if (userInfo.isNoProhibitMic == NO){
+                            if (roomInfo.roomModeType !=  RoomModeType_Open_AcrossRoomPK_mode){
+                                if ([RtcManager instance].isMiniEnterk == NO){
+                                    [RtcManager instance].localMuted = YES;
+                                }
+                                
+                            }
+                        }
+                    }
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        [RtcManager instance].isMiniEnterk = NO;
+                       });
                 }
             }
             if(userInfo.isNoProhibitMic == YES){

xplan-ios/Main/Room/View/XPRoomViewController.m

@@ -239,9 +239,16 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
 	[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
-    
-}
 
+}
+- (void)viewDidAppear:(BOOL)animated{
+    [super viewDidAppear:animated];
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+}
+- (void)viewDidDisappear:(BOOL)animated{
+    [super viewDidDisappear:animated];
+    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+}
 #pragma mark - Private Method
 - (void)initSubViews {
 	self.view.backgroundColor = [UIColor clearColor];
@@ -255,9 +262,9 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 	[self.view addSubview:self.roomHeaderView];
 	[self.view addSubview:self.functionView];
 	[self.view addSubview:self.animationView];
-    id traget = self.navigationController.interactivePopGestureRecognizer.delegate;
-       UIPanGestureRecognizer * pan = [[UIPanGestureRecognizer alloc]initWithTarget:traget action:nil];
-       [self.view addGestureRecognizer:pan];
+//    id traget = self.navigationController.interactivePopGestureRecognizer.delegate;
+//       UIPanGestureRecognizer * pan = [[UIPanGestureRecognizer alloc]initWithTarget:traget action:nil];
+//       [self.view addGestureRecognizer:pan];
 }
 
 - (void)initSubViewConstraints {
@@ -1645,7 +1652,9 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 		self.anchorScrollView.contentOffset = CGPointMake(0, KScreenHeight);
 	}
 }
-
+-(BOOL)getIsMiniEnter{
+    return self.isMiniEnter;
+}
 #pragma mark - XPRoomSettingInputViewDelegate
 ///点击了完成
 - (void)xPRoomSettingInputView:(XPRoomSettingInputView *)view didClickConfirm:(NSString *)text type:(RoomSettingInputType)type {