Skip to content

Commit

Permalink
pod install and build test demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeraShowFeng
HeraShowFeng committed Feb 7, 2021
1 parent f67823f commit db377dc
Show file tree
Hide file tree
Showing 16 changed files with 126 additions and 33 deletions.
9 changes: 7 additions & 2 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/DubViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,19 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = PLS_RGBCOLOR(25, 24, 36);
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 0;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 16;
}
// 关闭按钮
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_a"] forState:UIControlStateNormal];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_b"] forState:UIControlStateHighlighted];
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
backButton.frame = CGRectMake(0, 0, 80, 64);
backButton.frame = CGRectMake(0, topSpace, 80, 64);
backButton.titleEdgeInsets = UIEdgeInsetsMake(0, 7, 0, 0);
backButton.titleLabel.font = [UIFont systemFontOfSize:16];
[backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
Expand All @@ -124,7 +129,7 @@ - (void)setupBaseToolboxView {
self.saveButton.hidden = YES;
[self.saveButton setTitle:@"保存" forState:UIControlStateNormal];
[self.saveButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
self.saveButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 60, 0, 60, 64);
self.saveButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 60, topSpace, 60, 64);
self.saveButton.titleLabel.font = [UIFont systemFontOfSize:16];
[self.saveButton addTarget:self action:@selector(saveButtonClick) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:_saveButton];
Expand Down
12 changes: 9 additions & 3 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/EditViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,20 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = PLS_RGBCOLOR(25, 24, 36);
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 20;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 26;
}

// 关闭按钮
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_a"] forState:UIControlStateNormal];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_b"] forState:UIControlStateHighlighted];
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
backButton.frame = CGRectMake(0, 20, 80, 44);
backButton.frame = CGRectMake(0, topSpace, 80, 44);
backButton.titleEdgeInsets = UIEdgeInsetsMake(0, 7, 0, 0);
backButton.titleLabel.font = [UIFont systemFontOfSize:16];
[backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
Expand All @@ -373,7 +379,7 @@ - (void)setupBaseToolboxView {
// 标题
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 20, 100, 44)];
if (iPhoneX_SERIES) {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 58);
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
} else {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 42);
}
Expand All @@ -390,7 +396,7 @@ - (void)setupBaseToolboxView {
[nextButton setTitle:@"下一步" forState:UIControlStateNormal];
[nextButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[nextButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, 20, 80, 44);
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, topSpace, 80, 44);
nextButton.titleEdgeInsets = UIEdgeInsetsMake(0, -40, 0, 0);
nextButton.imageEdgeInsets = UIEdgeInsetsMake(0, 50, 0, 0);
nextButton.titleLabel.font = [UIFont systemFontOfSize:16];
Expand Down
10 changes: 8 additions & 2 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/GifFormatViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,20 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = [UIColor clearColor];
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 0;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 26;
}

// 关闭按钮
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_a"] forState:UIControlStateNormal];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_b"] forState:UIControlStateHighlighted];
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
backButton.frame = CGRectMake(0, 0, 80, 64);
backButton.frame = CGRectMake(0, topSpace, 80, 64);
backButton.titleEdgeInsets = UIEdgeInsetsMake(0, 7, 0, 0);
backButton.titleLabel.font = [UIFont systemFontOfSize:16];
[backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
Expand All @@ -76,7 +82,7 @@ - (void)setupBaseToolboxView {
[self.nextButton setTitle:@"下一步" forState:UIControlStateNormal];
[self.nextButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.nextButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateDisabled];
self.nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, 0, 80, 64);
self.nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, topSpace, 80, 64);
self.nextButton.titleEdgeInsets = UIEdgeInsetsMake(0, -40, 0, 0);
self.nextButton.imageEdgeInsets = UIEdgeInsetsMake(0, 50, 0, 0);
self.nextButton.titleLabel.font = [UIFont systemFontOfSize:16];
Expand Down
1 change: 1 addition & 0 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/ImageVideoMixViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ - (void)enterTransitionPreviewWithPlayerItem:(AVPlayerItem *)playerItem {
transitionPreviewController.imageVideoComposer = self.imageVideoComposer;
transitionPreviewController.images = self.dynamicScrollView.images;
transitionPreviewController.types = self.dynamicScrollView.selectedTypes;
transitionPreviewController.modalPresentationStyle = UIModalPresentationFullScreen;
[self presentViewController:transitionPreviewController animated:YES completion:nil];
}

Expand Down
2 changes: 1 addition & 1 deletion ShortVideoFunctionDemo/PLShortVideoKitDemo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(MARKETING_VERSION).git-2020-10-22-7da20f7</string>
<string>$(MARKETING_VERSION).git-2021-02-07-f67823f</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand Down
Binary file modified ShortVideoFunctionDemo/PLShortVideoKitDemo/Librarys/libMuseProcessor.a
View file
Binary file not shown.
20 changes: 13 additions & 7 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/MixRecordViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,23 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = [UIColor clearColor];
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 10;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 40;
}

