code optimize

nexry · Aug 23, 2021 · 9ac1848 · 9ac1848
1 parent a3f3af5
commit 9ac1848
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/Demo/demo-iOS/demo-iOS/RootViewController.swift b/Demo/demo-iOS/demo-iOS/RootViewController.swift
@@ -94,6 +94,14 @@ extension RootViewController: UITableViewDataSource {
 }
 
 extension RootViewController: UITableViewDelegate {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        guard let cell = tableView.cellForRow(at: indexPath) as? TableViewCell else {
+            return
+        }
+        playerView.set(resource: objects[indexPath.row])
+        cell.videoView.addSubview(playerView)
+    }
     func scrollViewDidEndDecelerating(_: UIScrollView) {
         beginVideoAction()
     }

diff --git a/Sources/KSPlayer/AVPlayer/PlayerDefines.swift b/Sources/KSPlayer/AVPlayer/PlayerDefines.swift
@@ -60,20 +60,24 @@ public extension MediaPlayerProtocol {
         guard let superview = view.superview, naturalSize != .zero else {
             return
         }
-        view.constraints.forEach { view.removeConstraint($0) }
+        view.widthConstraint.flatMap { view.removeConstraint($0) }
+        view.heightConstraint.flatMap { view.removeConstraint($0) }
+        view.centerXConstraint.flatMap { view.removeConstraint($0) }
+        view.centerYConstraint.flatMap { view.removeConstraint($0) }
         view.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             view.centerXAnchor.constraint(equalTo: superview.centerXAnchor),
             view.centerYAnchor.constraint(equalTo: superview.centerYAnchor),
-            view.widthAnchor.constraint(equalTo: view.heightAnchor, multiplier: naturalSize.width / naturalSize.height),
         ])
         if naturalSize.isHorizonal {
             NSLayoutConstraint.activate([
                 view.widthAnchor.constraint(equalTo: superview.widthAnchor),
+                view.heightAnchor.constraint(equalTo: view.widthAnchor, multiplier: naturalSize.height / naturalSize.width),
             ])
         } else {
             NSLayoutConstraint.activate([
                 view.heightAnchor.constraint(equalTo: superview.heightAnchor),
+                view.widthAnchor.constraint(equalTo: view.heightAnchor, multiplier: naturalSize.width / naturalSize.height),
             ])
         }
     }

diff --git a/Sources/KSPlayer/MEPlayer/MetalPlayView.swift b/Sources/KSPlayer/MEPlayer/MetalPlayView.swift
@@ -37,6 +37,13 @@ final class MetalPlayView: UIView {
         view.delegate = self
         addSubview(view)
         view.isHidden = true
+        view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            topAnchor.constraint(equalTo: view.topAnchor),
+            leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            bottomAnchor.constraint(equalTo: view.bottomAnchor),
+        ])
         var controlTimebase: CMTimebase?
         CMTimebaseCreateWithMasterClock(allocator: kCFAllocatorDefault, masterClock: CMClockGetHostTimeClock(), timebaseOut: &controlTimebase)
         if let controlTimebase = controlTimebase {
@@ -177,9 +184,6 @@ extension MetalPlayView: MTKViewDelegate {
     }
 
     func mtkView(_ view: MTKView, drawableSizeWillChange _: CGSize) {
-        if view.frame != bounds {
-            view.frame = bounds
-        }
     }
 }
 extension MetalPlayView: FrameOutput {