Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -122,9 +122,12 @@ private extension YHHomePageViewController {
         guard !didShowFloating else {
             return
         }
-        didShowFloating = true
-        let playbackInfo = YHPlayerManager.PlaybackInfo(id: liveInfo.id, token: liveInfo.token, channelId: liveInfo.rtmp_channel, uid: UInt(liveInfo.id), isLive: true, scene: .floating, playerType: .main)
-        YHPlayerManager.shared.enterFloating(from: nil, playbackInfo: playbackInfo)
+        
+        if liveInfo.status == 1 {
+            didShowFloating = true
+            let playbackInfo = YHPlayerManager.PlaybackInfo(id: liveInfo.id, token: liveInfo.token, channelId: liveInfo.rtmp_channel, uid: UInt(liveInfo.id), isLive: true, scene: .floating, playerType: .main)
+            YHPlayerManager.shared.enterFloating(from: nil, playbackInfo: playbackInfo)
+        }
     }
     
     func gotoMgrVC() {

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -256,7 +256,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
             }
             let cell: YHHomeBannerCollectionViewCell? = pagerView.cellForItem(at: index) as? YHHomeBannerCollectionViewCell
             let playbackInfo = YHPlayerManager.PlaybackInfo(id: model.recorded_video_id, url: nil, title: nil, roomId: nil, uid: nil, isLive: false, scene: .fullscreen)
-            YHPlayerManager.shared.enterVOD(from: nil, playbackInfo: playbackInfo)
+            YHPlayerManager.shared.enterVOD(from: cell?.bannerImagV, playbackInfo: playbackInfo)
         case 102://图片直播
             printLog("跳转录播")
             if !checkLogin() {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHBasePlayerViewController.swift

@@ -95,35 +95,35 @@ class YHBasePlayerViewController: YHBaseViewController {
         }
     }
     
-    private func setupGestures() {
-        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
-        containerView.addGestureRecognizer(tap)
-    }
-    
-    // MARK: - Controls Visibility
-    @objc private func handleTap() {
-        toggleControls()
-    }
-    
-    private func toggleControls() {
-        isControlsVisible.toggle()
-        //controlView.showControls(isControlsVisible)
-        resetControlsAutoHideTimer()
-    }
-    
-    private func resetControlsAutoHideTimer() {
-        controlsAutoHideTimer?.invalidate()
-        if isControlsVisible {
-            controlsAutoHideTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: false) { [weak self] _ in
-                self?.hideControls()
-            }
-        }
-    }
-    
-    private func hideControls() {
-        isControlsVisible = false
-        //controlView.showControls(false)
-    }
+//    private func setupGestures() {
+//        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+//        containerView.addGestureRecognizer(tap)
+//    }
+//    
+//    // MARK: - Controls Visibility
+//    @objc private func handleTap() {
+//        toggleControls()
+//    }
+//    
+//    private func toggleControls() {
+//        isControlsVisible.toggle()
+//        //controlView.showControls(isControlsVisible)
+//        resetControlsAutoHideTimer()
+//    }
+//    
+//    private func resetControlsAutoHideTimer() {
+//        controlsAutoHideTimer?.invalidate()
+//        if isControlsVisible {
+//            controlsAutoHideTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: false) { [weak self] _ in
+//                self?.hideControls()
+//            }
+//        }
+//    }
+//    
+//    private func hideControls() {
+//        isControlsVisible = false
+//        //controlView.showControls(false)
+//    }
 }
 
 

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveStateViewController.swift

@@ -36,7 +36,6 @@ class YHLiveStateViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
-        //updateData(state)
     }
     
     func setupData(liveDetail: YHLiveDetailModel) {
@@ -47,7 +46,7 @@ class YHLiveStateViewController: YHBaseViewController {
             bgLogoImageView.image = UIImage(named: "global_default_image")
             logImageView.image = UIImage(named: "global_default_image")
         }
-        loginTitleLabel.text = liveDetail.hxNickname
+        loginTitleLabel.text = liveDetail.account
         updateData(liveDetail)
     }
     
@@ -115,6 +114,9 @@ class YHLiveStateViewController: YHBaseViewController {
             let view = UIImageView()
             view.layer.cornerRadius = 39
             view.backgroundColor = .red
+            view.clipsToBounds = true
+            view.layer.borderWidth = 1
+            view.layer.borderColor = UIColor.white.cgColor
             return view
         }()
         view.addSubview(logImageView)

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHVODPlayerViewController.swift

@@ -50,6 +50,7 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
+        setupGestures()
         loadVideoDetail()
     }
 
@@ -75,8 +76,22 @@ class YHVODPlayerViewController: YHBasePlayerViewController {
         }
         topBarView.hideZoomButton(playbackInfo?.needHideZoomButton == true)
     }
+    
+    private func setupGestures() {
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        playerView.addGestureRecognizer(tap)
+    }
+    
+    @objc private func handleTap() {
+        let isPlaying = player?.getPlayState() == .playing
+        if isPlaying {
+            player?.pause()
+        } else {
+            player?.resume()
+        }
+    }
 
-    func enterFloating() {
+    private func enterFloating() {
         guard let playbackInfo = playbackInfo else {
             return
         }
@@ -250,6 +265,7 @@ extension YHVODPlayerViewController: YHPlayerDelegate {
     func player(_ player: YHPlayer, didChangedTo positionMs: Int, atTimestamp timestampMs: TimeInterval) {
         DispatchQueue.main.async {
             self.updateProgressControl(player, position: positionMs)
+            printLog("####$$$didChangedTo positionMs: \(positionMs)")
         }
     }
 
@@ -257,7 +273,7 @@ extension YHVODPlayerViewController: YHPlayerDelegate {
         DispatchQueue.main.async {
             switch state {
             case .opening:
-                printLog("####.opening: \(player.getDuration())")
+                printLog("####$$$.opening: \(player.getDuration())")
             case .openCompleted:
                 let duration = player.getDuration()
                 self.updateProgressControl(player, position: duration)
@@ -269,10 +285,10 @@ extension YHVODPlayerViewController: YHPlayerDelegate {
                     self.progressControl.setupMarkers(marks: marks)
                 }
                 
-                printLog("####.openCompleted: \(player.getDuration())")
+                printLog("####$$$.openCompleted: \(player.getDuration())")
             case .playing:
                 self.progressControl.setPlaying(true)
-                printLog("####.playing: \(player.getDuration())")
+                printLog("####$$$.playing: \(player.getDuration())")
             case .paused, .stopped:
                 self.progressControl.setPlaying(false)
             case .failed: