yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了房间活动板块无法显示全的问题

Browse Source
This commit is contained in:
fengshuo
2022-08-25 15:43:34 +08:00
parent 3545d13b6a
commit b50abb9f00
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xplan-ios/Global/XPMacro.h
View File

@@ -25,6 +25,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
#define kNavigationHeight (kStatusBarHeight + 44) #define kNavigationHeight (kStatusBarHeight + 44)
#define kTabBarHeight (iPhoneXSeries ? 49.0+34.0 : 49.0) #define kTabBarHeight (iPhoneXSeries ? 49.0+34.0 : 49.0)
#define kScreenScale ((CGFloat)KScreenWidth / (CGFloat)375) #define kScreenScale ((CGFloat)KScreenWidth / (CGFloat)375)
#define kScreenHeightScale ((CGFloat)KScreenHeight / (CGFloat)812)
#define kHalfScreenHeight KScreenHeight * 0.65 #define kHalfScreenHeight KScreenHeight * 0.65
#define kWeakify(o) try{}@finally{} __weak typeof(o) o##Weak = o; #define kWeakify(o) try{}@finally{} __weak typeof(o) o##Weak = o;

14
xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m
View File

@@ -16,6 +16,7 @@
#import "NetImageView.h" #import "NetImageView.h"
#import "TTPopup.h" #import "TTPopup.h"
#import "XCHUDTool.h" #import "XCHUDTool.h"
#import "XPMacro.h"
///Model ///Model
#import "UserInfoModel.h" #import "UserInfoModel.h"
#import "RoomInfoModel.h" #import "RoomInfoModel.h"
@@ -86,25 +87,26 @@
[self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.mas_equalTo(self); make.edges.mas_equalTo(self);
}]; }];
CGFloat itemWidth = KScreenHeight > 667 ? 65 : 55 * kScreenHeightScale;
[self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { [self.cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(65, 65)); make.size.mas_equalTo(CGSizeMake(itemWidth , itemWidth));
}]; }];
[self.sailingImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.sailingImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(65, 65)); make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth));
}]; }];
[self.firstRechargeImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.firstRechargeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(65, 65)); make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth));
}]; }];
[self.candyTreeImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.candyTreeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(65, 65)); make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth));
}]; }];
[self.joinDatingView mas_makeConstraints:^(MASConstraintMaker *make) { [self.joinDatingView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(35); make.height.mas_equalTo(35* kScreenHeightScale);
}]; }];
} }

2
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -355,7 +355,7 @@
- (void)xPRoomNewUserGreetView:(XPRoomNewUserGreetView *)view didClickCheckout:(UIButton *)sender { - (void)xPRoomNewUserGreetView:(XPRoomNewUserGreetView *)view didClickCheckout:(UIButton *)sender {
XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
[self addSubview:halfMessageView]; [[UIApplication sharedApplication].delegate.window addSubview:halfMessageView];
[UIView animateWithDuration:.35 animations:^{ [UIView animateWithDuration:.35 animations:^{
CGRect rect = halfMessageView.frame; CGRect rect = halfMessageView.frame;
rect.origin.y = 0; rect.origin.y = 0;

5
xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m
View File

@@ -16,6 +16,7 @@
#import "StatisticsServiceHelper.h" #import "StatisticsServiceHelper.h"
#import "Themecolor.h" #import "Themecolor.h"
#import "XPMacro.h" #import "XPMacro.h"
#import "XCCurrentVCStackManager.h"
///Model ///Model
#import "XPRoomMenuItem.h" #import "XPRoomMenuItem.h"
#import "MicroQueueModel.h" #import "MicroQueueModel.h"
@@ -125,7 +126,7 @@
case XPRoomMenuItemType_Message: case XPRoomMenuItemType_Message:
{ {
XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
[self.superview addSubview:halfMessageView]; [[UIApplication sharedApplication].delegate.window addSubview:halfMessageView];
[UIView animateWithDuration:.35 animations:^{ [UIView animateWithDuration:.35 animations:^{
CGRect rect = halfMessageView.frame; CGRect rect = halfMessageView.frame;
rect.origin.y = 0; rect.origin.y = 0;
@@ -415,7 +416,7 @@
- (void)xPRoomMessageBubbleView:(XPRoomMessageBubbleView *)view didSelectSession:(NIMRecentSession *)session { - (void)xPRoomMessageBubbleView:(XPRoomMessageBubbleView *)view didSelectSession:(NIMRecentSession *)session {
XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
halfMessageView.chatUserId = session.session.sessionId; halfMessageView.chatUserId = session.session.sessionId;
[self.superview addSubview:halfMessageView]; [[UIApplication sharedApplication].delegate.window addSubview:halfMessageView];
[UIView animateWithDuration:.35 animations:^{ [UIView animateWithDuration:.35 animations:^{
CGRect rect = halfMessageView.frame; CGRect rect = halfMessageView.frame;
rect.origin.y = 0; rect.origin.y = 0;

2
xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m
View File

@@ -741,7 +741,7 @@
[self dismissViewControllerAnimated:YES completion:^{ [self dismissViewControllerAnimated:YES completion:^{
XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)]; XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
halfMessageView.chatUserId = self.cardInfo.uid; halfMessageView.chatUserId = self.cardInfo.uid;
[[XCCurrentVCStackManager shareManager].currentNavigationController.view addSubview:halfMessageView]; [[UIApplication sharedApplication].delegate.window addSubview:halfMessageView];
[UIView animateWithDuration:.35 animations:^{ [UIView animateWithDuration:.35 animations:^{
CGRect rect = halfMessageView.frame; CGRect rect = halfMessageView.frame;
rect.origin.y = 0; rect.origin.y = 0;