Skip to content

Commit

Permalink
提交 1.7.2 版本
Browse files Browse the repository at this point in the history
  • Loading branch information
Dhan committed Nov 15, 2021
1 parent b12f4e8 commit 3891f98
Show file tree
Hide file tree
Showing 63 changed files with 727 additions and 299 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ target 'PolyvLiveScenesDemo' do
use_frameworks!

# 保利威 多场景 SDK
pod 'PLVLiveScenesSDK', '1.7.0'
pod 'PLVLiveScenesSDK', '1.7.2'

# 保利威 UI源码 需依赖的库
pod 'SDWebImage', '4.4.0'
Expand Down
8 changes: 4 additions & 4 deletions PolyvLiveScenesDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@
21795DDD26077D7A001E3668 /* PLVLSSendMessageToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = 21795DDC26077D7A001E3668 /* PLVLSSendMessageToolView.m */; };
2937E16E26E5CA5E002D3118 /* PLVLSDocumentWaitLiveView.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A1DA426CDF7FD0076A0CA /* PLVLSDocumentWaitLiveView.m */; };
296A1DA526CDF7FE0076A0CA /* PLVLSDocumentWaitLiveView.m in Sources */ = {isa = PBXBuildFile; fileRef = 296A1DA426CDF7FD0076A0CA /* PLVLSDocumentWaitLiveView.m */; };
2EFE5B259B80F4A2D1C04A99 /* Pods_PolyvLiveScenesDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F620951BC17801D4F1DB13 /* Pods_PolyvLiveScenesDemo.framework */; };
362D64A926D721270041FAE1 /* PLVHCLinkMicWindowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 362D64A826D721270041FAE1 /* PLVHCLinkMicWindowCell.m */; };
362D64AA26D721270041FAE1 /* PLVHCLinkMicWindowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 362D64A826D721270041FAE1 /* PLVHCLinkMicWindowCell.m */; };
362D659A26D784690041FAE1 /* PLVHCLinkMicWindowsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 362D659926D784690041FAE1 /* PLVHCLinkMicWindowsView.m */; };
Expand Down Expand Up @@ -922,6 +921,7 @@
8FFC704F26F200A900ED8C28 /* PLVHCAreaCodeChooseTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFC704D26F200A900ED8C28 /* PLVHCAreaCodeChooseTableViewCell.m */; };
8FFC705226F200B300ED8C28 /* PLVHCAreaCodeChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFC705026F200B200ED8C28 /* PLVHCAreaCodeChooseView.m */; };
8FFC705326F200B300ED8C28 /* PLVHCAreaCodeChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FFC705026F200B200ED8C28 /* PLVHCAreaCodeChooseView.m */; };
9E8AC3A5FF0A3E7238FF1066 /* Pods_PolyvLiveScenesDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E66B007443EAEB85D1363DBC /* Pods_PolyvLiveScenesDemo.framework */; };
BF574404255D204500283C2D /* PLVECNewMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = BF574403255D204500283C2D /* PLVECNewMessageView.m */; };
BF7CFC6125BA636B0084C160 /* PLVECCommodityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7CFC5725BA636B0084C160 /* PLVECCommodityCell.m */; };
BF7CFC6225BA636B0084C160 /* PLVECGoodsDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF7CFC5925BA636B0084C160 /* PLVECGoodsDetailViewController.m */; };
Expand Down Expand Up @@ -1263,7 +1263,6 @@
04D97C9C26F469750075CAD8 /* PLVHCLoginCustomButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLVHCLoginCustomButton.h; sourceTree = "<group>"; };
04D97C9D26F469750075CAD8 /* PLVHCLoginCustomButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLVHCLoginCustomButton.m; sourceTree = "<group>"; };
077C2E48E28AD1CD7FC8C0E8 /* Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.release.xcconfig"; path = "Target Support Files/Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo/Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.release.xcconfig"; sourceTree = "<group>"; };
19F620951BC17801D4F1DB13 /* Pods_PolyvLiveScenesDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PolyvLiveScenesDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
213639DB264C1C56004F66A7 /* plvlw_login_clear@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "plvlw_login_clear@2x.png"; sourceTree = "<group>"; };
213639DC264C1C56004F66A7 /* plvlw_login_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "plvlw_login_logo@2x.png"; sourceTree = "<group>"; };
213639DD264C1C56004F66A7 /* plvlw_login_logo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "plvlw_login_logo@3x.png"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1698,6 +1697,7 @@
C8C0B1BDBA08B5A1387EB520 /* Pods-PolyvLiveScenesDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PolyvLiveScenesDemo.release.xcconfig"; path = "Target Support Files/Pods-PolyvLiveScenesDemo/Pods-PolyvLiveScenesDemo.release.xcconfig"; sourceTree = "<group>"; };
D12BFA48BFD11F80E5A2FAA5 /* Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.debug.xcconfig"; path = "Target Support Files/Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo/Pods-business-liveScenes-liveScenesDemo-PolyvStreamerAloneDemo.debug.xcconfig"; sourceTree = "<group>"; };
D9C6F1C98177E8003A3399A9 /* Pods-business-liveScenes-PolyvLiveStreamerDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-business-liveScenes-PolyvLiveStreamerDemo.release.xcconfig"; path = "Target Support Files/Pods-business-liveScenes-PolyvLiveStreamerDemo/Pods-business-liveScenes-PolyvLiveStreamerDemo.release.xcconfig"; sourceTree = "<group>"; };
E66B007443EAEB85D1363DBC /* Pods_PolyvLiveScenesDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PolyvLiveScenesDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE0ED85B45376486CC1BFE2E /* Pods-PolyvLiveScenesDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PolyvLiveScenesDemo.debug.xcconfig"; path = "Target Support Files/Pods-PolyvLiveScenesDemo/Pods-PolyvLiveScenesDemo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -1735,7 +1735,7 @@
buildActionMask = 2147483647;
files = (
633E425D257DCD710039D35D /* PLVLiveScenesSDK.framework in Frameworks */,
2EFE5B259B80F4A2D1C04A99 /* Pods_PolyvLiveScenesDemo.framework in Frameworks */,
9E8AC3A5FF0A3E7238FF1066 /* Pods_PolyvLiveScenesDemo.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -3781,7 +3781,7 @@
670B80B424C54D8800D94478 /* PolyvFoundationSDK.framework */,
430C9CF57975329ADA06E5C9 /* Pods_PolyvLiveEcommerceDemoUITests.framework */,
6ED5072918A006C94EB83D86 /* Pods_business_liveScenes_liveScenesDemo_PolyvStreamerAloneDemo.framework */,
19F620951BC17801D4F1DB13 /* Pods_PolyvLiveScenesDemo.framework */,
E66B007443EAEB85D1363DBC /* Pods_PolyvLiveScenesDemo.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ - (void)viewWillLayoutSubviews {
[self.keyboardToolView updateTextViewAndButton];
}

[self refreshLikeButtonViewFrame];
if (![self currentIsFullScreen]) {
[self refreshLikeButtonViewFrame];
}
}
}

Expand Down Expand Up @@ -234,8 +236,7 @@ - (void)removeObserver {
}

- (void)interfaceOrientationDidChange:(NSNotification *)notification {
BOOL fullScreen = [UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height;
if (!fullScreen) {
if (![self currentIsFullScreen]) {
[self scrollsToBottom:NO];
}
}
Expand Down Expand Up @@ -311,6 +312,10 @@ - (void)presentAlertController:(NSString *)message {
[PLVAlbumTool presentAlertController:message inViewController:self];
}

- (BOOL)currentIsFullScreen {
return [UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height;
}

#pragma mark - PLVRoomDataManagerProtocol

- (void)roomDataManager_didLikeCountChanged:(NSUInteger)likeCount {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,27 +189,30 @@ - (BOOL)sendQuesstionMessage:(NSString *)content {

- (BOOL)sendSpeakMessage:(NSString *)content {
PLVChatModel *model = [self.presenter sendSpeakMessage:content];
if (model) {
BOOL sendSuccess = model && ![PLVChatroomManager sharedManager].closeRoom;
if (sendSuccess) {
[self addPublicChatModel:model];
[self cacheDanmu:@[model]];
}
return model != nil;
return sendSuccess;
}

- (BOOL)sendImageMessage:(UIImage *)image {
PLVChatModel *model = [self.presenter sendImageMessage:image];
if (model) {
BOOL sendSuccess = model && ![PLVChatroomManager sharedManager].closeRoom;
if (sendSuccess) {
[self addPublicChatModel:model];
}
return model != nil;
return sendSuccess;
}

- (BOOL)sendImageEmotionId:(NSString *)imageId imageUrl:(NSString *)imageUrl {
PLVChatModel *model = [self.presenter sendImageEmotionId:imageId imageUrl:imageUrl];
if (model) {
BOOL sendSuccess = model && ![PLVChatroomManager sharedManager].closeRoom;
if (sendSuccess) {
[self addPublicChatModel:model];
}
return model != nil;
return sendSuccess;
}

- (void)sendLike {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@ - (void)plvLinkMicPresenter:(PLVLinkMicPresenter *)presenter didMediaMuted:(BOOL

/// 连麦管理器的处理状态 发生改变
- (void)plvLinkMicPresenter:(PLVLinkMicPresenter *)presenter operationInProgress:(BOOL)inProgress{
[self.currentControlBar controlBarUserInteractionEnabled:!inProgress];
[self.landscapeControlBar controlBarUserInteractionEnabled:!inProgress];
[self.portraitControlBar controlBarUserInteractionEnabled:!inProgress];
}

/// 连麦在线用户数组 发生变化
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ - (void)controlBarStatusSwitchTo:(PLVLCLinkMicControlBarStatus)status{
[self onOffButtonColorChange:PLVColor_OnOffButton_Red];

[self textLabelContentChange:@"请求中..."];

[self mediaControlButtonsShow:NO];
}else if (status == PLVLCLinkMicControlBarStatus_Joined){ // 已连麦,显示相关的控制按钮
[self onOffButtonRotate:YES];
[self onOffButtonColorChange:PLVColor_OnOffButton_Red];
Expand Down Expand Up @@ -407,9 +409,12 @@ - (void)textLabelContentChange:(NSString *)text{
weakSelf.textLabel.alpha = 0;
} completion:^(BOOL finished) {
weakSelf.textLabel.text = text;
[UIView animateWithDuration:(totalTime / 2.0) animations:^{
weakSelf.textLabel.alpha = 1;
}];
if (weakSelf.status != PLVLCLinkMicControlBarStatus_Joined) {
[UIView animateWithDuration:(totalTime / 2.0) animations:^{
weakSelf.textLabel.alpha = 1;
}completion:^(BOOL finished) {
}];
}
}];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,12 @@ - (void)textLabelContentChange:(NSString *)text{
weakSelf.textLabel.alpha = 0;
} completion:^(BOOL finished) {
weakSelf.textLabel.text = text;
[UIView animateWithDuration:(totalTime / 2.0) animations:^{
weakSelf.textLabel.alpha = 1;
}];
if (weakSelf.status != PLVLCLinkMicControlBarStatus_Joined) {
[UIView animateWithDuration:(totalTime / 2.0) animations:^{
weakSelf.textLabel.alpha = 1;
}completion:^(BOOL finished) {
}];
}
}];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,8 @@ - (void)plvLCBasePlayerSkinViewBackButtonClicked:(PLVLCBasePlayerSkinView *)skin
}
}

- (void)plvLCBasePlayerSkinViewRotateScreen:(PLVLCBasePlayerSkinView *)skinView{
- (void)plvLCBasePlayerSkinViewSynchOtherView:(PLVLCBasePlayerSkinView *)skinView{
//更新MoreView视图的Superview,执行此代理时意味着skinView对象为当前显示的皮肤
[self.moreView updateMoreViewOnSuperview:skinView.superview];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
///显示窗口
- (void)showMoreViewOnSuperview:(UIView *)superview;

///当屏幕旋转时更新superview 和 frame(适合横竖屏切换的场景)
/// 更新moreView父视图及布局
/// @note 在横竖屏旋转切换的场景下,适合调用该方法;仅在moreView已显示的情况下,该方法调用有效
- (void)updateMoreViewOnSuperview:(UIView *)superview;

- (void)switchShowStatusWithAnimation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,25 +118,22 @@ - (void)updateTableViewWithDataArrayByMatchModel:(NSArray<PLVLCMediaMoreModel *>
}
}

- (void)showMoreViewOnSuperview:(UIView *)superview{
- (void)showMoreViewOnSuperview:(UIView *)superview {
[self removeFromSuperview];
[superview addSubview:self];
self.frame = superview.bounds;

[self.superview bringSubviewToFront:self]; /// 保证在父视图中,层级最前
[self switchShowStatusWithAnimation];
if (!_moreViewShow) {
[self switchShowStatusWithAnimation];
}
}

//当屏幕旋转的时候需要重新设置superview 和 frame
- (void)updateMoreViewOnSuperview:(UIView *)superview {
if (!_moreViewShow) return;
[self removeFromSuperview];
[superview addSubview:self];

self.frame = superview.bounds;
[self.superview bringSubviewToFront:self]; /// 保证在父视图中,层级最前
_moreViewShow = NO;
[self switchShowStatusWithAnimation];
if (_moreViewShow) {
[self showMoreViewOnSuperview:superview];
}
}

- (void)switchShowStatusWithAnimation{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ typedef NS_ENUM(NSUInteger, PLVLCBasePlayerSkinViewLiveStatus) {

- (void)plvLCBasePlayerSkinViewFullScreenOpenButtonClicked:(PLVLCBasePlayerSkinView *)skinView;

- (void)plvLCBasePlayerSkinViewRotateScreen:(PLVLCBasePlayerSkinView *)skinView;
/// ‘当前皮肤视图’ 已同步 ‘其他皮肤视图’按钮状态的回调
///
/// @note 当调用 [synchOtherSkinViewState:] 方法成功时,将触发此回调方法;
///
/// @param skinView 当前 媒体播放器皮肤视图 对象本身 (注意:该参数非 [synchOtherSkinViewState:] 中的otherSkinView)
- (void)plvLCBasePlayerSkinViewSynchOtherView:(PLVLCBasePlayerSkinView *)skinView;

/// 询问是否有其他视图处理此次触摸事件
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ - (void)synchOtherSkinViewState:(PLVLCBasePlayerSkinView *)otherSkinView{
[self switchSkinViewLiveStatusTo:otherSkinView.skinViewLiveStatus];
self.playButton.selected = otherSkinView.playButton.selected;
self.floatViewShowButton.selected = otherSkinView.floatViewShowButton.selected;
if (self.baseDelegate && [self.baseDelegate respondsToSelector:@selector(plvLCBasePlayerSkinViewRotateScreen:)]) {
[self.baseDelegate plvLCBasePlayerSkinViewRotateScreen:self];
if (self.baseDelegate && [self.baseDelegate respondsToSelector:@selector(plvLCBasePlayerSkinViewSynchOtherView:)]) {
[self.baseDelegate plvLCBasePlayerSkinViewSynchOtherView:self];
}
}else{
NSLog(@"PLVLCBasePlayerSkinView[%@] - synchOtherSkinViewState failed, other skin view:%@",NSStringFromClass(self.class),otherSkinView);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ - (void)viewWillLayoutSubviews {
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
self.titleCollectionView.frame = CGRectMake(0, 0, CGRectGetWidth(self.view.bounds), kBarHeight);
self.seperator.frame = CGRectMake(0, kBarHeight, CGRectGetWidth(self.view.bounds), kSeperatorHeight);
self.pageController.view.frame = CGRectMake(0, kBarHeight + kSeperatorHeight, CGRectGetWidth(self.view.bounds), CGRectGetHeight(self.view.bounds) - kBarHeight - kSeperatorHeight);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ - (void)updateUI {
self.hideLinkMicAreaViewInSmallScreen = NO;
}
}

[self.mediaAreaView.skinView setFloatViewButtonWithShowStatus:showLinkMicAreaView];
[self.liveRoomSkinView setFloatViewButtonWithShowStatus:showLinkMicAreaView];
}

BOOL fullScreen = [UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height;
Expand Down Expand Up @@ -448,12 +445,7 @@ - (void)willResignActive:(NSNotification *)notification {

- (void)interfaceOrientationDidChange:(NSNotification *)notification {
BOOL fullScreen = [UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height;
BOOL isPad = [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
//iPad 屏幕旋转此方法会执行两次需要判断
if (isPad) {
//iPad 因为执行两次的时候第二次和第一次结果一样导致fullScreenDifferent为NO页面不刷新 暂时iPad特殊处理 -- 可能是因为iPad四个方向,iPhone只支持3个方向
self.fullScreenDifferent = YES;
} else {
if (!self.fullScreenDifferent) {
self.fullScreenDifferent = (self.currentLandscape != fullScreen);
}
self.currentLandscape = fullScreen;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ - (void)loadImageEmotions {

- (BOOL)sendSpeakMessage:(NSString *)content {
PLVChatModel *model = [self.presenter sendSpeakMessage:content];
if (model) {
BOOL sendSuccess = model && ![PLVChatroomManager sharedManager].closeRoom;
if (sendSuccess) {
[self addPublicChatModel:model];
}
return model != nil;
return sendSuccess;
}

- (BOOL)sendGiftMessageWithData:(NSDictionary *)data tip:(NSString *)tip {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ - (void)setColumnNumber:(NSInteger)columnNumber {
[PLVImageManager manager].columnNumber = columnNumber;
}

- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
return UIInterfaceOrientationMaskPortrait;
}

@end

@interface PLVHCChatroomSheet()<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ - (instancetype)init {

- (void)layoutSubviews {
[super layoutSubviews];

BOOL isPad = [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
CGFloat normalPadding = isPad ? 12 : 8;

CGFloat areaViewWidth = self.bounds.size.width;
CGFloat areaViewWidth = [UIScreen mainScreen].bounds.size.width * 0.34; // 支持小屏后,聊天室区域保持宽度34%不变
CGFloat areaViewHeight = self.bounds.size.height;
self.chatroomListView.frame = CGRectMake(normalPadding, 0, areaViewWidth - normalPadding, areaViewHeight - 36 - 8 * 2);
self.hideListViewButton.frame = CGRectMake(normalPadding, areaViewHeight - normalPadding - 36, 36, 36);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ - (void)setColumnNumber:(NSInteger)columnNumber {
[PLVImageManager manager].columnNumber = columnNumber;
}

- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
return UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
}

@end

@interface PLVLSSendMessageView ()<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ - (void)viewWillLayoutSubviews {
self.linkMicAreaView.frame = CGRectMake(CGRectGetMaxX(self.documentAreaView.frame) + linkMicAreaViewLeftPadding, CGRectGetMaxY(self.statusAreaView.frame), linkMicAreaViewWidth, ducomentViewHeight);

// 设置聊天室宽高
CGFloat chatroomAreaViewWidth = [UIScreen mainScreen].bounds.size.width * 0.34;
CGFloat chatroomAreaViewWidth = [UIScreen mainScreen].bounds.size.width * ([UIScreen mainScreen].bounds.size.width <= 667 ? 0.5 : 0.34); // 适配小屏输入框无法响应点击事件,chatroomAreaView内部适配聊天宽度
CGFloat chatroomAreaViewHeigh = [UIScreen mainScreen].bounds.size.height * (isPad ? 0.28 : 0.42) + 44;

self.chatroomAreaView.frame = CGRectMake(PLVLSUtils.safeSidePad, screenSize.height - PLVLSUtils.safeBottomPad - chatroomAreaViewHeigh, chatroomAreaViewWidth, chatroomAreaViewHeigh);
Expand Down
Loading

0 comments on commit 3891f98

Please sign in to comment.