处理 Xcode_10.2 出现的警告

changsanjiang · Mar 26, 2019 · 58e00b3 · 58e00b3
1 parent 83741b0
commit 58e00b3
Show file tree

Hide file tree

Showing 20 changed files with 228 additions and 244 deletions.
diff --git a/SJVideoPlayer.podspec b/SJVideoPlayer.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
     s.name         = 'SJVideoPlayer'
-    s.version      = '2.5.1'
+    s.version      = '2.5.2'
     s.summary      = 'video player.'
     s.description  = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
     s.homepage     = 'https://github.com/changsanjiang/SJVideoPlayer'
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
     s.source       = { :git => 'https://github.com/changsanjiang/SJVideoPlayer.git', :tag => "v#{s.version}" }
     s.requires_arc = true
     s.dependency 'Masonry'
-    s.dependency 'SJBaseVideoPlayer', '>= 2.3.2'
+    s.dependency 'SJBaseVideoPlayer', '>= 2.3.3'
     s.dependency 'SJAttributesFactory'
 
     s.source_files = 'SJVideoPlayer/*.{h,m}'

diff --git a/SJVideoPlayer/Adapters/Core/SJEdgeControlButtonItem.h b/SJVideoPlayer/Adapters/Core/SJEdgeControlButtonItem.h
@@ -21,9 +21,9 @@ UIKIT_STATIC_INLINE SJEdgeInsets SJEdgeInsetsMake(CGFloat front, CGFloat rear) {
     return (SJEdgeInsets){front, rear};
 }
 
+NS_ASSUME_NONNULL_BEGIN
 UIKIT_EXTERN NSNotificationName const SJEdgeControlButtonItemPerformedActionNotification;
 
-NS_ASSUME_NONNULL_BEGIN
 @interface SJEdgeControlButtonItem : NSObject
 /// 49 * 49
 - (instancetype)initWithImage:(nullable UIImage *)image

diff --git a/SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m b/SJVideoPlayer/SJEdgeControlLayer/SJEdgeControlLayer.m
@@ -479,7 +479,7 @@ - (void)_updatePlaybackProgressFor_BottomAdapterWithCurrentTime:(NSTimeInterval)
         if ( !slider.isDragging ) slider.value = c;
     }
 
-    if ( !sj_view_isDisappeared(_bottomProgressSlider) ) {
+    if ( _bottomProgressSlider && !sj_view_isDisappeared(_bottomProgressSlider) ) {
         _bottomProgressSlider.value = c;
         _bottomProgressSlider.maxValue = d;
     }
@@ -574,22 +574,26 @@ - (void)setHideBottomProgressSlider:(BOOL)hideBottomProgressSlider {
 
     _hideBottomProgressSlider = hideBottomProgressSlider;
     dispatch_async(dispatch_get_main_queue(), ^{
-        if ( self->_hideBottomProgressSlider ) {
-            if ( self->_bottomProgressSlider ) {
-                [self->_bottomProgressSlider removeFromSuperview];
-                self->_bottomProgressSlider = nil;
-            }
+        [self _showOrRemoveBottomProgressSlider];
+    });
+}
+
+- (void)_showOrRemoveBottomProgressSlider {
+    if ( _hideBottomProgressSlider || _videoPlayer.playbackType == SJMediaPlaybackTypeLIVE ) {
+        if ( _bottomProgressSlider ) {
+            [_bottomProgressSlider removeFromSuperview];
+            _bottomProgressSlider = nil;
         }
-        else {
-            if ( !self->_bottomProgressSlider ) {
-                [self.controlView addSubview:self.bottomProgressSlider];
-                [self->_bottomProgressSlider mas_makeConstraints:^(MASConstraintMaker *make) {
-                    make.left.bottom.right.offset(0);
-                    make.height.offset(1);
-                }];
-            }
+    }
+    else {
+        if ( !_bottomProgressSlider ) {
+            [self.controlView addSubview:self.bottomProgressSlider];
+            [_bottomProgressSlider mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.bottom.right.offset(0);
+                make.height.offset(1);
+            }];
         }
-    });
+    }
 }
 
 #pragma mark - right
@@ -860,7 +864,6 @@ - (void)videoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer playbackTypeLoaded
             durationTimeItem.hidden = YES;
             progressItem.hidden = YES;
             liveItem.hidden = NO;
