wwdc 内容更新

ming1016 · Jun 14, 2024 · 712fe1e · 712fe1e
1 parent b593360
commit 712fe1e
Show file tree

Hide file tree

Showing 4 changed files with 24,348 additions and 8,962 deletions.
diff --git a/SwiftPamphletApp.xcodeproj/project.pbxproj b/SwiftPamphletApp.xcodeproj/project.pbxproj
@@ -2109,6 +2109,7 @@
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = "";
 			};
 			name = Debug;
@@ -2164,6 +2165,7 @@
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = "";
 			};
 			name = Release;

diff --git a/SwiftPamphletApp/Guide/WWDC/WWDCDetailView.swift b/SwiftPamphletApp/Guide/WWDC/WWDCDetailView.swift
@@ -39,7 +39,6 @@ struct WWDCDetailView: View {
                 if selectInfo == nil {
                     VStack(spacing: 10) {
                         HStack {
-                            Spacer()
                             Text(ss.title)
                                 .font(.title)
                             Spacer()
@@ -48,13 +47,22 @@ struct WWDCDetailView: View {
                             }
                         }
                         VStack(alignment:.leading, spacing: 10) {
-                            if let vurl = ss.media.videoOriginalUrl {
+                            if let vurl = ss.media.streamHLS {
                                 if let okVurl = URL(string: vurl) {
-                                    if ss.year > 2020 {
-                                        VideoPlayer(player: AVPlayer(url: okVurl))
-                                    } else {
-                                        Link("视频地址：\(vurl)", destination: okVurl)
-                                    }
+//                                    if ss.year > 2020 {
+//                                        VideoPlayer(player: AVPlayer(url: okVurl))
+//                                    } else {
+//                                        Link("视频地址：\(vurl)", destination: okVurl)
+//                                    }
+                                    VideoPlayer(player: AVPlayer(url: okVurl))
+                                }
+                            }
+                            HStack {
+                                if let hd = ss.media.downloadHD {
+                                    Link("HD 下载链接", destination: URL(string: hd)!)
+                                }
+                                if let sd = ss.media.downloadSD {
+                                    Link("SD 下载链接", destination: URL(string: sd)!)
                                 }
                             }
                             if let platforms = ss.platforms {

diff --git a/SwiftPamphletApp/Guide/WWDC/WWDCModel.swift b/SwiftPamphletApp/Guide/WWDC/WWDCModel.swift
@@ -64,9 +64,12 @@ struct WWDCSessionModel: Jsonable {
 
 struct WWDCMedia: Decodable, Hashable {
     var duration: Int?
-    var videoOriginalFilename: String?
-    var videoOriginalUrl: String?
-    var videoFilename: String?
+//    var videoOriginalFilename: String?
+//    var videoOriginalUrl: String?
+//    var videoFilename: String?
+    var streamHLS: String?
+    var downloadHD: String?
+    var downloadSD: String?
 }
 
 struct WWDCEvent: Jsonable {