[#50]fix: fix demo's play media error (#52)

* [#50]fix: fix demo's play media error
alibaba · Apr 19, 2024 · 055b37a · 055b37a
1 parent dbf7cf2
commit 055b37a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/Demo/Demo/Demo-iOS/FileListViewController.swift b/Demo/Demo/Demo-iOS/FileListViewController.swift
@@ -75,13 +75,22 @@ class FileListViewController: UIViewController {
 
     /// 播放音频
     @MainActor
-    private func playMedia(_ url: URL) {
+    private func playMedia(_ url: URL, mimeType: String?) {
         let headers = [
             "Authorization": "Bearer \(client.accessToken ?? "")"
         ]
-        let asset = AVURLAsset(url: url, options: [
-            "AVURLAssetHTTPHeaderFieldsKey": headers
-        ])
+        let asset: AVURLAsset
+        if #available(iOS 17.0, *), let mimeType {
+            asset = AVURLAsset(url: url, options: [
+                "AVURLAssetHTTPHeaderFieldsKey": headers,
+                AVURLAssetOverrideMIMETypeKey: mimeType
+            ])
+        } else {
+            asset = AVURLAsset(url: url, options: [
+                "AVURLAssetHTTPHeaderFieldsKey": headers
+            ])
+        }
+
         let playerItem = AVPlayerItem(asset: asset)
         let player = AVPlayer(playerItem: playerItem)
         let playerViewController = AVPlayerViewController()
@@ -139,7 +148,7 @@ extension FileListViewController: UICollectionViewDelegate {
                         .last
 
                     if let playURL {
-                        playMedia(playURL)
+                        playMedia(playURL, mimeType: file.mime_type)
                     }
                 } catch {
                     print(error)
@@ -156,7 +165,7 @@ extension FileListViewController: UICollectionViewDelegate {
                                 .init(
                                     drive_id: file.drive_id,
                                     file_id: file.file_id))).url
-                    playMedia(playURL)
+                    playMedia(playURL, mimeType: file.mime_type)
                 } catch {
                     print(error)
                 }
@@ -203,7 +212,7 @@ extension FileListViewController: FileCellDelegate {
             return
         }
         if item.file.category == .video {
-            playMedia(url)
+            playMedia(url, mimeType: item.file.mime_type)
         } else {
             let viewController = UIDocumentInteractionController(url: url)
             viewController.delegate = self

diff --git a/Sources/AliyunpanSDK/Model/AliyunpanFile.swift b/Sources/AliyunpanSDK/Model/AliyunpanFile.swift
@@ -20,6 +20,7 @@ public struct AliyunpanFile: Codable {
     public let content_hash: String?
     public var category: FileCategory?
     public let type: FileType?
+    public let mime_type: String?
     /// 缩略图
     public let thumbnail: URL?
     /// 图片预览图地址、小于 5MB 文件的下载地址。超过5MB 请使用 /getDownloadUrl

diff --git a/Tests/AliyunpanSDKTests/DownloaderTaskTests.swift b/Tests/AliyunpanSDKTests/DownloaderTaskTests.swift
@@ -17,6 +17,7 @@ let file = AliyunpanFile(
     file_extension: nil,
     content_hash: nil,
     type: .file,
+    mime_type: nil, 
     thumbnail: nil,
     url: nil,
     created_at: nil,

diff --git a/Tests/AliyunpanSDKTests/DownloaderTests.swift b/Tests/AliyunpanSDKTests/DownloaderTests.swift
@@ -18,6 +18,7 @@ class DownloaderTests: XCTestCase {
         file_extension: nil,
         content_hash: nil,
         type: .file,
+        mime_type: nil,
         thumbnail: nil,
         url: nil,
         created_at: nil,