Webブラウザを開いて動画を再生

Seilassist/Sailassist/Chat/View/MyChatContentView.swift

@@ -4,12 +4,10 @@
 //
 //  Created by Mamoru Sugita on 2023/11/08.
 //
-
 import SwiftUI
 import AVKit
 
 struct MyChatContentView: View {
-    @State private var isVideoPlayerPresented = false
     var message : ChatMessage
     var onMediaLoaded: (() -> Void)? = nil
 
@@ -22,9 +20,12 @@ struct MyChatContentView: View {
                         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
+                                    var urlString: String = HttpRequestType.RawImage.rawValue
+                                    urlString = urlString.replacingOccurrences(of: "XXXXX", with: String(message.shipId))
+                                    urlString = urlString.replacingOccurrences(of: "YYYYY", with: String(message.messageId))
+
+                                    if let url = URL(string: urlString) {
+                                        UIApplication.shared.open(url)
                                     }
                                 }
                         } else {
@@ -73,12 +74,6 @@ struct MyChatContentView: View {
             }
             .padding(.trailing, 20)
         }
-        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
-            if let videoUrl = message.videoUrl,
-               let url = URL(string: videoUrl) {
-                VideoPlayerView(videoURL: url)
-            }
-        }
     }
 
     func viewerCnt() -> (Int, Int) {
@@ -95,16 +90,6 @@ struct MyChatContentView: View {
     }
 }
 
-struct VideoPlayerView: View {
-    let videoURL: URL
-
-    var body: some View {
-        VideoPlayer(player: AVPlayer(url: videoURL))
-            .navigationTitle("動画再生")
-            .navigationBarTitleDisplayMode(.inline)
-    }
-}
-
 #Preview {
     MyChatContentView(message: ChatMessage(
         shipId: 10000003,

Seilassist/Sailassist/Chat/View/OtherChatContentView.swift

@@ -8,7 +8,6 @@ import SwiftUI
 import AVKit
 
 struct OtherChatContentView: View {
-    @State private var isVideoPlayerPresented = false
     var message : ChatMessage
     var onMediaLoaded: (() -> Void)? = nil
 
@@ -26,10 +25,12 @@ struct OtherChatContentView: View {
                             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
+                                        var urlString: String = HttpRequestType.RawImage.rawValue
+                                        urlString = urlString.replacingOccurrences(of: "XXXXX", with: String(message.shipId))
+                                        urlString = urlString.replacingOccurrences(of: "YYYYY", with: String(message.messageId))
+
+                                        if let url = URL(string: urlString) {
+                                            UIApplication.shared.open(url)
                                         }
                                     }
                             } else {
@@ -60,12 +61,6 @@ struct OtherChatContentView: View {
             .padding(.leading, 20)
             Spacer()
         }
-        .fullScreenCover(isPresented: $isVideoPlayerPresented) {
-            if let videoUrl = message.videoUrl,
-               let url = URL(string: videoUrl) {
-                VideoPlayerView(videoURL: url)
-            }
-        }
     }
 }
 

Seilassist/Sailassist/Json/ResGetMessages.swift

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