处理升级pod出现的警告

changsanjiang · Mar 26, 2018 · 901747d · 901747d
1 parent 643e8a3
commit 901747d
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 82 deletions.
diff --git a/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingControlView.m b/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingControlView.m
@@ -72,9 +72,9 @@ - (void)clickedBtn:(UIButton *)btn {
             _recordView.alpha = 0.001;
             [self addSubview:_recordView];
             [UIView animateWithDuration:0.25 animations:^{
-                _recordView.alpha = 1;
+                self->_recordView.alpha = 1;
             } completion:^(BOOL finished) {
-                [_recordView start];
+                [self->_recordView start];
             }];
         }
             break;
@@ -142,14 +142,14 @@ - (void)_showResultWithType:(SJVideoPlayerFilmEditingResultViewType)type{
     } completion:^(BOOL finished) {
         [UIView animateWithDuration:0.3 animations:^{
             self.backgroundColor = [UIColor clearColor];
-            _s_resultView.alpha = 1;
+            self->_s_resultView.alpha = 1;
         } completion:^(BOOL finished) {
-            [_s_resultView showResultWithCompletion:^{
+            [self->_s_resultView showResultWithCompletion:^{
                 if ( type == SJVideoPlayerFilmEditingResultViewType_Video ) {
-                    if ( self.recordCompleteExeBlock ) self.recordCompleteExeBlock(self, _recordView.currentTime);
+                    if ( self.recordCompleteExeBlock ) self.recordCompleteExeBlock(self, self->_recordView.currentTime);
                 }
-                if ( type == SJVideoPlayerFilmEditingResultViewType_Screenshot && [_resultShare.delegate respondsToSelector:@selector(successfulScreenshot:)] ) {
-                    [self.resultShare.delegate successfulScreenshot:_s_resultView.image];
+                if ( type == SJVideoPlayerFilmEditingResultViewType_Screenshot && [self->_resultShare.delegate respondsToSelector:@selector(successfulScreenshot:)] ) {
+                    [self.resultShare.delegate successfulScreenshot:self->_s_resultView.image];
                 }
             }];
         }];
@@ -238,8 +238,8 @@ - (void)_setupViews {
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [UIView animateWithDuration:0.25 animations:^{
-            [_screenshotBtn appear];
-            [_exportBtn appear];
+            [self->_screenshotBtn appear];
+            [self->_exportBtn appear];
         }];
     });
 }

diff --git a/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingRecordView.m b/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingRecordView.m
@@ -108,7 +108,7 @@ - (void)countDownRefresh:(NSTimer *)timer {
     if ( _currentTime == 3 ) {
         self.tipsLabel.text = self.tipsText;
         [UIView animateWithDuration:0.3 animations:^{
-            _recrodBtn.alpha = 1;
+            self->_recrodBtn.alpha = 1;
         }];
     }
 }

diff --git a/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingResultView.m b/SJVideoPlayer/ControlView/SJVideoPlayerFilmEditingResultView.m
@@ -112,8 +112,8 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     dispatch_async(dispatch_get_main_queue(), ^{
         if ( [keyPath isEqualToString:@"progress"] ) {
             float progress = self.uploader.progress;
-            _progressLabel.text = [NSString stringWithFormat:@"%@: %.0f%%", self.uploadingPrompt, progress * 100];
-            [_uploadProgressView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            self->_progressLabel.text = [NSString stringWithFormat:@"%@: %.0f%%", self.uploadingPrompt, progress * 100];
+            [self->_uploadProgressView mas_remakeConstraints:^(MASConstraintMaker *make) {
                 make.top.bottom.trailing.offset(0);
                 make.width.equalTo(self->_imageView).multipliedBy(1 - progress);
             }];
@@ -147,7 +147,7 @@ - (void)setItems:(NSArray<SJFilmEditingResultShareItem *> *)items {
                 make.top.bottom.offset(0);
             }];
         }
-        else if ( idx != (int)_items.count - 1 ) {
+        else if ( idx != (int)self->_items.count - 1 ) {
             UIButton *beforeBtn = self.itemsContainerView.subviews[(int)idx - 1];
             [btn mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.leading.equalTo(beforeBtn.mas_trailing).offset(20);

diff --git a/SJVideoPlayer/LightweightControlView/SJLightweightTopControlView.m b/SJVideoPlayer/LightweightControlView/SJLightweightTopControlView.m
@@ -99,15 +99,15 @@ - (void)setTopItems:(NSArray<SJLightweightTopItem *> * __nullable)topItems {
     NSMutableArray<SJLightweightTopTmp *> *observerItemsM = [NSMutableArray array];
     [topItems enumerateObjectsUsingBlock:^(SJLightweightTopItem * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         UIButton *btn = [SJUIButtonFactory buttonWithImageName:obj.imageName target:self sel:@selector(clickedTopItem:) tag:idx];
-        [_itemsContainerView addSubview:btn];
+        [self->_itemsContainerView addSubview:btn];
         if ( idx == 0 ) {
             [btn mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.leading.bottom.offset(0);
                 make.size.offset(44);
             }];
         }
         else {
-            UIButton *beforeBtn = _itemsContainerView.subviews[(int)idx - 1];
+            UIButton *beforeBtn = self->_itemsContainerView.subviews[(int)idx - 1];
             [btn mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.size.bottom.equalTo(beforeBtn);
                 make.leading.equalTo(beforeBtn.mas_trailing);

diff --git a/SJVideoPlayer/SJLightweightControlLayer.m b/SJVideoPlayer/SJLightweightControlLayer.m
@@ -112,57 +112,57 @@ - (void)installedControlViewToVideoPlayer:(__kindof SJBaseVideoPlayer *)videoPla
 
 - (void)controlLayerNeedAppear:(nonnull __kindof SJBaseVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
-        if ( videoPlayer.isFullScreen ) [_backBtn appear];
+        if ( videoPlayer.isFullScreen ) [self->_backBtn appear];
 
         if ( SJVideoPlayerPlayState_PlayFailed == videoPlayer.state ) {
-            [_centerControlView failedState];
-            [_centerControlView appear];
-            [_topControlView appear];
-            [_leftControlView disappear];
-            [_bottomControlView disappear];
+            [self->_centerControlView failedState];
+            [self->_centerControlView appear];
+            [self->_topControlView appear];
+            [self->_leftControlView disappear];
+            [self->_bottomControlView disappear];
         }
         else {
-            [_topControlView appear];
-            if ( videoPlayer.isFullScreen ) [_leftControlView appear];
-            else [_leftControlView disappear];
-            [_bottomControlView appear];
-            [_bottomSlider disappear];
+            [self->_topControlView appear];
+            if ( videoPlayer.isFullScreen ) [self->_leftControlView appear];
+            else [self->_leftControlView disappear];
+            [self->_bottomControlView appear];
+            [self->_bottomSlider disappear];
 
 
             // top
             if ( videoPlayer.isPlayOnScrollView && !videoPlayer.isFullScreen ) {
-                if ( videoPlayer.URLAsset.alwaysShowTitle ) [_topControlView appear];
-                else [_topControlView disappear];
+                if ( videoPlayer.URLAsset.alwaysShowTitle ) [self->_topControlView appear];
+                else [self->_topControlView disappear];
             }
-            else [_topControlView appear];
+            else [self->_topControlView appear];
 
-            [_bottomControlView appear];
+            [self->_bottomControlView appear];
 
-            if ( videoPlayer.isFullScreen ) [_leftControlView appear];
-            else [_leftControlView disappear];  // 如果是小屏, 则不显示锁屏按钮
+            if ( videoPlayer.isFullScreen ) [self->_leftControlView appear];
+            else [self->_leftControlView disappear];  // 如果是小屏, 则不显示锁屏按钮
 
-            [_bottomSlider disappear];
+            [self->_bottomSlider disappear];
 
-            if ( videoPlayer.state != SJVideoPlayerPlayState_PlayEnd ) [_centerControlView disappear];
+            if ( videoPlayer.state != SJVideoPlayerPlayState_PlayEnd ) [self->_centerControlView disappear];
         }
     }, nil);
 }
 
 - (void)controlLayerNeedDisappear:(nonnull __kindof SJBaseVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
-        if ( videoPlayer.isFullScreen ) [_backBtn disappear];
+        if ( videoPlayer.isFullScreen ) [self->_backBtn disappear];
 
         if ( SJVideoPlayerPlayState_PlayFailed != videoPlayer.state ) {
-            [_topControlView disappear];
-            [_bottomControlView disappear];
-            if ( !videoPlayer.isLockedScreen ) [_leftControlView disappear];
-            else [_leftControlView appear];
-            [_bottomSlider appear];
+            [self->_topControlView disappear];
+            [self->_bottomControlView disappear];
+            if ( !videoPlayer.isLockedScreen ) [self->_leftControlView disappear];
+            else [self->_leftControlView appear];
+            [self->_bottomSlider appear];
         }
         else {
-            [_topControlView appear];
-            [_leftControlView disappear];
-            [_bottomControlView disappear];
+            [self->_topControlView appear];
+            [self->_leftControlView disappear];
+            [self->_bottomControlView disappear];
         }
     }, nil);
 }
@@ -316,8 +316,8 @@ - (void)unlockedVideoPlayer:(SJVideoPlayer *)videoPlayer {
 
 - (void)tappedPlayerOnTheLockedState:(__kindof SJBaseVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
-        if ( _leftControlView.appearState ) [_leftControlView disappear];
-        else [_leftControlView appear];
+        if ( self->_leftControlView.appearState ) [self->_leftControlView disappear];
+        else [self->_leftControlView appear];
     }, nil);
     if ( _leftControlView.appearState ) [_lockStateTappedTimerControl start];
     else [_lockStateTappedTimerControl clear];

diff --git a/SJVideoPlayer/SJVideoPlayerDefaultControlView.m b/SJVideoPlayer/SJVideoPlayerDefaultControlView.m
@@ -198,7 +198,7 @@ - (void)_controlViewSetupView {
 
     [_moreSettingsView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.trailing.offset(0);
-        make.size.mas_offset(_moreSettingsView.intrinsicContentSize);
+        make.size.mas_offset(self->_moreSettingsView.intrinsicContentSize);
     }];
 
     [_loadingView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -294,13 +294,13 @@ - (void)setEnableFilmEditing:(BOOL)enableFilmEditing {
 - (void)exitFilmEditingCompletion:(void(^ __nullable)(SJVideoPlayerDefaultControlView *))completion {
     if ( _filmEditingControlView ) {
         UIView_Animations(CommonAnimaDuration, ^{
-            [_filmEditingControlView disappear];
+            [self->_filmEditingControlView disappear];
         }, ^{
             self.videoPlayer.disableRotation = NO;
             self.videoPlayer.disableGestureTypes = SJDisablePlayerGestureTypes_None;
             [self.videoPlayer play];
-            [_filmEditingControlView removeFromSuperview];
-            _filmEditingControlView = nil;  // clear
+            [self->_filmEditingControlView removeFromSuperview];
+            self->_filmEditingControlView = nil;  // clear
             if ( completion ) completion(self);
         });
     }
@@ -380,12 +380,12 @@ - (void)topControlView:(SJVideoPlayerTopControlView *)view clickedBtnTag:(SJVide
                 [self addSubview:_moreSettingsView];
                 [_moreSettingsView mas_makeConstraints:^(MASConstraintMaker *make) {
                     make.top.trailing.offset(0);
-                    make.size.mas_offset(_moreSettingsView.intrinsicContentSize);
+                    make.size.mas_offset(self->_moreSettingsView.intrinsicContentSize);
                 }];
             }
             [_videoPlayer controlLayerNeedDisappear];
             UIView_Animations(CommonAnimaDuration, ^{
-                [_moreSettingsView appear];
+                [self->_moreSettingsView appear];
             }, nil);
         }
             break;
@@ -909,58 +909,58 @@ - (void)loadCompletion:(SJVideoPlayer *)videoPlayer {
 - (void)controlLayerNeedAppear:(SJVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
         if ( SJVideoPlayerPlayState_PlayFailed == videoPlayer.state ) {
-            [_centerControlView failedState];
-            [_centerControlView appear];
-            [_topControlView appear];
-            [_leftControlView disappear];
-            [_bottomControlView disappear];
-            [_rightControlView disappear];
+            [self->_centerControlView failedState];
+            [self->_centerControlView appear];
+            [self->_topControlView appear];
+            [self->_leftControlView disappear];
+            [self->_bottomControlView disappear];
+            [self->_rightControlView disappear];
         }
         else {
             // top
             if ( videoPlayer.isPlayOnScrollView && !videoPlayer.isFullScreen ) {
-                if ( videoPlayer.URLAsset.alwaysShowTitle ) [_topControlView appear];
-                else [_topControlView disappear];
+                if ( videoPlayer.URLAsset.alwaysShowTitle ) [self->_topControlView appear];
+                else [self->_topControlView disappear];
             }
-            else [_topControlView appear];
+            else [self->_topControlView appear];
 
-            [_bottomControlView appear];
+            [self->_bottomControlView appear];
 
             if ( videoPlayer.isFullScreen ) {
-                [_leftControlView appear];
-                [_rightControlView appear];
+                [self->_leftControlView appear];
+                [self->_rightControlView appear];
             }
             else {
-                [_leftControlView disappear];  // 如果是小屏, 则不显示锁屏按钮
-                [_rightControlView disappear];
+                [self->_leftControlView disappear];  // 如果是小屏, 则不显示锁屏按钮
+                [self->_rightControlView disappear];
             }
-            [_bottomSlider disappear];
+            [self->_bottomSlider disappear];
 
-            if ( videoPlayer.state != SJVideoPlayerPlayState_PlayEnd ) [_centerControlView disappear];
+            if ( videoPlayer.state != SJVideoPlayerPlayState_PlayEnd ) [self->_centerControlView disappear];
         }
 
-        if ( _moreSettingsView.appearState ) [_moreSettingsView disappear];
-        if ( _moreSecondarySettingView.appearState ) [_moreSecondarySettingView disappear];
+        if ( self->_moreSettingsView.appearState ) [self->_moreSettingsView disappear];
+        if ( self->_moreSecondarySettingView.appearState ) [self->_moreSecondarySettingView disappear];
     }, nil);
 }
 
 /// 隐藏边缘控制视图
 - (void)controlLayerNeedDisappear:(SJVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
         if ( SJVideoPlayerPlayState_PlayFailed != videoPlayer.state ) {
-            [_topControlView disappear];
-            [_bottomControlView disappear];
-            [_rightControlView disappear];
-            if ( !videoPlayer.isLockedScreen ) [_leftControlView disappear];
-            else [_leftControlView appear];
-            [_previewView disappear];
-            [_bottomSlider appear];
+            [self->_topControlView disappear];
+            [self->_bottomControlView disappear];
+            [self->_rightControlView disappear];
+            if ( !videoPlayer.isLockedScreen ) [self->_leftControlView disappear];
+            else [self->_leftControlView appear];
+            [self->_previewView disappear];
+            [self->_bottomSlider appear];
         }
         else {
-            [_topControlView appear];
-            [_leftControlView disappear];
-            [_bottomControlView disappear];
-            [_rightControlView disappear];
+            [self->_topControlView appear];
+            [self->_leftControlView disappear];
+            [self->_bottomControlView disappear];
+            [self->_rightControlView disappear];
         }
     }, nil);
 }
@@ -994,8 +994,8 @@ - (void)unlockedVideoPlayer:(SJVideoPlayer *)videoPlayer {
 /// 如果播放器锁屏, 当用户点击的时候, 这个方法会触发
 - (void)tappedPlayerOnTheLockedState:(__kindof SJBaseVideoPlayer *)videoPlayer {
     UIView_Animations(CommonAnimaDuration, ^{
-        if ( _leftControlView.appearState ) [_leftControlView disappear];
-        else [_leftControlView appear];
+        if ( self->_leftControlView.appearState ) [self->_leftControlView disappear];
+        else [self->_leftControlView appear];
     }, nil);
     if ( _leftControlView.appearState ) [_lockStateTappedTimerControl start];
     else [_lockStateTappedTimerControl clear];

diff --git a/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate