Browse Source

Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework
合并代码

jsonwang 3 years ago
parent
commit
07db847381

+ 4 - 3
BFFramework/Classes/BFModules/BFUtility/PQSingletoVideoPlayer.swift

@@ -44,7 +44,7 @@ public class PQSingletoVideoPlayer: NSObject {
     /// - Parameters:
     ///   - videoData: <#videoData description#>
     ///   - controllerView: <#controllerView description#>
-    public func configPlyer(videoData: PQVideoListModel, controllerView: UIView) {
+    public func configPlyer(videoData: PQVideoListModel, controllerView: UIView, renderMode: TX_Enum_Type_RenderMode = .RENDER_MODE_FILL_SCREEN) {
         isPlayEnd = false
         isRealPlay = false
         isSemiRealPlay = false
@@ -52,6 +52,7 @@ public class PQSingletoVideoPlayer: NSObject {
         isFirstFrame = false
         isPlayerError = false
         loadingTime = Date().timeIntervalSince1970 * 1000
+        player.setRenderMode(renderMode)
         player.stopPlay()
         player.removeVideoWidget()
         player.setupVideoWidget(controllerView, insert: 0)
@@ -128,10 +129,10 @@ public class PQSingletoVideoPlayer: NSObject {
             playVideoData = nil
         }
     }
-    
+
     /// seek
     /// - Parameter time: <#time description#>
-    public func seek(time:Float){
+    public func seek(time: Float) {
         player.seek(time)
     }
 

+ 1 - 1
BFFramework/Classes/Utils/PQSingletonEnvUtil.swift

@@ -10,7 +10,7 @@ import Foundation
 import KeychainAccess
 
 // add by ak 开发和发布版本的不同设置  1 为正式版本发布的苹果  0 是测试 XXXX 上传苹果前要检查
-public let DEVELOPMENT_ENVIRONMENT: Int = 1
+public let DEVELOPMENT_ENVIRONMENT: Int = 0
 
 public enum ENVMode: String {
     case ENVModeOnline // 线上环境