Release 3.4.0

changsanjiang · Jul 11, 2022 · 8242b5c · 8242b5c
1 parent 57aff45
commit 8242b5c
Show file tree

Hide file tree

Showing 331 changed files with 10,669 additions and 6,757 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
@@ -1,7 +1,6 @@
 source 'https://cdn.cocoapods.org/'
 
-# Uncomment the next line to define a global platform for your project
-platform :ios, '9.0'
+platform :ios, '11.0'
 
 #install! 'cocoapods', disable_input_output_paths: true, generate_multiple_pod_projects: true
 
@@ -15,8 +14,8 @@ platform :ios, '9.0'
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
+      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 11.0
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
       end
 
       if config.name != 'Release'
@@ -46,7 +45,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'
@@ -75,3 +74,11 @@ target 'SJVideoPlayer_Example' do
   pod 'SDWebImage'
   pod 'YYModel'
 end
+
+target 'iPadDemo' do
+  pod 'SJBaseVideoPlayer'#, :path => '../../SJBaseVideoPlayer'
+  pod 'SJVideoPlayer', :path => '../../SJVideoPlayer'
+
+  pod 'Masonry', :inhibit_warnings => true
+  pod 'MJRefresh', '3.4.3', :inhibit_warnings => true
+end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,46 +2,46 @@ PODS:
   - CocoaAsyncSocket (7.6.5)
   - Masonry (1.1.0)
   - MJRefresh (3.4.3)
-  - SDWebImage (5.11.1):
-    - SDWebImage/Core (= 5.11.1)
-  - SDWebImage/Core (5.11.1)
-  - SJBaseVideoPlayer (3.6.3):
+  - SDWebImage (5.13.0):
+    - SDWebImage/Core (= 5.13.0)
+  - SDWebImage/Core (5.13.0)
+  - SJBaseVideoPlayer (3.7.0):
     - Masonry
-    - SJBaseVideoPlayer/AVPlayer (= 3.6.3)
-    - SJBaseVideoPlayer/Common (= 3.6.3)
+    - SJBaseVideoPlayer/AVPlayer (= 3.7.0)
+    - SJBaseVideoPlayer/Common (= 3.7.0)
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper
     - SJUIKit/Queues
     - SJUIKit/SQLite3
-  - SJBaseVideoPlayer/AVPlayer (3.6.3):
+  - SJBaseVideoPlayer/AVPlayer (3.7.0):
     - Masonry
     - SJBaseVideoPlayer/Common
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper
     - SJUIKit/Queues
     - SJUIKit/SQLite3
-  - SJBaseVideoPlayer/Common (3.6.3):
+  - SJBaseVideoPlayer/Common (3.7.0):
     - Masonry
     - SJBaseVideoPlayer/ResourceLoader
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper
     - SJUIKit/Queues
     - SJUIKit/SQLite3
-  - SJBaseVideoPlayer/ResourceLoader (3.6.3):
+  - SJBaseVideoPlayer/ResourceLoader (3.7.0):
     - Masonry
     - SJUIKit/AttributesFactory (>= 0.0.0.38)
     - SJUIKit/ObserverHelper
     - SJUIKit/Queues
     - SJUIKit/SQLite3
   - SJFullscreenPopGesture/ObjC (1.5.4)
-  - SJMediaCacheServer (1.7.6):
-    - SJMediaCacheServer/Core (= 1.7.6)
-    - SJMediaCacheServer/KTVCocoaHTTPServer (= 1.7.6)
+  - SJMediaCacheServer (1.7.8):
+    - SJMediaCacheServer/Core (= 1.7.8)
+    - SJMediaCacheServer/KTVCocoaHTTPServer (= 1.7.8)
     - SJUIKit/SQLite3
-  - SJMediaCacheServer/Core (1.7.6):
+  - SJMediaCacheServer/Core (1.7.8):
     - SJMediaCacheServer/KTVCocoaHTTPServer
     - SJUIKit/SQLite3
-  - SJMediaCacheServer/KTVCocoaHTTPServer (1.7.6):
+  - SJMediaCacheServer/KTVCocoaHTTPServer (1.7.8):
     - CocoaAsyncSocket
     - SJUIKit/SQLite3
   - SJRouter (1.0.0):
@@ -102,21 +102,21 @@ PODS:
   - SJUIKit/UIMaker (0.0.0.58):
     - SJUIKit/UIMaker/Core (= 0.0.0.58)
   - SJUIKit/UIMaker/Core (0.0.0.58)
-  - SJVideoPlayer (3.3.2):
-    - SJBaseVideoPlayer (>= 3.6.0)
-    - SJVideoPlayer/Common (= 3.3.2)
-    - SJVideoPlayer/ControlLayers (= 3.3.2)
-    - SJVideoPlayer/ResourceLoader (= 3.3.2)
-  - SJVideoPlayer/Common (3.3.2):
+  - SJVideoPlayer (3.4.0):
+    - SJBaseVideoPlayer (>= 3.7.0)
+    - SJVideoPlayer/Common (= 3.4.0)
+    - SJVideoPlayer/ControlLayers (= 3.4.0)
+    - SJVideoPlayer/ResourceLoader (= 3.4.0)
+  - SJVideoPlayer/Common (3.4.0):
     - Masonry