-            _bottomProgressSlider.hidden = YES;
         }
             break;
         case SJMediaPlaybackTypeUnknown:
@@ -871,12 +874,12 @@ - (void)videoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer playbackTypeLoaded
             durationTimeItem.hidden = NO;
             progressItem.hidden = NO;
             liveItem.hidden = YES;
-            _bottomProgressSlider.hidden = self.hideBottomProgressSlider;
             [_bottomAdapter removeItemForTag:SJEdgeControlLayerBottomItem_LIVEText];
         }
             break;
     }
     [self.bottomAdapter reload];
+    [self _showOrRemoveBottomProgressSlider];
 }
 
 - (void)videoPlayer:(__kindof SJBaseVideoPlayer *)videoPlayer statusDidChanged:(SJVideoPlayerPlayStatus)status {

diff --git a/SJVideoPlayer/SJFilmEditingControlLayer/Core/Model/SJVideoPlayerFilmEditingConfig.h b/SJVideoPlayer/SJFilmEditingControlLayer/Core/Model/SJVideoPlayerFilmEditingConfig.h
@@ -10,6 +10,7 @@
 #import "SJVideoPlayerFilmEditingCommonHeader.h"
 #import "SJFilmEditingResultShareItem.h"
 
+NS_ASSUME_NONNULL_BEGIN
 @protocol SJVideoPlayerFilmEditingResult, SJVideoPlayerFilmEditingResultUpload;
 
 @class SJBaseVideoPlayer;
@@ -53,3 +54,4 @@
 /// 导出成功后, 保存到相册
 @property (nonatomic) BOOL saveResultToAlbumWhenExportSuccess; // default is NO
 @end
+NS_ASSUME_NONNULL_END
diff --git a/SJVideoPlayer/SJFilmEditingControlLayer/Core/Model/SJVideoPlayerFilmEditingConfig.m b/SJVideoPlayer/SJFilmEditingControlLayer/Core/Model/SJVideoPlayerFilmEditingConfig.m
@@ -8,6 +8,7 @@
 
 #import "SJVideoPlayerFilmEditingConfig.h"
 
+NS_ASSUME_NONNULL_BEGIN
 @implementation SJVideoPlayerFilmEditingConfig
 - (void)config:(SJVideoPlayerFilmEditingConfig *)otherConfig {
     self.shouldStartWhenUserSelectedAnOperation = otherConfig.shouldStartWhenUserSelectedAnOperation;
@@ -21,3 +22,4 @@ - (void)config:(SJVideoPlayerFilmEditingConfig *)otherConfig {
     self.saveResultToAlbumWhenExportSuccess = otherConfig.saveResultToAlbumWhenExportSuccess;
 }
 @end
+NS_ASSUME_NONNULL_END
diff --git a/SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader/SJFilmEditingSettings.h b/SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader/SJFilmEditingSettings.h
@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
 extern NSNotificationName const SJFilmEditingSettingsUpdatedNotification;
 @class UIImage;
 
@@ -95,3 +97,4 @@ extern NSString *const SJFilmEditing_uploadSuccessText;
 @interface SJFilmEditingSettingsUpdatedObserver : NSObject
 @property (nonatomic, copy, nullable) void(^updatedExeBlock)(SJFilmEditingSettings *settings);
 @end
+NS_ASSUME_NONNULL_END
diff --git a/SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader/SJFilmEditingSettings.m b/SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader/SJFilmEditingSettings.m
@@ -9,6 +9,7 @@
 #import "SJFilmEditingSettings.h"
 #import "SJFilmEditingLoader.h"
 
+NS_ASSUME_NONNULL_BEGIN
 NSNotificationName const SJFilmEditingSettingsUpdatedNotification = @"SJFilmEditingSettingsUpdatedNotification";
 NSString *const SJFilmEditing_cancelText = @"SJFilmEditing_cancelText";
 NSString *const SJFilmEditing_doneText = @"SJFilmEditing_doneText";
@@ -107,3 +108,4 @@ - (void)dealloc {
     [NSNotificationCenter.defaultCenter removeObserver:_updatedToken];
 }
 @end
+NS_ASSUME_NONNULL_END