Release 2.6.0

- 新增切换清晰度的控制层 - 调整了一些内部处理
changsanjiang · Jul 13, 2019 · 2a3495b · 2a3495b
1 parent 933dc23
commit 2a3495b
Show file tree

Hide file tree

Showing 86 changed files with 6,492 additions and 577 deletions.
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,27 +1,36 @@
 # Uncomment the next line to define a global platform for your project
 platform :ios, '9.0'
 
+#install! 'cocoapods', disable_input_output_paths: true, generate_multiple_pod_projects: true
+
 post_install do |installer|
-  installer.pod_target_subprojects.each do |project|
-    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'
-        end
+  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'
       end
     end
   end
+
+#  installer.pod_target_subprojects.each do |project|
+#    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'
+#        end
+#      end
+#    end
+#  end
 end
 
-install! 'cocoapods', disable_input_output_paths: true, generate_multiple_pod_projects: true
 
 target 'SJVideoPlayer_Example' do
   # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
   # use_frameworks!
 
   # Pods for SJVideoPlayer
 
-  #pod 'SJBaseVideoPlayer'#, :path => '../../SJBaseVideoPlayer'
+  #pod 'SJBaseVideoPlayer', :path => '../../SJBaseVideoPlayer'
   pod 'SJVideoPlayer', :path => '../../SJVideoPlayer'
 
   # 全屏手势

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -5,124 +5,126 @@ PODS:
   - SDWebImage (5.0.6):
     - SDWebImage/Core (= 5.0.6)
   - SDWebImage/Core (5.0.6)
