完善 Adapters注册通知时的处理

SJVideoPlayer.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
     s.name         = 'SJVideoPlayer'
-    s.version      = '2.2.2'
+    s.version      = '2.2.3'
     s.summary      = 'video player.'
     s.description  = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
     s.homepage     = 'https://github.com/changsanjiang/SJVideoPlayer'

SJVideoPlayer/Adapters/SJEdgeControlLayerAdapters.m

@@ -21,29 +21,32 @@
 #import "SJEdgeControlLayerAdapters.h"
 
 NS_ASSUME_NONNULL_BEGIN
-@implementation SJEdgeControlLayerAdapters
+@implementation SJEdgeControlLayerAdapters {
+    id _notifyToken;
+}
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if ( !self ) return nil;
+    [self _observeOrientationChangeOfStatusBarNotify];
     self.autoAdjustTopSpacing = YES;
     return self;
 }
 
-- (void)setAutoAdjustTopSpacing:(BOOL)autoAdjustTopSpacing {
-    _autoAdjustTopSpacing = autoAdjustTopSpacing;
-    if ( autoAdjustTopSpacing ) [self _observeOrientationChangeOfStatusBarNotify];
-    else [self _removeNotify];
+- (void)dealloc {
+    if ( _notifyToken ) [NSNotificationCenter.defaultCenter removeObserver:_notifyToken];
 }
 
 - (void)_observeOrientationChangeOfStatusBarNotify {
-    [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(_updateTopLayout:) name:UIApplicationWillChangeStatusBarOrientationNotification object:nil];
-}
-
-- (void)_removeNotify {
-    [NSNotificationCenter.defaultCenter removeObserver:self];
+    __weak typeof(self) _self = self;
+    _notifyToken = [NSNotificationCenter.defaultCenter addObserverForName:UIApplicationWillChangeStatusBarOrientationNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+        __strong typeof(_self) self = _self;
+        if ( !self ) return;
+        [self _updateTopLayout:note];
+    }];
 }
 
 - (void)_updateTopLayout:(nullable NSNotification *)notify {
+    if ( !_autoAdjustTopSpacing ) return;
     if ( !_topAdapter ) return;
     UIInterfaceOrientation orientation = notify?[notify.userInfo[UIApplicationStatusBarOrientationUserInfoKey] integerValue]: UIApplication.sharedApplication.statusBarOrientation;
     switch ( orientation ) {

SJVideoPlayer/SJEdgeControlLayer/ResourceLoader/UIView+SJVideoPlayerSetting.m

@@ -15,24 +15,26 @@ @interface SJVideoPlayerControlSettingRecorder ()
 
 @end
 
-@implementation SJVideoPlayerControlSettingRecorder
+@implementation SJVideoPlayerControlSettingRecorder {
+    id _notifyToken;
+}
 
 - (instancetype)initWithSettings:(void (^)(SJEdgeControlLayerSettings *))settings {
     self = [super init];
     if ( !self ) return nil;
     _settings = settings;
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(settingsPlayerNotification:)
-                                                 name:SJSettingsPlayerNotification
-                                               object:nil];
+
+    __weak typeof(self) _self = self;
+    _notifyToken = [NSNotificationCenter.defaultCenter addObserverForName:SJSettingsPlayerNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+        __strong typeof(_self) self = _self;
+        if ( !self ) return;
+        if ( self.settings ) self.settings(note.object);
+    }];
     return self;
 }
-- (void)settingsPlayerNotification:(NSNotification *)notifi {
-    if ( self.settings ) self.settings(notifi.object);
-}
 
 - (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    if ( _notifyToken ) [NSNotificationCenter.defaultCenter removeObserver:_notifyToken];
 }
 
 @end

SJVideoPlayer/SJFilmEditingControlLayer/SJFilmEditingControlLayer.m

@@ -90,7 +90,9 @@ @interface SJFilmEditingControlLayer ()
 @end
 NS_ASSUME_NONNULL_END
 
-@implementation SJFilmEditingControlLayer
+@implementation SJFilmEditingControlLayer {
+    id _notifyToken;
+}
 
 @synthesize btnContainerView = _btnContainerView;
 @synthesize screenshotBtn = _screenshotBtn;
@@ -108,12 +110,17 @@ - (instancetype)initWithFrame:(CGRect)frame {
     if ( !self ) return nil;
     [self _setupViews];
     SJFilmEditingControlLayer.update(^(SJFilmEditingSettings * _Nonnull settings) {});
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(settingsUpdateNotification:) name:SJFilmEditingSettingsUpdateNotification object:nil];
+    __weak typeof(self) _self = self;
+    _notifyToken = [NSNotificationCenter.defaultCenter addObserverForName:SJFilmEditingSettingsUpdateNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+        __strong typeof(_self) self = _self;
+        if ( !self ) return;
+        [self settingsUpdateNotification:note];
+    }];
     return self;
 }
 
 - (void)dealloc {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    if ( _notifyToken ) [[NSNotificationCenter defaultCenter] removeObserver:_notifyToken];
 
 #ifdef SJ_MAC
     NSLog(@"SJVideoPlayerLog: %d - %s", (int)__LINE__, __func__);

SJVideoPlayer/SJVideoPlayer.m

@@ -93,7 +93,7 @@ - (void)dealloc {
 }
 
 + (NSString *)version {
-    return @"v2.2.1";
+    return @"v2.2.3";
 }
 
 + (instancetype)player {