Release 3.1.0

- 新增拖拽过程中的相应回调 - 新增标题滚动效果(跑马灯) - 新增竖屏时是否隐藏标题 - 可以自定义拖拽视图了 - 可以自定义标题视图了 - 重写了Adapter, 移除CollectionView相关的处理
changsanjiang · Dec 10, 2019 · 11b0ea8 · 11b0ea8
1 parent b10ab85
commit 11b0ea8
Show file tree

Hide file tree

Showing 328 changed files with 5,717 additions and 6,284 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/Podfile b/Example/Podfile
@@ -35,7 +35,6 @@ end
 target 'SJVideoPlayer_Example' do
 # 切换为 ijkplayer, 详见: https://github.com/changsanjiang/SJVideoPlayer/wiki/Use-ijkplayer
 #  pod 'SJBaseVideoPlayer/IJKPlayer'#, :path => '../../SJBaseVideoPlayer'
-#  pod 'ijkplayerssl', :git => 'https://gitee.com/changsanjiang/ijkplayer.git'
 
 # 切换为 Aliplayer, 详见: https://github.com/changsanjiang/SJVideoPlayer/wiki/Use-AliPlayer
 #  pod 'SJBaseVideoPlayer/AliPlayer'#, :path => '../../SJBaseVideoPlayer'

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -5,29 +5,29 @@ PODS:
   - SDWebImage (5.3.1):
     - SDWebImage/Core (= 5.3.1)
   - SDWebImage/Core (5.3.1)
-  - SJBaseVideoPlayer (3.1.4):
+  - SJBaseVideoPlayer (3.1.5):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/AVPlayer (= 3.1.4)
-    - SJBaseVideoPlayer/Common (= 3.1.4)
+    - SJBaseVideoPlayer/AVPlayer (= 3.1.5)
+    - SJBaseVideoPlayer/Common (= 3.1.5)
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper (>= 0.0.0.38)
     - SJUIKit/Queues (>= 0.0.0.38)
-  - SJBaseVideoPlayer/AVPlayer (3.1.4):
+  - SJBaseVideoPlayer/AVPlayer (3.1.5):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Common
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper (>= 0.0.0.38)
     - SJUIKit/Queues (>= 0.0.0.38)
-  - SJBaseVideoPlayer/Common (3.1.4):
+  - SJBaseVideoPlayer/Common (3.1.5):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/ResourceLoader
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper (>= 0.0.0.38)
     - SJUIKit/Queues (>= 0.0.0.38)
-  - SJBaseVideoPlayer/ResourceLoader (3.1.4):
+  - SJBaseVideoPlayer/ResourceLoader (3.1.5):
     - Masonry
     - Reachability
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
@@ -87,143 +87,20 @@ PODS:
     - SJUIKit/UIMaker/Core (= 0.0.0.38)
   - SJUIKit/UIMaker/Core (0.0.0.38)
   - SJVideoPlayer (3.0.9):
-    - Masonry
     - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters (= 3.0.9)
     - SJVideoPlayer/Common (= 3.0.9)
