Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #427

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

update #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c4ad8de
slider 添加xib支持
changsanjiang Dec 4, 2020
752bc74
Merge pull request #368 from liangzcn/master
changsanjiang Dec 4, 2020
e350145
update float View controller
changsanjiang Dec 4, 2020
2c3490d
Update SJScrollingTextMarqueeView.m
changsanjiang Dec 4, 2020
0d7ccfd
update subpods
changsanjiang Dec 9, 2020
2ec771e
Update SJUITableViewDemoViewController9.m
changsanjiang Dec 10, 2020
c7d66c3
Release 3.2.9
changsanjiang Dec 10, 2020
0b94895
Merge pull request #1 from changsanjiang/master
bigcoww Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Example/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ target 'SJVideoPlayer_Example' do
# pod 'SJBaseVideoPlayer/IJKPlayer', :path => '../../SJBaseVideoPlayer'
#
## 切换为 Aliplayer, 详见: https://github.com/changsanjiang/SJVideoPlayer/wiki/Use-AliPlayer
# pod 'SJBaseVideoPlayer/AliPlayer', :path => '../../SJBaseVideoPlayer'
# pod 'SJBaseVideoPlayer/AliPlayer'#, :path => '../../SJBaseVideoPlayer'
#
## 切换为 AliVodPlayer, 详见: https://github.com/changsanjiang/SJVideoPlayer/wiki/Use-AliVodPlayer
# pod 'SJBaseVideoPlayer/AliVodPlayer', :path => '../../SJBaseVideoPlayer'
Expand Down
48 changes: 24 additions & 24 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,40 @@ PODS:
- SDWebImage (5.9.5):
- SDWebImage/Core (= 5.9.5)
- SDWebImage/Core (5.9.5)
- SJBaseVideoPlayer (3.4.3):
- SJBaseVideoPlayer (3.4.5):
- Masonry
- SJBaseVideoPlayer/AVPlayer (= 3.4.3)
- SJBaseVideoPlayer/Common (= 3.4.3)
- SJBaseVideoPlayer/AVPlayer (= 3.4.5)
- SJBaseVideoPlayer/Common (= 3.4.5)
- SJUIKit/AttributesFactory (>= 0.0.0.38)
- SJUIKit/ObserverHelper
- SJUIKit/Queues
- SJUIKit/SQLite3
- SJBaseVideoPlayer/AVPlayer (3.4.3):
- SJBaseVideoPlayer/AVPlayer (3.4.5):
- Masonry
- SJBaseVideoPlayer/Common
- SJUIKit/AttributesFactory (>= 0.0.0.38)
- SJUIKit/ObserverHelper
- SJUIKit/Queues
- SJUIKit/SQLite3
- SJBaseVideoPlayer/Common (3.4.3):
- SJBaseVideoPlayer/Common (3.4.5):
- Masonry
- SJBaseVideoPlayer/ResourceLoader
- SJUIKit/AttributesFactory (>= 0.0.0.38)
- SJUIKit/ObserverHelper
- SJUIKit/Queues
- SJUIKit/SQLite3
- SJBaseVideoPlayer/ResourceLoader (3.4.3):
- SJBaseVideoPlayer/ResourceLoader (3.4.5):
- Masonry
- SJUIKit/AttributesFactory (>= 0.0.0.38)
- SJUIKit/ObserverHelper
- SJUIKit/Queues
- SJUIKit/SQLite3
- SJFullscreenPopGesture/ObjC (1.5.4)
- SJMediaCacheServer (1.3.0):
- SJMediaCacheServer (1.3.2):
- KTVCocoaHTTPServer
- SJMediaCacheServer/Core (= 1.3.0)
- SJMediaCacheServer/Core (= 1.3.2)
- SJUIKit/SQLite3
- SJMediaCacheServer/Core (1.3.0):
- SJMediaCacheServer/Core (1.3.2):
- KTVCocoaHTTPServer
- SJUIKit/SQLite3
- SJPlaybackListController (0.0.5):
Expand Down Expand Up @@ -108,21 +108,21 @@ PODS:
- SJUIKit/UIMaker (0.0.0.51):
- SJUIKit/UIMaker/Core (= 0.0.0.51)
- SJUIKit/UIMaker/Core (0.0.0.51)
- SJVideoPlayer (3.2.8):
- SJBaseVideoPlayer (>= 3.4.3)
- SJVideoPlayer/Common (= 3.2.8)
- SJVideoPlayer/ControlLayers (= 3.2.8)
- SJVideoPlayer/ResourceLoader (= 3.2.8)
- SJVideoPlayer/Common (3.2.8):
- SJVideoPlayer (3.2.9):
- SJBaseVideoPlayer (>= 3.4.5)
- SJVideoPlayer/Common (= 3.2.9)
- SJVideoPlayer/ControlLayers (= 3.2.9)
- SJVideoPlayer/ResourceLoader (= 3.2.9)
- SJVideoPlayer/Common (3.2.9):
- Masonry
- SJBaseVideoPlayer (>= 3.4.3)
- SJBaseVideoPlayer (>= 3.4.5)
- SJUIKit/AttributesFactory
- SJVideoPlayer/ResourceLoader
- SJVideoPlayer/ControlLayers (3.2.8):
- SJBaseVideoPlayer (>= 3.4.3)
- SJVideoPlayer/ControlLayers (3.2.9):
- SJBaseVideoPlayer (>= 3.4.5)
- SJVideoPlayer/Common
- SJVideoPlayer/ResourceLoader (3.2.8):
- SJBaseVideoPlayer (>= 3.4.3)
- SJVideoPlayer/ResourceLoader (3.2.9):
- SJBaseVideoPlayer (>= 3.4.5)
- YYModel (1.0.4)

