diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index 345119cb..84e497a1 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -57,7 +57,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns ///正式环境 #define API_HOST_URL @"https://api.hfighting.com" ///测试环境 -#define API_HOST_TEST_URL @"http://beta.api.molistar.xyz" +#define API_HOST_TEST_URL @"http://beta.api.pekolive.com" // http://beta.api.pekolive.com | http://beta.api.molistar.xyz #define API_Image_URL @"https://image.hfighting.com" diff --git a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m b/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m index 86675f00..0cd964af 100644 --- a/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m +++ b/YuMi/Modules/YMRoom/View/StageView/SocialStageView.m @@ -161,9 +161,9 @@ CGFloat rightCenterX = CGRectGetMinX(rightRect) + mcWidth / 2; CGFloat midX = (leftCenterX + rightCenterX) / 2.0; - // 以中点为中心,返回 75x75 的矩形 - CGFloat size = 75.0; - return CGRectMake(midX - size / 2.0, circleCenterY - size / 2.0, size, size); + // 以中点为中心,返回适配屏幕的矩形 + CGFloat size = kGetScaleWidth(kMidpointRectSize); + return CGRectMake(midX - size / 2.0, circleCenterY - size / 4.0, size, size); } @end diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.h b/YuMi/Modules/YMRoom/View/StageView/StageView.h index e02ed267..b3a7d1ff 100644 --- a/YuMi/Modules/YMRoom/View/StageView/StageView.h +++ b/YuMi/Modules/YMRoom/View/StageView/StageView.h @@ -9,9 +9,13 @@ #import "RoomHostDelegate.h" #import "RoomGuestDelegate.h" #import "MicroViewProtocol.h" +#import "YUMIMacroUitls.h" NS_ASSUME_NONNULL_BEGIN +// 中点矩形尺寸常量 +static const CGFloat kMidpointRectSize = 75.0; + @class MicroQueueModel; @protocol StageViewDelegate diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.m b/YuMi/Modules/YMRoom/View/StageView/StageView.m index ea50d0a7..8fd2a541 100644 --- a/YuMi/Modules/YMRoom/View/StageView/StageView.m +++ b/YuMi/Modules/YMRoom/View/StageView/StageView.m @@ -1292,8 +1292,8 @@ CGFloat rightTopY = CGRectGetMinY(rightRect); CGFloat midTopY = (leftTopY + rightTopY) / 2.0 - 10.0; - // 返回75x75的矩形 - CGFloat size = 75.0; + // 返回适配屏幕的矩形 + CGFloat size = kGetScaleWidth(kMidpointRectSize); return CGRectMake(midX - size / 2.0, midTopY, size, size); }