Fix refresh some problem.

changsanjiang · Mar 5, 2018 · 144e9d4 · 144e9d4
1 parent e5f0caa
commit 144e9d4
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 56 deletions.
diff --git a/Project/.DS_Store b/Project/.DS_Store
diff --git a/Project/Podfile.lock b/Project/Podfile.lock
@@ -15,7 +15,7 @@ PODS:
   - SJUIFactory (0.0.15):
     - SJUIFactory/Category (= 0.0.15)
   - SJUIFactory/Category (0.0.15)
-  - SJVideoPlayerAssetCarrier (1.0.7)
+  - SJVideoPlayerAssetCarrier (1.0.7.2)
   - SJVolBrigControl (0.0.4):
     - Masonry
     - SJBorderLineView
@@ -43,7 +43,7 @@ SPEC CHECKSUMS:
   SJOrentationObserver: aacbb5eb1187b4b0180e409cc9358b0bbe5f5758
   SJPrompt: eaecd94f2055a12d25090967dbad3f21da011626
   SJUIFactory: 36f08c8bef27b2f6f123f7c3df1c1aeb1b750742
-  SJVideoPlayerAssetCarrier: 19650c24e18e4287ca696481a428946e9855496a
+  SJVideoPlayerAssetCarrier: 24f6ceb58a0601ecac38e36a442b557358436276
   SJVolBrigControl: c8f8a6e8d56ff58bcebd2b77ec4b485b1802fff9
 
 PODFILE CHECKSUM: ed87ebd55153c180bdddc27697dfd8d72f873c99

diff --git a/Project/Pods/Manifest.lock b/Project/Pods/Manifest.lock
diff --git a/Project/Pods/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier.h b/Project/Pods/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier.h
diff --git a/Project/Pods/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier.m b/Project/Pods/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier/SJVideoPlayerAssetCarrier.m
diff --git a/Project/Project.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/Project/Project.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SJBaseVideoPlayer.podspec b/SJBaseVideoPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = 'SJBaseVideoPlayer'
-s.version      = '1.0.1.3'
+s.version      = '1.0.1.4'
 s.summary      = 'video player.'
 s.description  = 'https://github.com/changsanjiang/SJBaseVideoPlayer/blob/master/README.md'
 s.homepage     = 'https://github.com/changsanjiang/SJBaseVideoPlayer'

diff --git a/SJBaseVideoPlayer/SJBaseVideoPlayer.m b/SJBaseVideoPlayer/SJBaseVideoPlayer.m
@@ -108,6 +108,7 @@ - (void)dealloc {
 #ifdef DEBUG
     NSLog(@"%zd - %s", __LINE__, __func__);
 #endif
+    if ( self.assetDeallocExeBlock ) self.assetDeallocExeBlock(self);
     [_presentView removeFromSuperview];
     [self stop];
 }
@@ -826,8 +827,9 @@ - (void)playWithURL:(NSURL *)playURL jumpedToTime:(NSTimeInterval)time {
 
 - (void)refresh {
     if ( !self.asset ) return;
-    [self.URLAsset setValue:[[SJVideoPlayerAssetCarrier alloc] initWithAssetURL:self.asset.assetURL beginTime:self.asset.beginTime indexPath:self.asset.indexPath superviewTag:self.asset.superviewTag scrollViewIndexPath:self.asset.scrollViewIndexPath scrollViewTag:self.asset.scrollViewTag scrollView:self.asset.scrollView rootScrollView:self.asset.rootScrollView] forKey:kSJVideoPlayerAssetKey];
-    self.asset = [self.URLAsset valueForKey:kSJVideoPlayerAssetKey];
+    self.state = SJVideoPlayerPlayState_Unknown;
+    [self.asset refreshAVPlayer];
+    self.presentView.player = self.asset.player;
 }
 
 - (void)setAssetDeallocExeBlock:(void (^)(__kindof SJBaseVideoPlayer * _Nonnull))assetDeallocExeBlock {