DEPENDENCIES:
Expand Down Expand Up @@ -163,15 +163,15 @@ SPEC CHECKSUMS:
Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
SDWebImage: 0b2ba0d56479bf6a45ecddbfd5558bea93150d25
SJBaseVideoPlayer: 7af90105490cc751c2ddbfa615c943f88b256216
SJBaseVideoPlayer: 0ecccbae3bf6cad55187113247ea88f711bef276
SJFullscreenPopGesture: 7be57b1014cb77f4b7c1e6df5e797da6d05dc75d
SJMediaCacheServer: 3badbaedb7794c10226b2ab97a1f81bc71105ffb
SJMediaCacheServer: 4e9203033c21d742b6030e7704aeb61dc38840cd
SJPlaybackListController: e135c789fcd63d63a62d5e2e2965ab1e6d52a2bd
SJRouter: a866e7884fc9219bed523be0a0318c3a84e85022
SJUIKit: bdf86af3648e70483c57e2bfe2fcc7531337fa54
SJVideoPlayer: 0cbef06cd6c762c4d672a664a87164ed430972dd
SJVideoPlayer: 3cccc263bc03edccedc1b2be887b903e3dfca106
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30

PODFILE CHECKSUM: 6267c2a571b00c2bc5ea1b3ffccbc66b168e68be
PODFILE CHECKSUM: 29e274b3a7b747f79a95901fcf2d39e60d7aef9d

COCOAPODS: 1.10.0
6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/SJVideoPlayer.podspec.json
View file
Open in desktop

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

48 changes: 24 additions & 24 deletions Example/Pods/Manifest.lock
View file
Open in desktop

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

9 changes: 0 additions & 9 deletions Example/Pods/SJBaseVideoPlayer/SJBaseVideoPlayer/AVPlayer/Core/SJAVMediaPlayer.m
View file
Open in desktop

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

14 changes: 13 additions & 1 deletion ...e/Pods/SJBaseVideoPlayer/SJBaseVideoPlayer/Common/Implements/SJFloatSmallViewController.h
View file
Open in desktop

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

Loading