動画対応

Seilassist/Sailassist/Chat/Imagepicker.swift

@@ -15,8 +15,8 @@ struct Imagepicker : UIViewControllerRepresentable {
         let controller = UIImagePickerController()
         controller.sourceType = sourceType
         controller.delegate = context.coordinator
-//        controller.mediaTypes = ["public.image", "public.movie"]
-//        controller.videoQuality = .type640x480
+        controller.mediaTypes = ["public.image", "public.movie"]
+        controller.videoQuality = .typeMedium
         return controller
     }
 

Seilassist/Sailassist/Chat/View/MyChatContentView.swift

@@ -21,12 +21,12 @@ struct MyChatContentView: View {
                     if let msg = message.message {
                         if msg.contains(".jpg") || msg.contains(".png") {
                             ChatUrlImageView(imageUrl: msg, onLoad: onMediaLoaded)
-//                                .onTapGesture {
-//                                    if let videoUrl = message.videoUrl,
-//                                       let url = URL(string: videoUrl) {
-//                                        isVideoPlayerPresented = true
-//                                    }
-//                                }
+                                .onTapGesture {
+                                    if let videoUrl = message.videoUrl,
+                                       let url = URL(string: videoUrl) {
+                                        isVideoPlayerPresented = true
+                                    }
+                                }
                         } else {
                             Text(msg)
                                 .font(FontStyle.DefaultText.font)
@@ -73,12 +73,12 @@ struct MyChatContentView: View {
             }
             .padding(.trailing, 20)
         }
-//        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
-//            if let videoUrl = message.videoUrl,
-//               let url = URL(string: videoUrl) {
-//                VideoPlayerView(videoURL: url)
-//            }
-//        }
+        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
+            if let videoUrl = message.videoUrl,
+               let url = URL(string: videoUrl) {
+                VideoPlayerView(videoURL: url)
+            }
+        }
     }
 
     func viewerCnt() -> (Int, Int) {
@@ -95,15 +95,15 @@ struct MyChatContentView: View {
     }
 }
 
-//struct VideoPlayerView: View {
-//    let videoURL: URL
-//
-//    var body: some View {
-//        VideoPlayer(player: AVPlayer(url: videoURL))
-//            .navigationTitle("動画再生")
-//            .navigationBarTitleDisplayMode(.inline)
-//    }
-//}
+struct VideoPlayerView: View {
+    let videoURL: URL
+
+    var body: some View {
+        VideoPlayer(player: AVPlayer(url: videoURL))
+            .navigationTitle("動画再生")
+            .navigationBarTitleDisplayMode(.inline)
+    }
+}
 
 #Preview {
     MyChatContentView(message: ChatMessage(

Seilassist/Sailassist/Chat/View/OtherChatContentView.swift

@@ -25,13 +25,13 @@ struct OtherChatContentView: View {
                         if let msg = message.message {
                             if msg.contains(".jpg") || msg.contains(".png") {
                                 ChatUrlImageView(imageUrl: msg, onLoad: onMediaLoaded)
-//                                    .onTapGesture {
-//                                        if message.type == 3,
-//                                           let videoUrl = message.videoUrl,
-//                                           let url = URL(string: videoUrl) {
-//                                            isVideoPlayerPresented = true
-//                                        }
-//                                    }
+                                    .onTapGesture {
+                                        if message.type == 3,
+                                           let videoUrl = message.videoUrl,
+                                           let url = URL(string: videoUrl) {
+                                            isVideoPlayerPresented = true
+                                        }
+                                    }
                             } else {
                                 Text(msg)
                                     .font(FontStyle.DefaultText.font)
@@ -60,12 +60,12 @@ struct OtherChatContentView: View {
             .padding(.leading, 20)
             Spacer()
         }
-//        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
-//            if let videoUrl = message.videoUrl,
-//               let url = URL(string: videoUrl) {
-//                VideoPlayerView(videoURL: url)
-//            }
-//        }
+        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
+            if let videoUrl = message.videoUrl,
+               let url = URL(string: videoUrl) {
+                VideoPlayerView(videoURL: url)
+            }
+        }
     }
 }
 

Seilassist/Sailassist/Json/ResGetMessages.swift

@@ -28,10 +28,10 @@ struct ChatMessage: Codable {
     var fromId: String?     //ユーザーID
     var mode: Int           // 0:通常 , 1:Warning中
     var message: String?    //テキスト時：テキスト , 画像時:サムネイルのUri
-//    var videoUrl: String?   //TODO: - テスト
+    var videoUrl: String?   //TODO: - テスト
     var stampId: Int        //スタンプ番号 0:Fire～
-//    var Latitude: Double?   //TODO: - テスト
-//    var Longitude: Double?  //TODO: - テスト
+    var Latitude: Double?   //TODO: - テスト
+    var Longitude: Double?  //TODO: - テスト
     var viewer: [Viewer] = []    //閲覧者情報
 }