-  - SJBaseVideoPlayer (2.5.2):
+  - SJBaseVideoPlayer (2.5.3):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/Header (= 2.5.2)
-    - SJBaseVideoPlayer/Model (= 2.5.2)
-    - SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.5.2)
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.5.2)
-    - SJBaseVideoPlayer/SJPrompt (= 2.5.2)
-    - SJBaseVideoPlayer/SJRotationManager (= 2.5.2)
-    - SJBaseVideoPlayer/Tool (= 2.5.2)
+    - SJBaseVideoPlayer/Header (= 2.5.3)
+    - SJBaseVideoPlayer/Model (= 2.5.3)
+    - SJBaseVideoPlayer/SJAVMediaPlaybackController (= 2.5.3)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (= 2.5.3)
+    - SJBaseVideoPlayer/SJPrompt (= 2.5.3)
+    - SJBaseVideoPlayer/SJRotationManager (= 2.5.3)
+    - SJBaseVideoPlayer/Tool (= 2.5.3)
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/Header (2.5.2):
+  - SJBaseVideoPlayer/Header (2.5.3):
     - Masonry
     - Reachability
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/Model (2.5.2):
+  - SJBaseVideoPlayer/Model (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJAVMediaPlaybackController (2.5.2):
+  - SJBaseVideoPlayer/SJAVMediaPlaybackController (2.5.3):
     - Masonry
     - Reachability
-    - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.5.2)
+    - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (= 2.5.3)
     - SJBaseVideoPlayer/Tool
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.5.2):
+  - SJBaseVideoPlayer/SJAVMediaPlaybackController/Core (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Tool
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.5.2):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.5.2)
-    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.5.2)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (= 2.5.3)
+    - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (= 2.5.3)
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.5.2):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/Core (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.5.2):
+  - SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager/ResourceLoader (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJPrompt (2.5.2):
+  - SJBaseVideoPlayer/SJPrompt (2.5.3):
     - Masonry
     - Reachability
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/SJRotationManager (2.5.2):
+  - SJBaseVideoPlayer/SJRotationManager (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJBaseVideoPlayer/Tool (2.5.2):
+  - SJBaseVideoPlayer/Tool (2.5.3):
     - Masonry
     - Reachability
     - SJBaseVideoPlayer/Header
     - SJBaseVideoPlayer/Model
     - SJUIKit/ObserverHelper (>= 0.0.0.31)
     - SJUIKit/Queues (>= 0.0.0.31)
-  - SJPlaybackListController (0.0.4):
-    - SJPlaybackListController/Core (= 0.0.4)
-  - SJPlaybackListController/Core (0.0.4)
+  - SJPlaybackListController (0.0.5):
+    - SJPlaybackListController/Core (= 0.0.5)
+  - SJPlaybackListController/Core (0.0.5)
   - SJRouter (0.0.12):
     - SJRouter/Core (= 0.0.12)
   - SJRouter/Core (0.0.12)
-  - SJUIKit (0.0.0.32):
-    - SJUIKit/AsyncLoad (= 0.0.0.32)
-    - SJUIKit/AttributesFactory (= 0.0.0.32)
-    - SJUIKit/Base (= 0.0.0.32)
-    - SJUIKit/CornerMask (= 0.0.0.32)
-    - SJUIKit/Date (= 0.0.0.32)
-    - SJUIKit/ObserverHelper (= 0.0.0.32)
-    - SJUIKit/Other (= 0.0.0.32)
-    - SJUIKit/Queues (= 0.0.0.32)
-    - SJUIKit/Refresh (= 0.0.0.32)
-    - SJUIKit/Thread (= 0.0.0.32)
-    - SJUIKit/UIMaker (= 0.0.0.32)
-  - SJUIKit/AsyncLoad (0.0.0.32):
+  - SJUIKit (0.0.0.33):
+    - SJUIKit/AsyncLoad (= 0.0.0.33)
+    - SJUIKit/AttributesFactory (= 0.0.0.33)
+    - SJUIKit/Base (= 0.0.0.33)
+    - SJUIKit/CornerMask (= 0.0.0.33)
+    - SJUIKit/Date (= 0.0.0.33)
+    - SJUIKit/ObserverHelper (= 0.0.0.33)
+    - SJUIKit/Other (= 0.0.0.33)
+    - SJUIKit/Photo (= 0.0.0.33)
+    - SJUIKit/Queues (= 0.0.0.33)
+    - SJUIKit/Refresh (= 0.0.0.33)
+    - SJUIKit/Thread (= 0.0.0.33)
+    - SJUIKit/UIMaker (= 0.0.0.33)
+  - SJUIKit/AsyncLoad (0.0.0.33):
     - SJUIKit/CornerMask
-  - SJUIKit/AttributesFactory (0.0.0.32):
-    - SJUIKit/AttributesFactory/Deprecated (= 0.0.0.32)
-    - SJUIKit/AttributesFactory/UIKitText (= 0.0.0.32)
-  - SJUIKit/AttributesFactory/Deprecated (0.0.0.32)
-  - SJUIKit/AttributesFactory/UIKitText (0.0.0.32)
-  - SJUIKit/Base (0.0.0.32):
-    - SJUIKit/Base/Core (= 0.0.0.32)
+  - SJUIKit/AttributesFactory (0.0.0.33):
+    - SJUIKit/AttributesFactory/Deprecated (= 0.0.0.33)
+    - SJUIKit/AttributesFactory/UIKitText (= 0.0.0.33)
+  - SJUIKit/AttributesFactory/Deprecated (0.0.0.33)
+  - SJUIKit/AttributesFactory/UIKitText (0.0.0.33)
+  - SJUIKit/Base (0.0.0.33):
+    - SJUIKit/Base/Core (= 0.0.0.33)
     - SJUIKit/ObserverHelper
-  - SJUIKit/Base/Core (0.0.0.32):
+  - SJUIKit/Base/Core (0.0.0.33):
     - SJUIKit/ObserverHelper
-  - SJUIKit/CornerMask (0.0.0.32):
+  - SJUIKit/CornerMask (0.0.0.33):
     - SJUIKit/ObserverHelper
-  - SJUIKit/Date (0.0.0.32)
-  - SJUIKit/ObserverHelper (0.0.0.32)
-  - SJUIKit/Other (0.0.0.32):
+  - SJUIKit/Date (0.0.0.33)
+  - SJUIKit/ObserverHelper (0.0.0.33)
+  - SJUIKit/Other (0.0.0.33):
     - SJUIKit/Date
-  - SJUIKit/Queues (0.0.0.32)
-  - SJUIKit/Refresh (0.0.0.32):
+  - SJUIKit/Photo (0.0.0.33)
+  - SJUIKit/Queues (0.0.0.33)
+  - SJUIKit/Refresh (0.0.0.33):
     - MJRefresh
-  - SJUIKit/Thread (0.0.0.32)
-  - SJUIKit/UIMaker (0.0.0.32):
-    - SJUIKit/UIMaker/Core (= 0.0.0.32)
-  - SJUIKit/UIMaker/Core (0.0.0.32)
+  - SJUIKit/Thread (0.0.0.33)
+  - SJUIKit/UIMaker (0.0.0.33):
+    - SJUIKit/UIMaker/Core (= 0.0.0.33)
+  - SJUIKit/UIMaker/Core (0.0.0.33)
   - SJVideoPlayer (2.5.8):
     - Masonry
     - SJBaseVideoPlayer (>= 2.4.1)
@@ -138,6 +140,7 @@ PODS:
     - SJVideoPlayer/SJMoreSettingControlLayer (= 2.5.8)
     - SJVideoPlayer/SJNotReachableControlLayer (= 2.5.8)
     - SJVideoPlayer/SJProgressSlider (= 2.5.8)
+    - SJVideoPlayer/SJSwitchVideoDefinitionControlLayer (= 2.5.8)
     - SJVideoPlayer/Switcher (= 2.5.8)
   - SJVideoPlayer/Adapters (2.5.8):
     - Masonry
@@ -253,6 +256,10 @@ PODS:
     - Masonry
     - SJBaseVideoPlayer (>= 2.4.1)
     - SJUIKit/AttributesFactory
+  - SJVideoPlayer/SJSwitchVideoDefinitionControlLayer (2.5.8):
+    - Masonry
+    - SJBaseVideoPlayer (>= 2.4.1)
+    - SJUIKit/AttributesFactory
   - SJVideoPlayer/Switcher (2.5.8):
     - Masonry
     - SJBaseVideoPlayer (>= 2.4.1)
@@ -287,12 +294,12 @@ SPEC CHECKSUMS:
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: 920f1a2ff1ca8296ad34f6e0510a1ef1d70ac965
-  SJBaseVideoPlayer: 9b96215ba2b338fb31d3505e5b2a9428b02f0468
-  SJPlaybackListController: bb150965596f46cc5542b37c05d8401601db4022
+  SJBaseVideoPlayer: 76a9b2d3b298b4deef6efde793c4b0260dd7759c
+  SJPlaybackListController: e135c789fcd63d63a62d5e2e2965ab1e6d52a2bd
   SJRouter: 702a0d06811fc2da02d6145bc7abb9f633fdc612
-  SJUIKit: 77fc2857b2322b950597dec7f39ceea12d4bf2b9
-  SJVideoPlayer: d28c848ced056c2afe4b3e90792d97959e736fb8
+  SJUIKit: 516e45ca842a96051b27c09b270e743d3dfe6057
+  SJVideoPlayer: 390254464e985f938bee2a2e0fcec63d13f0a3cf
 
-PODFILE CHECKSUM: 8cabb86b97a32919236a55ab2d6e56733b3ea1a5
+PODFILE CHECKSUM: d1a35650b72e179e7a1b03dce0b27a01610c8aac
 
-COCOAPODS: 1.7.2
+COCOAPODS: 1.7.4
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPopPromptController.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPopPromptController.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPopPromptControllerProtocol.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJPopPromptControllerProtocol.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo+Private.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo+Private.h
diff --git a/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo.h b/Example/Pods/Headers/Private/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo.h
diff --git a/Example/Pods/Headers/Private/SJUIKit/SJImagePickerController.h b/Example/Pods/Headers/Private/SJUIKit/SJImagePickerController.h
diff --git a/Example/Pods/Headers/Private/SJUIKit/UIImagePickerController+SJUIKitExtension.h b/Example/Pods/Headers/Private/SJUIKit/UIImagePickerController+SJUIKitExtension.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJSwitchVideoDefinitionControlLayer.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJSwitchVideoDefinitionControlLayer.h
diff --git a/Example/Pods/Headers/Private/SJVideoPlayer/SJVideoPlayerURLAsset+SJExtendedDefinition.h b/Example/Pods/Headers/Private/SJVideoPlayer/SJVideoPlayerURLAsset+SJExtendedDefinition.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPopPromptController.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPopPromptController.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPopPromptControllerProtocol.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJPopPromptControllerProtocol.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo+Private.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo+Private.h
diff --git a/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo.h b/Example/Pods/Headers/Public/SJBaseVideoPlayer/SJVideoDefinitionSwitchingInfo.h
diff --git a/Example/Pods/Headers/Public/SJUIKit/SJImagePickerController.h b/Example/Pods/Headers/Public/SJUIKit/SJImagePickerController.h
diff --git a/Example/Pods/Headers/Public/SJUIKit/UIImagePickerController+SJUIKitExtension.h b/Example/Pods/Headers/Public/SJUIKit/UIImagePickerController+SJUIKitExtension.h
diff --git a/Example/Pods/Headers/Public/SJVideoPlayer/SJSwitchVideoDefinitionControlLayer.h b/Example/Pods/Headers/Public/SJVideoPlayer/SJSwitchVideoDefinitionControlLayer.h
diff --git a/Example/Pods/Headers/Public/SJVideoPlayer/SJVideoPlayerURLAsset+SJExtendedDefinition.h b/Example/Pods/Headers/Public/SJVideoPlayer/SJVideoPlayerURLAsset+SJExtendedDefinition.h
diff --git a/Example/Pods/Local Podspecs/SJBaseVideoPlayer.podspec.json b/Example/Pods/Local Podspecs/SJBaseVideoPlayer.podspec.json
diff --git a/Example/Pods/Local Podspecs/SJVideoPlayer.podspec.json b/Example/Pods/Local Podspecs/SJVideoPlayer.podspec.json