1.3.0

JmoVxia · Nov 18, 2019 · 8073a9c · 8073a9c
1 parent 578ab9e
commit 8073a9c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/CLPlayer.podspec b/CLPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'CLPlayer'
-    s.version      = '1.2.9'
+    s.version      = '1.3.0'
     s.summary      = 'AVPlayer定制的视频播放器'
     s.homepage     = 'https://github.com/JmoVxia/CLPlayer'
     s.license      = 'MIT'

diff --git a/CLPlayer/CLPlayerMaskView.m b/CLPlayer/CLPlayerMaskView.m
@@ -50,7 +50,7 @@ - (void)makeConstraints{
         make.height.mas_equalTo(ToolBarHeight);
     }];
     //底部工具条
-    [self .bottomToolBar mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.bottomToolBar mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.bottom.mas_equalTo(self);
         make.height.mas_equalTo(ToolBarHeight);
     }];
@@ -61,21 +61,36 @@ - (void)makeConstraints{
     }];
     //返回按钮
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.left.mas_equalTo(Padding);
+        make.top.mas_equalTo(Padding);
+        if (@available(iOS 11.0, *)) {
+            make.left.mas_equalTo(self.mas_safeAreaLayoutGuideLeft).mas_offset(Padding);
+        } else {
+            make.left.mas_equalTo(Padding);
+        }
         make.bottom.mas_equalTo(-Padding);
         make.width.mas_equalTo(self.backButton.mas_height);
     }];
     //播放按钮
     [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.left.mas_equalTo(Padding);
+        make.top.mas_equalTo(Padding);
+        if (@available(iOS 11.0, *)) {
+            make.left.mas_equalTo(self.mas_safeAreaLayoutGuideLeft).mas_offset(Padding);
+        } else {
+            make.left.mas_equalTo(Padding);
+        }
         make.bottom.mas_equalTo(-Padding);
-        make.width.mas_equalTo(self.backButton.mas_height);
+        make.width.mas_equalTo(self.playButton.mas_height);
     }];
     //全屏按钮
     [self.fullButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.bottom.mas_equalTo(-Padding);
+        make.bottom.mas_equalTo(-Padding);
+        if (@available(iOS 11.0, *)) {
+            make.right.mas_equalTo(self.mas_safeAreaLayoutGuideRight).mas_offset(-Padding);
+        } else {
+            make.right.mas_equalTo(-Padding);
+        }
         make.top.mas_equalTo(Padding);
-        make.width.mas_equalTo(self.backButton.mas_height);
+        make.width.mas_equalTo(self.fullButton.mas_height);
     }];
     //当前播放时间
     [self.currentTimeLabel mas_makeConstraints:^(MASConstraintMaker *make) {

diff --git a/CLPlayer/CLPlayerView.m b/CLPlayer/CLPlayerView.m
@@ -773,7 +773,7 @@ - (void)fullScreenWithDirection:(UIInterfaceOrientation)direction{
         }
         self.frame = CGRectMake(0, 0, MIN([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height), MAX([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height));
     }
-    self.maskView.fullButton.selected     = YES;
+    self.maskView.fullButton.selected = YES;
     [self setNeedsLayout];
     [self layoutIfNeeded];
 }
@@ -796,7 +796,7 @@ - (void)originalscreen{
     self.frame = _customFarme;
     //还原到原有父类上
     [_fatherView addSubview:self];
-    self.maskView.fullButton.selected     = NO;
+    self.maskView.fullButton.selected = NO;
 }
 //MARK:JmoVxia---APP活动通知
 - (void)appDidEnterBackground:(NSNotification *)note{