-    - SJVideoPlayer/Settings (= 3.0.9)
-    - SJVideoPlayer/SJEdgeControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJFilmEditingControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJFloatSmallViewControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJLoadFailedControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJMoreSettingControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJNotReachableControlLayer (= 3.0.9)
-    - SJVideoPlayer/SJProgressSlider (= 3.0.9)
-    - SJVideoPlayer/SJSwitchVideoDefinitionControlLayer (= 3.0.9)
-    - SJVideoPlayer/Switcher (= 3.0.9)
-  - SJVideoPlayer/Adapters (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Common
+    - SJVideoPlayer/ControlLayers (= 3.0.9)
+    - SJVideoPlayer/ResourceLoader (= 3.0.9)
   - SJVideoPlayer/Common (3.0.9):
     - Masonry
     - SJBaseVideoPlayer (>= 3.1.4)
     - SJUIKit/AttributesFactory
-  - SJVideoPlayer/Settings (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/SJEdgeControlLayer/ResourceLoader
-    - SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
-    - SJVideoPlayer/SJFloatSmallViewControlLayer/ResourceLoader
-  - SJVideoPlayer/SJEdgeControlLayer (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/SJEdgeControlLayer/Defines (= 3.0.9)
-    - SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (= 3.0.9)
-    - SJVideoPlayer/SJEdgeControlLayer/View (= 3.0.9)
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJEdgeControlLayer/Defines (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJEdgeControlLayer/ResourceLoader (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJEdgeControlLayer/View (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/SJEdgeControlLayer/Defines
-    - SJVideoPlayer/SJEdgeControlLayer/ResourceLoader
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJFilmEditingControlLayer (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/SJFilmEditingControlLayer/Core (= 3.0.9)
-    - SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (= 3.0.9)
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJFilmEditingControlLayer/Core (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJFilmEditingControlLayer/ResourceLoader (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/SJProgressSlider
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJFloatSmallViewControlLayer (3.0.9):
-    - Masonry
+    - SJVideoPlayer/ResourceLoader
+  - SJVideoPlayer/ControlLayers (3.0.9):
     - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
     - SJVideoPlayer/Common
-    - SJVideoPlayer/SJFloatSmallViewControlLayer/ResourceLoader (= 3.0.9)
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJFloatSmallViewControlLayer/ResourceLoader (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/SJLoadFailedControlLayer (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/SJNotReachableControlLayer
-  - SJVideoPlayer/SJMoreSettingControlLayer (3.0.9):
-    - Masonry
+  - SJVideoPlayer/ResourceLoader (3.0.9):
     - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/SJEdgeControlLayer
-  - SJVideoPlayer/SJNotReachableControlLayer (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/SJEdgeControlLayer
-  - SJVideoPlayer/SJProgressSlider (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-  - SJVideoPlayer/SJSwitchVideoDefinitionControlLayer (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
-    - SJVideoPlayer/Adapters
-    - SJVideoPlayer/Common
-    - SJVideoPlayer/Switcher
-  - SJVideoPlayer/Switcher (3.0.9):
-    - Masonry
-    - SJBaseVideoPlayer (>= 3.1.4)
-    - SJUIKit/AttributesFactory
 
 DEPENDENCIES:
   - Masonry
@@ -257,13 +134,13 @@ SPEC CHECKSUMS:
   MJRefresh: 72a46ecaa2a0feaf48fc5198dff95f25f8bb27c6
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: 7137d57385fb632129838c1e6ab9528a22c666cc
-  SJBaseVideoPlayer: 25055f019982c0e72cba5f97e269557fdb02cbbb
+  SJBaseVideoPlayer: 63eebe704af01346ce9c5f6be9f1ace4bf86b5ba
   SJFullscreenPopGesture: d4994917bc900e79cd686970866834b4c5883565
   SJPlaybackListController: e135c789fcd63d63a62d5e2e2965ab1e6d52a2bd
   SJRouter: 702a0d06811fc2da02d6145bc7abb9f633fdc612
   SJUIKit: 3a8af44f281bc620f94e277f8cc586d6e4e0913a
-  SJVideoPlayer: 1669bc6a45a93c51a5f9aae0402c65c6022e5c54
+  SJVideoPlayer: 246ff778bb6b7c20fd39734ebb8ebbca5d3adadb
 
-PODFILE CHECKSUM: 623b68a5d78cde48737a4814ae4ad32b7959f076
+PODFILE CHECKSUM: a2b2606a8ab3f794fe06129cb7249b61513ab980
 
 COCOAPODS: 1.8.4
diff --git a/...e/Pods/Headers/Private/SJBaseVideoPlayer/UIViewController+SJRotationPrivate_FixSafeArea.h b/...e/Pods/Headers/Private/SJBaseVideoPlayer/UIViewController+SJRotationPrivate_FixSafeArea.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJButtonProgressSlider.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJButtonProgressSlider.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJCommonProgressSlider.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJCommonProgressSlider.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJControlLayerDefines.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJControlLayerDefines.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJControlLayerSwitcher.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJControlLayerSwitcher.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingObservation.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingObservation.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingObservationDefines.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingObservationDefines.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingProgressPopView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingProgressPopView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingProgressPopViewDefines.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJDraggingProgressPopViewDefines.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItem.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItem.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemAdapter.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemAdapter.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemAdapterLayout.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemAdapterLayout.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemCell.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemCell.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlButtonItemView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerAdapters.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerAdapters.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerItemAdapter.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerItemAdapter.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerLoader.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerLoader.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerLoadingViewDefines.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerLoadingViewDefines.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerSettings.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJEdgeControlLayerSettings.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingBackButton.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingBackButton.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingButtonContainerView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingButtonContainerView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingCommonViewLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingCommonViewLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingGIFCountDownView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingGIFCountDownView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingGenerateResultControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingGenerateResultControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingInGIFRecordingsControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingInGIFRecordingsControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingInVideoRecordingsControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingInVideoRecordingsControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingLoader.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingLoader.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingResultShareItem.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingResultShareItem.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingResultShareItemsContainerView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingResultShareItemsContainerView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingSaveResultToAlbumHandler.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingSaveResultToAlbumHandler.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingSettings.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingSettings.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingStatus.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingStatus.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingVideoCountDownView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFilmEditingVideoCountDownView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFloatSmallViewControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFloatSmallViewControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJFloatSmallViewControlLayerResourceLoader.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJFloatSmallViewControlLayerResourceLoader.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadFailedControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadFailedControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadingView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadingView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadingViewDefinies.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJLoadingViewDefinies.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJMoreSettingControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJMoreSettingControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJNetworkLoadingView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJNetworkLoadingView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJNotReachableControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJNotReachableControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJProgressSlider.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJProgressSlider.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJScrollingTextMarqueeView.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJScrollingTextMarqueeView.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJScrollingTextMarqueeViewDefines.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJScrollingTextMarqueeViewDefines.h