个播在坑位上不能上下滑动

xplan-ios.xcodeproj/project.pbxproj

@@ -618,7 +618,8 @@
 		E81E09C9290F71BF00A1F410 /* XPAdvertiseView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09C8290F71BF00A1F410 /* XPAdvertiseView.m */; };
 		E81E09CC290F732600A1F410 /* XPAdImageTool.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09CB290F732600A1F410 /* XPAdImageTool.m */; };
 		E81E09CF290F750800A1F410 /* AdvertiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81E09CE290F750800A1F410 /* AdvertiseModel.m */; };
-		E81E09D1290FCDFA00A1F410 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E81E09D0290FCDFA00A1F410 /* Launch Screen.storyboard */; };
+		E81E09D5290FEC2D00A1F410 /* lanunchscreen1.png in Resources */ = {isa = PBXBuildFile; fileRef = E81E09D4290FEC2D00A1F410 /* lanunchscreen1.png */; };
+		E81E09D7290FEC3B00A1F410 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E81E09D6290FEC3B00A1F410 /* Launch Screen.storyboard */; };
 		E81EF6DC279AB5CC00FF3EDE /* XPLittleGameRoomOpenView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81EF6DB279AB5CC00FF3EDE /* XPLittleGameRoomOpenView.m */; };
 		E81EF6E0279AB7D900FF3EDE /* XPCreateLittleGameCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81EF6DF279AB7D900FF3EDE /* XPCreateLittleGameCollectionViewCell.m */; };
 		E81EF6E4279AB92E00FF3EDE /* LittleGameInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81EF6E3279AB92E00FF3EDE /* LittleGameInfoModel.m */; };
@@ -2294,7 +2295,8 @@
 		E81E09CB290F732600A1F410 /* XPAdImageTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAdImageTool.m; sourceTree = "<group>"; };
 		E81E09CD290F750800A1F410 /* AdvertiseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdvertiseModel.h; sourceTree = "<group>"; };
 		E81E09CE290F750800A1F410 /* AdvertiseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AdvertiseModel.m; sourceTree = "<group>"; };
-		E81E09D0290FCDFA00A1F410 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
+		E81E09D4290FEC2D00A1F410 /* lanunchscreen1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lanunchscreen1.png; sourceTree = "<group>"; };
+		E81E09D6290FEC3B00A1F410 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		E81EF6DA279AB5CC00FF3EDE /* XPLittleGameRoomOpenView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLittleGameRoomOpenView.h; sourceTree = "<group>"; };
 		E81EF6DB279AB5CC00FF3EDE /* XPLittleGameRoomOpenView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLittleGameRoomOpenView.m; sourceTree = "<group>"; };
 		E81EF6DE279AB7D900FF3EDE /* XPCreateLittleGameCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCreateLittleGameCollectionViewCell.h; sourceTree = "<group>"; };
@@ -3751,7 +3753,8 @@
 				189DD56126DE45F800AB55B1 /* Main */,
 				E81C27AF26EF39B00031E639 /* AppDelegate */,
 				189DD53826DE255600AB55B1 /* Assets.xcassets */,
-				E81E09D0290FCDFA00A1F410 /* Launch Screen.storyboard */,
+				E81E09D4290FEC2D00A1F410 /* lanunchscreen1.png */,
+				E81E09D6290FEC3B00A1F410 /* Launch Screen.storyboard */,
 				189DD53D26DE255600AB55B1 /* Info.plist */,
 				189DD53E26DE255600AB55B1 /* main.m */,
 			);
@@ -9002,6 +9005,7 @@
 				9BE29A6B27D1BFF700446AB5 /* anchor_room_speak.svga in Resources */,
 				E80EC81428ACD84000D133C5 /* emoji_138@2x.png in Resources */,
 				E80EC87228ACD84000D133C5 /* emoji_111@2x.png in Resources */,
+				E81E09D5290FEC2D00A1F410 /* lanunchscreen1.png in Resources */,
 				E80EC8A728ACD84100D133C5 /* emoji_del_normal@2x.png in Resources */,
 				E80EC88628ACD84000D133C5 /* emoji_37@2x.png in Resources */,
 				E80EC86C28ACD84000D133C5 /* emoji_56@2x.png in Resources */,
@@ -9029,7 +9033,6 @@
 				E80EC88E28ACD84000D133C5 /* emoji_142@2x.png in Resources */,
 				E80EC83D28ACD84000D133C5 /* emoji_04@2x.png in Resources */,
 				E80EC81728ACD84000D133C5 /* emoji_134@2x.png in Resources */,
-				E81E09D1290FCDFA00A1F410 /* Launch Screen.storyboard in Resources */,
 				E80EC88328ACD84000D133C5 /* emoji_70@2x.png in Resources */,
 				E8E859E428264D8800EE4857 /* index.html in Resources */,
 				E80EC89528ACD84000D133C5 /* emoji_99@2x.png in Resources */,
@@ -9084,6 +9087,7 @@
 				E88863C3278E7BCC004BCFAB /* crossRoomPk_progress.svga in Resources */,
 				E8A1E462276220DA00B294CA /* candyTree_light.svga in Resources */,
 				E80EC86428ACD84000D133C5 /* emoji_60@2x.png in Resources */,
+				E81E09D7290FEC3B00A1F410 /* Launch Screen.storyboard in Resources */,
 				E80EC89928ACD84000D133C5 /* emoji_21@2x.png in Resources */,
 				E80EC8BA28ACD84100D133C5 /* emoji.plist in Resources */,
 				E80EC82328ACD84000D133C5 /* emoji_57@2x.png in Resources */,

xplan-ios/Appdelegate/AppDelegate+ThirdConfig.m

@@ -194,5 +194,4 @@ UIKIT_EXTERN NSString * adImageName;
 			break;
 	}
 }
-
 @end

xplan-ios/Assets.xcassets/app_lanunch_new.imageset/Contents.json

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

xplan-ios/Info.plist

@@ -85,7 +85,7 @@
 		<string>audio</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>Launch Screen</string>
+	<string>Launch Screen.storyboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

xplan-ios/Launch Screen.storyboard

@@ -16,26 +16,26 @@
                         <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="app_lanunch_new" translatesAutoresizingMaskIntoConstraints="NO" id="h5k-Mv-e4O">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lanunchscreen1.png" translatesAutoresizingMaskIntoConstraints="NO" id="K1G-cR-m1d">
                                 <rect key="frame" x="0.0" y="47" width="390" height="763"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="h5k-Mv-e4O" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="Sng-DL-48X"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="K1G-cR-m1d" secondAttribute="trailing" id="JFU-Tu-LLA"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="h5k-Mv-e4O" secondAttribute="trailing" id="YTB-mJ-vgY"/>
+                            <constraint firstItem="K1G-cR-m1d" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" id="VJp-K6-4M3"/>
-                            <constraint firstItem="h5k-Mv-e4O" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" id="ZpG-lP-Icg"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="K1G-cR-m1d" secondAttribute="bottom" id="YMg-ij-N5s"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="h5k-Mv-e4O" secondAttribute="bottom" id="dsW-8Z-2Zj"/>
+                            <constraint firstItem="K1G-cR-m1d" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="zGu-5T-Oqp"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="162" y="2"/>
+            <point key="canvasLocation" x="53" y="375"/>
         </scene>
     </scenes>
     <resources>
-        <image name="app_lanunch_new" width="1242" height="2208"/>
+        <image name="lanunchscreen1.png" width="2484" height="4416"/>
     </resources>
 </document>

xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.h

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 #import "NetImageView.h"
+#import "RoomHostDelegate.h"
 @class AnchorRoomScrollView;
 
 @protocol AnchorRoomScrollViewDelegate <NSObject>
@@ -22,6 +23,9 @@
 @end
 
 @interface AnchorRoomScrollView : UIScrollView
+@property (nonatomic,weak) id<RoomHostDelegate>hostDelegate;
+
+- (instancetype)initWithdelegate:(id<RoomHostDelegate>)delegate;
 
 @property (nonatomic, assign) id<AnchorRoomScrollViewDelegate> anchorScrollDelegate;
 @property (nonatomic, strong) UIView *middleImageView;

xplan-ios/Main/Room/View/AnchorCycleView/AnchorRoomScrollView.m

@@ -8,6 +8,9 @@
 #import "AnchorRoomScrollView.h"
 #import "XPMacro.h"
 #import "RoomInfoModel.h"
+#import "MicroQueueModel.h"
+#import "AccountInfoStorage.h"
+#import "UserInfoModel.h"
 //SVGA动画播放
 
 #import "SVGAParserManager.h"
@@ -24,6 +27,7 @@
 @property (nonatomic, strong) SVGAImageView *downDisplayView;
 
 @property (nonatomic, assign) BOOL animatePlay;
+
 @end
 
 @implementation AnchorRoomScrollView
@@ -88,8 +92,20 @@
 }
 
 - (void)roomMessageTabelViewStopScroll {
+	BOOL isOnMic = false;
+
+	for (MicroQueueModel * info in self.hostDelegate.getMicroQueue.allValues) {
+		if (info.userInfo.uid > 0 && [AccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) {
+			isOnMic = YES;
+			break;
+		}
+	}
+	if (isOnMic) {
+		self.scrollEnabled = NO;
+	} else {
 		self.scrollEnabled = YES;
 	}
+}
 
 - (void)switchPlayer:(UIScrollView*)scrollView {
 	CGFloat offset = scrollView.contentOffset.y;

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

@@ -1540,14 +1540,21 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
 	[self.menuContainerView onMicroQueueUpdate:queue];
 	[self.functionView onRoomUpdate];
 	[self.functionView onMicroQueueUpdate:queue];
+
+	BOOL isOnMic = false;
 	for (MicroQueueModel * info in queue.allValues) {
 		if (info.userInfo.uid > 0 && [AccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) {
+			isOnMic = YES;
+			break;
+		}
+	}
+
+	if (isOnMic) {
 		self.anchorScrollView.scrollEnabled = NO;
 	} else {
 		self.anchorScrollView.scrollEnabled = YES;
 	}
 }
-}
 
 - (CGPoint)animationPointAtStageViewByUid:(NSString *)uid {
     return [self.stageView animationPointAtStageViewByUid:uid];
@@ -1748,6 +1755,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
     if (!_anchorScrollView) {
         _anchorScrollView = [[AnchorRoomScrollView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
         _anchorScrollView.anchorScrollDelegate = self;
+		_anchorScrollView.hostDelegate = self;
 		if (@available(iOS 11.0, *)) {
 			_anchorScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 		}