// 返回
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
backButton.frame = CGRectMake(10, 10, 35, 35);
backButton.frame = CGRectMake(10, topSpace, 35, 35);
[backButton setBackgroundImage:[UIImage imageNamed:@"btn_camera_cancel_a"] forState:UIControlStateNormal];
[backButton setBackgroundImage:[UIImage imageNamed:@"btn_camera_cancel_b"] forState:UIControlStateHighlighted];
[backButton addTarget:self action:@selector(backButtonEvent:) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:backButton];

// 七牛滤镜
UIButton *filterButton = [UIButton buttonWithType:UIButtonTypeCustom];
filterButton.frame = CGRectMake(10, 55, 35, 35);
filterButton.frame = CGRectMake(10, topSpace + 45, 35, 35);
[filterButton setTitle:@"滤镜" forState:UIControlStateNormal];
[filterButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
filterButton.titleLabel.font = [UIFont systemFontOfSize:14];
Expand All @@ -255,15 +261,15 @@ - (void)setupBaseToolboxView {

// 闪光灯
UIButton *flashButton = [UIButton buttonWithType:UIButtonTypeCustom];
flashButton.frame = CGRectMake(10, 100, 35, 35);
flashButton.frame = CGRectMake(10, topSpace + 90, 35, 35);
[flashButton setBackgroundImage:[UIImage imageNamed:@"flash_close"] forState:UIControlStateNormal];
[flashButton setBackgroundImage:[UIImage imageNamed:@"flash_open"] forState:UIControlStateSelected];
[flashButton addTarget:self action:@selector(flashButtonEvent:) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:flashButton];

// 美颜
UIButton *beautyFaceButton = [UIButton buttonWithType:UIButtonTypeCustom];
beautyFaceButton.frame = CGRectMake(10, 145, 30, 30);
beautyFaceButton.frame = CGRectMake(10, topSpace + 135, 30, 30);
[beautyFaceButton setTitle:@"美颜" forState:UIControlStateNormal];
[beautyFaceButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
beautyFaceButton.titleLabel.font = [UIFont systemFontOfSize:14];
Expand All @@ -273,14 +279,14 @@ - (void)setupBaseToolboxView {

// 切换摄像头
UIButton *toggleCameraButton = [UIButton buttonWithType:UIButtonTypeCustom];
toggleCameraButton.frame = CGRectMake(10, 190, 35, 35);
toggleCameraButton.frame = CGRectMake(10, topSpace + 180, 35, 35);
[toggleCameraButton setBackgroundImage:[UIImage imageNamed:@"toggle_camera"] forState:UIControlStateNormal];
[toggleCameraButton addTarget:self action:@selector(toggleCameraButtonEvent:) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:toggleCameraButton];

// 录制的视频文件的存储路径设置
self.filePathButton = [[UIButton alloc] init];
self.filePathButton.frame = CGRectMake(10, 235, 35, 35);
self.filePathButton.frame = CGRectMake(10, topSpace + 225, 35, 35);
[self.filePathButton setImage:[UIImage imageNamed:@"file_path"] forState:UIControlStateNormal];
[self.filePathButton addTarget:self action:@selector(filePathButtonClickedEvent:) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:self.filePathButton];
Expand All @@ -297,7 +303,7 @@ - (void)setupBaseToolboxView {
// 回音消除开关
self.acousticEchoCancellationSwitch = [[UISwitch alloc] init];
CGRect frame = self.acousticEchoCancellationSwitch.frame;
frame = CGRectMake(self.view.bounds.size.width - frame.size.width - 20, 30, frame.size.width, frame.size.height);
frame = CGRectMake(self.view.bounds.size.width - frame.size.width - 20, topSpace, frame.size.width, frame.size.height);
self.acousticEchoCancellationSwitch.frame = frame;
[self.acousticEchoCancellationSwitch setOn:_audioConfiguration.acousticEchoCancellationEnable];
[self.acousticEchoCancellationSwitch addTarget:self action:@selector(acousticEchoCancellationSwitchChange:) forControlEvents:(UIControlEventValueChanged)];
Expand Down
14 changes: 10 additions & 4 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/MoiveClipViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ - (void)setupShortVideoEditor {
self.asset = asset;

// 视频编辑类
self.shortVideoEditor = [[PLShortVideoEditor alloc] initWithAsset:asset videoSize:CGSizeZero];
self.shortVideoEditor = [[PLShortVideoEditor alloc] initWithAsset:asset videoSize:self.asset.pls_videoSize];
self.shortVideoEditor.delegate = self;
self.shortVideoEditor.loopEnabled = YES;

Expand All @@ -119,14 +119,20 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = PLS_RGBCOLOR(25, 24, 36);
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 20;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 26;
}

// 关闭按钮
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_a"] forState:UIControlStateNormal];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_b"] forState:UIControlStateHighlighted];
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
backButton.frame = CGRectMake(0, 20, 80, 44);
backButton.frame = CGRectMake(0, topSpace, 80, 44);
backButton.titleEdgeInsets = UIEdgeInsetsMake(0, 7, 0, 0);
backButton.titleLabel.font = [UIFont systemFontOfSize:16];
[backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
Expand All @@ -135,7 +141,7 @@ - (void)setupBaseToolboxView {
// 标题
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 20, 100, 44)];
if (iPhoneX_SERIES) {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 58);
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
} else {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 42);
}
Expand All @@ -152,7 +158,7 @@ - (void)setupBaseToolboxView {
[nextButton setTitle:@"下一步" forState:UIControlStateNormal];
[nextButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[nextButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, 20, 80, 44);
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, topSpace, 80, 44);
nextButton.titleEdgeInsets = UIEdgeInsetsMake(0, -40, 0, 0);
nextButton.imageEdgeInsets = UIEdgeInsetsMake(0, 50, 0, 0);
nextButton.titleLabel.font = [UIFont systemFontOfSize:16];
Expand Down
12 changes: 9 additions & 3 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/MovieTransCodeViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,20 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = PLS_RGBCOLOR(25, 24, 36);
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 20;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 26;
}

// 关闭按钮
UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_a"] forState:UIControlStateNormal];
[backButton setImage:[UIImage imageNamed:@"btn_bar_back_b"] forState:UIControlStateHighlighted];
[backButton setTitle:@"返回" forState:UIControlStateNormal];
[backButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[backButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
backButton.frame = CGRectMake(0, 20, 80, 44);
backButton.frame = CGRectMake(0, topSpace, 80, 44);
backButton.titleEdgeInsets = UIEdgeInsetsMake(0, 7, 0, 0);
backButton.titleLabel.font = [UIFont systemFontOfSize:16];
[backButton addTarget:self action:@selector(backButtonClick) forControlEvents:UIControlEventTouchUpInside];
Expand All @@ -149,7 +155,7 @@ - (void)setupBaseToolboxView {
// 标题
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 20, 100, 44)];
if (iPhoneX_SERIES) {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 58);
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
} else {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 42);
}
Expand All @@ -166,7 +172,7 @@ - (void)setupBaseToolboxView {
[nextButton setTitle:@"下一步" forState:UIControlStateNormal];
[nextButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[nextButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, 20, 80, 44);
nextButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, topSpace, 80, 44);
nextButton.titleEdgeInsets = UIEdgeInsetsMake(0, -40, 0, 0);
nextButton.imageEdgeInsets = UIEdgeInsetsMake(0, 50, 0, 0);
nextButton.titleLabel.font = [UIFont systemFontOfSize:16];
Expand Down
11 changes: 9 additions & 2 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/PhotoAlbumViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,16 @@ - (void)setupBaseToolboxView {
self.baseToolboxView.backgroundColor = PLS_RGBCOLOR(25, 24, 36);
[self.view addSubview:self.baseToolboxView];

CGFloat topSpace = 20;
if (PL_iPhoneX || PL_iPhoneXR || PL_iPhoneXSMAX ||
PL_iPhone12Min || PL_iPhone12Pro || PL_iPhone12PMax) {
topSpace = 26;
}

// 标题
UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 20, 100, 44)];
if (iPhoneX_SERIES) {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 58);
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
} else {
titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 42);
}
Expand All @@ -556,7 +562,7 @@ - (void)setupBaseToolboxView {
[cancelButton setTitle:@"取消" forState:UIControlStateNormal];
[cancelButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[cancelButton setTitleColor:PLS_RGBCOLOR(141, 141, 142) forState:UIControlStateHighlighted];
cancelButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, 20, 80, 44);
cancelButton.frame = CGRectMake(PLS_SCREEN_WIDTH - 80, topSpace, 80, 44);
cancelButton.titleLabel.font = [UIFont systemFontOfSize:16];
[cancelButton addTarget:self action:@selector(cancelButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[self.baseToolboxView addSubview:cancelButton];
Expand Down Expand Up @@ -940,6 +946,7 @@ - (void)enterTransitionPreviewWithPlayerItem:(AVPlayerItem *)playerItem {
transitionPreviewController.imageVideoComposer = self.imageVideoComposer;
transitionPreviewController.images = self.dynamicScrollView.images;
transitionPreviewController.types = self.dynamicScrollView.selectedTypes;
transitionPreviewController.modalPresentationStyle = UIModalPresentationFullScreen;
[self presentViewController:transitionPreviewController animated:YES completion:nil];
}

Expand Down
8 changes: 8 additions & 0 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo/PrefixHeader.pch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
#define ARRAY_SIZE(c_array) (sizeof((c_array))/sizeof((c_array)[0]))
#endif

#define PL_iPhoneP ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2208), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhoneXR ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(828, 1792), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhoneXSMAX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1242, 2688), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhone12Min ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1080, 2340), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhone12Pro ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1170, 2532), [[UIScreen mainScreen] currentMode].size) : NO)
#define PL_iPhone12PMax ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1284, 2778), [[UIScreen mainScreen] currentMode].size) : NO)

// 颜色
#define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
#define PLS_RGBCOLOR_ALPHA(r,g,b,a) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:(a)]
Expand Down
Loading

0 comments on commit db377dc

Please sign in to comment.