v1.4.5

changsanjiang · Feb 1, 2018 · d0639ee · d0639ee
1 parent efed1ad
commit d0639ee
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/SJVideoPlayer/Model/SJVideoPlayerURLAsset.h b/SJVideoPlayer/Model/SJVideoPlayerURLAsset.h
@@ -48,4 +48,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+extern NSString * const kSJVideoPlayerAssetKey;
+
 NS_ASSUME_NONNULL_END
diff --git a/SJVideoPlayer/Model/SJVideoPlayerURLAsset.m b/SJVideoPlayer/Model/SJVideoPlayerURLAsset.m
@@ -77,3 +77,5 @@ - (instancetype)initWithAssetURL:(NSURL *)assetURL
 }
 
 @end
+
+NSString * const kSJVideoPlayerAssetKey = @"asset";
diff --git a/SJVideoPlayer/Player/SJVideoPlayer.m b/SJVideoPlayer/Player/SJVideoPlayer.m
@@ -1017,7 +1017,9 @@ - (void)controlView:(SJVideoPlayerControlView *)controlView clickedBtnTag:(SJVid
             _sjAnima(^{
                 if ( !self.isLockedScrren ) self.hideControl = NO;
             });
-            [self play];
+            [self jumpedToTime:0 completionHandler:^(BOOL finished) {
+                [self play];
+            }];
         }
             break;
         case SJVideoPlayControlViewTag_Preview: {
@@ -1316,7 +1318,7 @@ @implementation SJVideoPlayer (Play)
 
 - (void)setURLAsset:(SJVideoPlayerURLAsset *)URLAsset {
     objc_setAssociatedObject(self, @selector(URLAsset), URLAsset, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    [self setAsset:[URLAsset valueForKey:@"asset"]];
+    [self setAsset:[URLAsset valueForKey:kSJVideoPlayerAssetKey]];
 }
 
 - (SJVideoPlayerURLAsset *)URLAsset {
@@ -1329,7 +1331,7 @@ - (void)playWithURL:(NSURL *)playURL {
 
 // unit: sec.
 - (void)playWithURL:(NSURL *)playURL jumpedToTime:(NSTimeInterval)time {
-    self.asset = [[SJVideoPlayerAssetCarrier alloc] initWithAssetURL:playURL beginTime:time];
+    self.URLAsset = [[SJVideoPlayerURLAsset alloc] initWithAssetURL:playURL beginTime:time];
 }
 
 - (void)setAssetURL:(NSURL *)assetURL {

diff --git a/SJVideoPlayerProject/.DS_Store b/SJVideoPlayerProject/.DS_Store
diff --git a/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...layerProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...oPlayerProject/SJVideoPlayerProject/TableView_Demo/Controller/SJVideoListViewController.m b/...oPlayerProject/SJVideoPlayerProject/TableView_Demo/Controller/SJVideoListViewController.m
@@ -152,7 +152,7 @@ - (void)clickedPlayOnTabCell:(SJVideoListTableViewCell *)cell playerParentView:(
 
     // set asset
     _videoPlayer.URLAsset =
-    [[SJVideoPlayerURLAsset alloc] initWithAssetURL:[NSURL URLWithString:@"http://hjzq54sgy3st45j8hub.exp.bcevod.com/mda-hkhjsv8110uk6kby/mda-hkhjsv8110uk6kby.m3u8"]
+    [[SJVideoPlayerURLAsset alloc] initWithAssetURL:[NSURL URLWithString:cell.model.playURLStr]
                                              scrollView:self.tableView
                                               indexPath:[self.tableView indexPathForCell:cell]
                                            superviewTag:playerParentView.tag];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,4 +48,6 @@ NS_ASSUME_NONNULL_BEGIN

		@end

		extern NSString * const kSJVideoPlayerAssetKey;

		NS_ASSUME_NONNULL_END
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,3 +77,5 @@ - (instancetype)initWithAssetURL:(NSURL *)assetURL
		}

		@end

		NSString * const kSJVideoPlayerAssetKey = @"asset";