Merge pull request #125 from HeraShowFeng/v3.2.3_release

v3.2.3 release
pili-engineering · Feb 7, 2021 · 971b1db · 971b1db
2 parents 393c21d + db377dc
commit 971b1db
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 40 deletions.
diff --git a/APIDiffs/api-diffs-3.2.3.md b/APIDiffs/api-diffs-3.2.3.md
@@ -0,0 +1,4 @@
+# PLShortVideoKit 3.2.2 to 3.2.3 API Differences
+
+## General Headers
+
diff --git a/PLShortVideoKit-Advanced.podspec b/PLShortVideoKit-Advanced.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.2.2"
+  s.version      = "3.2.3"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"

diff --git a/PLShortVideoKit-Basic.podspec b/PLShortVideoKit-Basic.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.2.2"
+  s.version      = "3.2.3"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"

diff --git a/PLShortVideoKit-Smart.podspec b/PLShortVideoKit-Smart.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.2.2"
+  s.version      = "3.2.3"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"

diff --git a/PLShortVideoKit.podspec b/PLShortVideoKit.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.2.2"
+  s.version      = "3.2.3"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"

diff --git a/README.md b/README.md
@@ -214,7 +214,7 @@ $ pod install
 
 请参考开发者中心文档：[PLShortVideoKit 文档](https://developer.qiniu.com/pili/sdk/3733/short-video-ios-sdk)
 
-*注意：GitHub 上出现无法 clone 时，可[点击下载](https://sdk-release.qnsdk.com/PLShortVideoKit-v3.1.1.zip)*
+**注意：GitHub 上出现无法 clone 时，可[点击下载](https://sdk-release.qnsdk.com/PLShortVideoKit-v3.2.3.zip)**
 
 # 6 声明
 

diff --git a/ReleaseNotes/release-notes-3.2.3.md b/ReleaseNotes/release-notes-3.2.3.md
@@ -0,0 +1,16 @@
+# PLShortVideoKit Release Notes for 3.2.3
+
+### 简介
+PLShortVideoKit 是七牛推出的一款适用于 iOS 平台的短视频 SDK，提供了包括美颜、滤镜、水印、断点录制、分段回删、视频编辑、混音特效、MV 特效、本地/云端存储在内的多种功能，支持高度定制以及二次开发。
+
+### 版本
+- 发布 PLShortVideoKit.framework
+
+### 缺陷
+- 修复鉴权偶现 crash 的问题
+- 修复同时 pod 导入百度地图 SDK 内置美颜会 crash 的问题
+
+### 注意事项
+- 七牛短视频 SDK 自 v3.0.0 版本起, 划分为精简版、基础版、进阶版、专业版 。不同版本 SDK 可以使用的功能点数量有差别，请按照购买的 License 版本使用对应的短视频 SDK 版本。
+- 若需要使用 PLShortVideoKit.framework 中的内置滤镜，则必须将 PLShortVideoKit.bundle 导入项目中。若需要增删、替换滤镜资源可操作 PLShortVideoKit.bundle 中的 colorFilter 文件夹。
+- 抖音特效，需要联系七牛商务获取 appkey 和资源文件。具体使用可参看 PLShortVideoKitDemo。
diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo.xcodeproj/project.pbxproj b/ShortVideoFunctionDemo/PLShortVideoKitDemo.xcodeproj/project.pbxproj
@@ -1595,7 +1595,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1629,7 +1629,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.2.2;
+				MARKETING_VERSION = 3.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/DubViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/DubViewController.m
@@ -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];
@@ -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];

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/EditViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/EditViewController.m
@@ -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];
@@ -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);
     }
@@ -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];

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/GifFormatViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/GifFormatViewController.m
@@ -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];
@@ -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];

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/ImageVideoMixViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/ImageVideoMixViewController.m
@@ -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];
 }
 

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/Info.plist b/ShortVideoFunctionDemo/PLShortVideoKitDemo/Info.plist
@@ -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>

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/Librarys/libMuseProcessor.a b/ShortVideoFunctionDemo/PLShortVideoKitDemo/Librarys/libMuseProcessor.a
diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/MixRecordViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/MixRecordViewController.m
@@ -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];
@@ -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];
@@ -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];
@@ -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)];

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/MoiveClipViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/MoiveClipViewController.m
@@ -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;
 
@@ -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];
@@ -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);
     }
@@ -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];

diff --git a/ShortVideoFunctionDemo/PLShortVideoKitDemo/MovieTransCodeViewController.m b/ShortVideoFunctionDemo/PLShortVideoKitDemo/MovieTransCodeViewController.m
@@ -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];
@@ -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);
     }
@@ -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];