-    - SJBaseVideoPlayer (>= 3.6.0)
+    - SJBaseVideoPlayer (>= 3.7.0)
     - SJUIKit/AttributesFactory
     - SJVideoPlayer/ResourceLoader
-  - SJVideoPlayer/ControlLayers (3.3.2):
-    - SJBaseVideoPlayer (>= 3.6.0)
+  - SJVideoPlayer/ControlLayers (3.4.0):
+    - SJBaseVideoPlayer (>= 3.7.0)
     - SJVideoPlayer/Common
-  - SJVideoPlayer/ResourceLoader (3.3.2):
-    - SJBaseVideoPlayer (>= 3.6.0)
+  - SJVideoPlayer/ResourceLoader (3.4.0):
+    - SJBaseVideoPlayer (>= 3.7.0)
   - YYModel (1.0.4)
 
 DEPENDENCIES:
@@ -153,15 +153,15 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJRefresh: 53e3e3219f204425ee6d3e62e8733d3295944cd6
-  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
-  SJBaseVideoPlayer: 99957bb0d0fe1ccb8d6710bd9db9f52640c56a32
+  SDWebImage: 0327043dbb9533e75f2eff8445b3df0f2ceca6ac
+  SJBaseVideoPlayer: c2b911b2e040973429682fc37f35c9d4b5732b29
   SJFullscreenPopGesture: 7be57b1014cb77f4b7c1e6df5e797da6d05dc75d
-  SJMediaCacheServer: 3a558208af572554583d956dbf14e4bb7818f0e4
+  SJMediaCacheServer: 95bebce42f281fccaff25a5e8284022478ff7ba5
   SJRouter: a866e7884fc9219bed523be0a0318c3a84e85022
   SJUIKit: 86d5b16f8b8b17274ef8805acf965e4014629e15
-  SJVideoPlayer: 3a271ff92c7b9d611c537655fd1edcbae18b8587
+  SJVideoPlayer: 583387d58278db0e9e56122066425fb05fd84ec7
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: 15535c4ec87318d1a42f08613c1f32951dd3cf7f
+PODFILE CHECKSUM: 806121bb2fec366be255af4703b69f0a92bb11e3
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageItem.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageItem.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageQueueController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageQueueController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageQueueControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJBarrageQueueControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuItem.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuItem.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuPopupController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuPopupController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuPopupControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJDanmakuPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJGestureControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJGestureControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerViewInternal.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerViewInternal.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPrompt.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPrompt.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptPopupController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptPopupController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptPopupControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptingPopupController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptingPopupController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptingPopupControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPromptingPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManager.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManager.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManagerInternal_4.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManagerInternal_4.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManager_4.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJRotationManager_4.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlePopupController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlePopupController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlePopupControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlePopupControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlesPromptController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlesPromptController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlesPromptControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJSubtitlesPromptControllerDefines.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJTextPopupController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJTextPopupController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJTextPopupControllerDefines.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJTextPopupControllerDefines.h
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/SJMediaCacheServer/FILEAssetContentProvider.h b/Example/Pods/Headers/Private/SJMediaCacheServer/FILEAssetContentProvider.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageItem.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageItem.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageQueueController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageQueueController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageQueueControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJBarrageQueueControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuItem.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuItem.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuPopupController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuPopupController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuPopupControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJDanmakuPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJGestureControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJGestureControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayerViewInternal.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPlayerViewInternal.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPrompt.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPrompt.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptPopupController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptPopupController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptPopupControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptingPopupController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptingPopupController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptingPopupControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPromptingPopupControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManager.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManager.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManagerInternal_4.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManagerInternal_4.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManager_4.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJRotationManager_4.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlePopupController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlePopupController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlePopupControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlePopupControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlesPromptController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlesPromptController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlesPromptControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJSubtitlesPromptControllerDefines.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJTextPopupController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJTextPopupController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJTextPopupControllerDefines.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJTextPopupControllerDefines.h
diff --git a/...le/Pods/Headers/Public/SJBaseVideoPlayer/UIViewController+SJRotationPrivate_FixSafeArea.h b/...le/Pods/Headers/Public/SJBaseVideoPlayer/UIViewController+SJRotationPrivate_FixSafeArea.h
diff --git a/Example/Pods/Headers/Public/SJMediaCacheServer/FILEAssetContentProvider.h b/Example/Pods/Headers/Public/SJMediaCacheServer/FILEAssetContentProvider.h
diff --git a/Example/Pods/Local Podspecs/SJVideoPlayer.podspec.json b/Example/Pods/Local Podspecs/SJVideoPlayer.podspec.json