Skip to content

Commit

Permalink
实现同一个源, 在不同的界面播放
Browse files Browse the repository at this point in the history
  • Loading branch information
changsanjiang committed Apr 13, 2018
1 parent 3c063ed commit 897b39b
Show file tree
Hide file tree
Showing 20 changed files with 375 additions and 356 deletions.
2 changes: 1 addition & 1 deletion SJVideoPlayer.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'SJVideoPlayer'
s.version = '2.0.5.2'
s.version = '2.0.6'
s.summary = 'video player.'
s.description = 'https://github.com/changsanjiang/SJVideoPlayer/blob/master/README.md'
s.homepage = 'https://github.com/changsanjiang/SJVideoPlayer'
Expand Down
2 changes: 1 addition & 1 deletion SJVideoPlayer/Resource/SJVideoPlayerFilmEditingConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
Exported video or whether the image needs to be uploaded.
导出出来的视频或图片是否需要上传
导出来的视频或图片是否需要上传
default is YES
*/
@property (nonatomic) BOOL resultNeedUpload;
Expand Down
Binary file modified SJVideoPlayerProject/.DS_Store
Binary file not shown.
40 changes: 20 additions & 20 deletions SJVideoPlayerProject/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ PODS:
- Masonry (1.1.0)
- Reachability (3.2)
- SJAttributesFactory (2.0.3.2)
- SJBaseVideoPlayer (1.0.7.3):
- SJBaseVideoPlayer (1.0.7.4):
- Masonry
- Reachability
- SJBaseVideoPlayer/Category (= 1.0.7.3)
- SJBaseVideoPlayer/Download (= 1.0.7.3)
- SJBaseVideoPlayer/GestureControl (= 1.0.7.3)
- SJBaseVideoPlayer/Header (= 1.0.7.3)
- SJBaseVideoPlayer/Model (= 1.0.7.3)
- SJBaseVideoPlayer/Present (= 1.0.7.3)
- SJBaseVideoPlayer/Registrar (= 1.0.7.3)
- SJBaseVideoPlayer/TimerControl (= 1.0.7.3)
- SJBaseVideoPlayer/Category (= 1.0.7.4)
- SJBaseVideoPlayer/Download (= 1.0.7.4)
- SJBaseVideoPlayer/GestureControl (= 1.0.7.4)
- SJBaseVideoPlayer/Header (= 1.0.7.4)
- SJBaseVideoPlayer/Model (= 1.0.7.4)
- SJBaseVideoPlayer/Present (= 1.0.7.4)
- SJBaseVideoPlayer/Registrar (= 1.0.7.4)
- SJBaseVideoPlayer/TimerControl (= 1.0.7.4)
- SJBorderLineView
- SJFullscreenPopGesture
- SJObserverHelper
Expand All @@ -21,7 +21,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Category (1.0.7.3):
- SJBaseVideoPlayer/Category (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -32,7 +32,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Download (1.0.7.3):
- SJBaseVideoPlayer/Download (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -43,7 +43,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/GestureControl (1.0.7.3):
- SJBaseVideoPlayer/GestureControl (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -54,7 +54,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Header (1.0.7.3):
- SJBaseVideoPlayer/Header (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -65,7 +65,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Model (1.0.7.3):
- SJBaseVideoPlayer/Model (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -76,7 +76,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Present (1.0.7.3):
- SJBaseVideoPlayer/Present (1.0.7.4):
- Masonry
- Reachability
- SJBaseVideoPlayer/Header
Expand All @@ -88,7 +88,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/Registrar (1.0.7.3):
- SJBaseVideoPlayer/Registrar (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand All @@ -99,7 +99,7 @@ PODS:
- SJUIFactory
- SJVideoPlayerAssetCarrier
- SJVolBrigControl
- SJBaseVideoPlayer/TimerControl (1.0.7.3):
- SJBaseVideoPlayer/TimerControl (1.0.7.4):
- Masonry
- Reachability
- SJBorderLineView
Expand Down Expand Up @@ -130,7 +130,7 @@ PODS:
- SJUIFactory (0.0.15):
- SJUIFactory/Category (= 0.0.15)
- SJUIFactory/Category (0.0.15)
- SJVideoPlayerAssetCarrier (1.1.2.1):
- SJVideoPlayerAssetCarrier (1.1.3):
- SJObserverHelper
- SJVolBrigControl (1.0.0):
- Masonry
Expand Down Expand Up @@ -182,7 +182,7 @@ SPEC CHECKSUMS:
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
SJAttributesFactory: 90847f2f6db06fa6ba8d5b7529105ba6d670af4a
SJBaseVideoPlayer: 3eefa1b80547ae82a8c33d7ddcdb80c0feb3dc4b
SJBaseVideoPlayer: 94c732fe9cf6c4552ac5dd259fef0834ed80ef52
SJBorderLineView: 5878e67fb57e812a2d5d029ca666068784b5448a
SJFullscreenPopGesture: f3d5f29be37a81a2bb399ca4807783fdf54490ad
SJLoadingView: c3ff03e4b363a5b6a3ba0634d6bb9ce2647faf07
Expand All @@ -192,7 +192,7 @@ SPEC CHECKSUMS:
SJScrollEntriesView: 6ad0595721a7152d9c3542ae5f6e1a27dec0f9b4
SJSlider: 6f82b519e918c4933f834a7badf1603c1b4fc224
SJUIFactory: 36f08c8bef27b2f6f123f7c3df1c1aeb1b750742
SJVideoPlayerAssetCarrier: 25ca23329127ae4851c7ebf307e81bbaf2fed972
SJVideoPlayerAssetCarrier: 1b77e0b7ae4cb60a611a13ad40a6e0c6a149fb10
SJVolBrigControl: dd639d187bf139b42d795e014edf372501352ea8
YYText: 5c461d709e24d55a182d1441c41dc639a18a4849

Expand Down
40 changes: 20 additions & 20 deletions SJVideoPlayerProject/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 897b39b

Please sign in to comment.