Chat Warning時のチャットにアイコンを追加

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -100,6 +100,8 @@
 		D55135202B15B030007B66B1 /* SetEcaArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = D551351F2B15B030007B66B1 /* SetEcaArea.swift */; };
 		D55135222B15C062007B66B1 /* GetEcaList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55135212B15C062007B66B1 /* GetEcaList.swift */; };
 		D55135242B15C3BF007B66B1 /* DeleteEcaArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55135232B15C3BF007B66B1 /* DeleteEcaArea.swift */; };
+		D5598B782C435A5C00611AE0 /* ChatUrlImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5598B772C435A5C00611AE0 /* ChatUrlImageView.swift */; };
+		D5598B7A2C435C4500611AE0 /* ChatUrlRawImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5598B792C435C4500611AE0 /* ChatUrlRawImageView.swift */; };
 		D57905FE2C1C069000AF797C /* SetNgaArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57905FD2C1C069000AF797C /* SetNgaArea.swift */; };
 		D57906002C1C06F600AF797C /* SessionNgaList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57905FF2C1C06F600AF797C /* SessionNgaList.swift */; };
 		D57906022C1C0CFB00AF797C /* ReqNgaList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D57906012C1C0CFB00AF797C /* ReqNgaList.swift */; };
@@ -281,6 +283,8 @@
 		D551351F2B15B030007B66B1 /* SetEcaArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SetEcaArea.swift; path = Sailassist/ECA/SetEcaArea.swift; sourceTree = SOURCE_ROOT; };
 		D55135212B15C062007B66B1 /* GetEcaList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = GetEcaList.swift; path = Sailassist/ECA/GetEcaList.swift; sourceTree = SOURCE_ROOT; };
 		D55135232B15C3BF007B66B1 /* DeleteEcaArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DeleteEcaArea.swift; path = Sailassist/ECA/DeleteEcaArea.swift; sourceTree = SOURCE_ROOT; };
+		D5598B772C435A5C00611AE0 /* ChatUrlImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChatUrlImageView.swift; path = Sailassist/Chat/View/ChatUrlImageView.swift; sourceTree = SOURCE_ROOT; };
+		D5598B792C435C4500611AE0 /* ChatUrlRawImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChatUrlRawImageView.swift; path = Sailassist/Chat/View/ChatUrlRawImageView.swift; sourceTree = SOURCE_ROOT; };
 		D57905FD2C1C069000AF797C /* SetNgaArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetNgaArea.swift; sourceTree = "<group>"; };
 		D57905FF2C1C06F600AF797C /* SessionNgaList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SessionNgaList.swift; path = Sailassist/ServerSession/SessionNgaList.swift; sourceTree = SOURCE_ROOT; };
 		D57906012C1C0CFB00AF797C /* ReqNgaList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ReqNgaList.swift; path = Sailassist/Json/ReqNgaList.swift; sourceTree = SOURCE_ROOT; };
@@ -644,6 +648,8 @@
 				02A1DE322AFB654A005BCF55 /* CustomCornerRadius.swift */,
 				02C3E6082AFDF30000AF7837 /* ChatMemberView.swift */,
 				D524DAF92B5A6F5F00A399DD /* CameraView.swift */,
+				D5598B772C435A5C00611AE0 /* ChatUrlImageView.swift */,
+				D5598B792C435C4500611AE0 /* ChatUrlRawImageView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1031,6 +1037,7 @@
 				D5B803282B3B988E003B32AD /* AppVersionModel.swift in Sources */,
 				D592D5232B0F14FE00B91A1C /* SessionUploadImage.swift in Sources */,
 				D5FCEF552B478985009A81D0 /* ResChatMessage.swift in Sources */,
+				D5598B782C435A5C00611AE0 /* ChatUrlImageView.swift in Sources */,
 				022A98202AF8B8960079C55A /* LocationCalculation.swift in Sources */,
 				D5258CA72B03988600365276 /* ReqTaskList.swift in Sources */,
 				D5CB6F9B2B021C4F00EC2010 /* LocationViewModel.swift in Sources */,
@@ -1127,6 +1134,7 @@
 				D59908C62B19EA70000E13DD /* ResPushHistory.swift in Sources */,
 				D58EF2472B9044C800FB784C /* ResInformation.swift in Sources */,
 				020B986C2ADD3E810029DE4C /* InTextLib.swift in Sources */,
+				D5598B7A2C435C4500611AE0 /* ChatUrlRawImageView.swift in Sources */,
 				02C3E5D12AFCC16800AF7837 /* ChatTitleView.swift in Sources */,
 				024EDE1D2B0C42F70013BAC8 /* MenuGpsSelectView.swift in Sources */,
 				020B98472AD8FEE30029DE4C /* ColorSet.swift in Sources */,
@@ -1299,7 +1307,7 @@
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1345,7 +1353,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1529,7 +1537,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;

Seilassist/Sailassist/Chat/View/ChatUrlImageView.swift

+//
+//  ChatUrlImageView.swift
+//  Sailassist
+//
+//  Created by 三浦薫巳 on 2024/07/14.
+//
+
+import SwiftUI
+
+struct ChatUrlImageView: View {
+    var imageUrl: String
+
+    init(message: ChatMessage) {
+        self.imageUrl = message.message
+    }
+
+    var body: some View {
+        AsyncImage(url: URL(string: imageUrl)) { phase in
+            if let image = phase.image {
+                image
+                    .resizable(resizingMode: .stretch)
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: 250)
+            } else if phase.error != nil {
+                Color.gray.opacity(0.2)
+                    .overlay(Image(systemName: "rectangle.slash"))
+            } else {
+                Color.gray.opacity(0.2)
+                ProgressView()
+            }
+        }
+        .cornerRadius(16)
+        .frame(height: 250)
+    }
+}
+
+#Preview {
+    ChatUrlImageView(message: ChatMessage(
+        shipId: 10000003,
+        messageId: "92c2dfb5-f5ed-4943-98a3-9848d7f9a962",
+        type: 0,
+        time: "2023-10-06T01:51:01.872Z",
+        location: 1,
+        from: "はだだ",
+        fromId: "487420489",
+        message: "999",
+        stampId: 0,
+        viewer: [
+            Viewer(
+                time: "2023-10-06T01:51:12.973Z",
+                location: 1,
+                id: ""),
+            Viewer(
+                time: "2023-10-06T01:51:12.973Z",
+                location: 2,
+                id: "")
+        ]
+    ))
+}

Seilassist/Sailassist/Chat/View/ChatUrlRawImageView.swift

+//
+//  ChatUrlRawImageView.swift
+//  Sailassist
+//
+//  Created by 三浦薫巳 on 2024/07/14.
+//
+
+import SwiftUI
+
+struct ChatUrlRawImageView: View {
+    var imageUrl: String
+
+    init(message: ChatMessage) {
+        var url_string : String = HttpRequestType.RawImage.rawValue
+        url_string = url_string.replacingOccurrences(of: "XXXXX", with: String(message.shipId))
+        url_string = url_string.replacingOccurrences(of: "YYYYY", with: String(message.messageId))
+
+        self.imageUrl = url_string
+    }
+
+    var body: some View {
+        VStack {
+            AsyncImage(url: URL(string: imageUrl)) { phase in
+                if let image = phase.image {
+                    image
+                        .resizable(resizingMode: .stretch)
+                        .aspectRatio(contentMode: .fit)
+                        .frame(width: 250)
+                } else if phase.error != nil {
+                    Color.gray.opacity(0.2)
+                        .overlay(Image(systemName: "rectangle.slash"))
+                } else {
+                    Color.gray.opacity(0.2)
+                    ProgressView()
+                }
+            }
+            .cornerRadius(16)
+            .aspectRatio(contentMode: .fit)
+            .frame(height: 250)
+        }
+        .navigationTitle("image")
+    }
+}
+
+#Preview {
+    ChatUrlRawImageView(message: ChatMessage(
+        shipId: 10000003,
+        messageId: "92c2dfb5-f5ed-4943-98a3-9848d7f9a962",
+        type: 0,
+        time: "2023-10-06T01:51:01.872Z",
+        location: 1,
+        from: "はだだ",
+        fromId: "487420489",
+        message: "999",
+        stampId: 0,
+        viewer: [
+            Viewer(
+                time: "2023-10-06T01:51:12.973Z",
+                location: 1,
+                id: ""),
+            Viewer(
+                time: "2023-10-06T01:51:12.973Z",
+                location: 2,
+                id: "")
+        ]
+    ))
+}

Seilassist/Sailassist/Chat/View/MyChatContentView.swift

@@ -15,22 +15,7 @@ struct MyChatContentView: View {
             VStack(alignment: .trailing, spacing: 6) {
                 Group {
                     if message.message.contains("https://") {   //TODO: stampIdが0
-                        AsyncImage(url: URL(string: message.message)) { phase in
-                            if let image = phase.image {
-                                image
-                                    .resizable(resizingMode: .stretch)
-                                    .aspectRatio(contentMode: .fit)
-                                    .frame(width: 250)
-                            } else if phase.error != nil {
-                                Color.gray.opacity(0.2)
-                                    .overlay(Image(systemName: "rectangle.slash"))
-                            } else {
-                                Color.gray.opacity(0.2)
-                                ProgressView()
-                            }
-                        }
-                        .cornerRadius(16)
-                        .frame(height: 250)
+                        ChatUrlImageView(message: message)
                     } else {
                         Text(message.message)
                             .font(FontStyle.DefaultText.font)

Seilassist/Sailassist/Chat/View/OtherChatContentView.swift

@@ -18,22 +18,7 @@ struct OtherChatContentView: View {
                 VStack(alignment: .leading, spacing: 10) {
                     Group {
                         if message.message.contains("https://") {   //TODO: stampIdが0
-                            AsyncImage(url: URL(string: message.message)) { phase in
-                                if let image = phase.image {
-                                    image
-                                        .resizable(resizingMode: .stretch)
-                                        .aspectRatio(contentMode: .fit)
-                                        .frame(width: 250)
-                                } else if phase.error != nil {
-                                    Color.gray.opacity(0.2)
-                                        .overlay(Image(systemName: "rectangle.slash"))
-                                } else {
-                                    Color.gray.opacity(0.2)
-                                    ProgressView()
-                                }
-                            }
-                            .cornerRadius(16)
-                            .frame(height: 250)
+                            ChatUrlImageView(message: message)
                         } else {
                             Text(message.message)
                                 .font(FontStyle.DefaultText.font)
@@ -58,6 +43,30 @@ struct OtherChatContentView: View {
     }
 }
 
+struct AlertChatMessage: View {
+    var message : ChatMessage
+    var body: some View {
+        HStack {
+            Image(systemName: "exclamationmark.triangle.fill")
+                .foregroundColor(.red)
+                .frame(width: 48, height: 48)
+            Text(alertStr())
+                .font(FontStyle.DefaultText.font)
+                .foregroundColor(ColorSet.BodyChat.color)
+                .padding(15)
+                .background(ColorSet.ChatBaloon.color)
+                .cornerRadius(10, corners: [.tl, .tr, .br])
+        }
+    }
+
+
+    func alertStr() -> String {
+        var msg = message.message
+        msg.removeFirst()
+        return msg
+    }
+}
+
 #Preview {
     OtherChatContentView(message: ChatMessage(
         shipId: 10000003,

Seilassist/Sailassist/Http/HttpRequestType.swift

@@ -24,6 +24,7 @@ enum HttpRequestType : String {
     case SignalR = "https://ssv-canary-web.azurewebsites.net/signalr/shore"
     case PushHistory = "https://ssv-canary-web.azurewebsites.net/api/sailassist/pushhistory/XXXXX"
     case UploadImage = "https://ssv-canary-web.azurewebsites.net/api/chatdata/uploadimage"
+    case RawImage = "https://ssv-canary-web.azurewebsites.net/api/chatdata/rawimage?shipId=XXXXX&messageId=YYYYY"
     case ConnectionString = "Endpoint=sb://ssv-canary-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=zHzVMA757FciMum5jVG4NMl82YpYVzclUgCiKOVRKf8="
     case HubName = "ssv-canary-sailassist-notification"
     case storage = "https://ssvcanarystorage.z1.web.core.windows.net/"
@@ -51,6 +52,7 @@ enum HttpRequestType : String {
     case SignalR = "https://ssv-qc-web.azurewebsites.net/signalr/shore"
     case PushHistory = "https://ssv-qc-web.azurewebsites.net/api/sailassist/pushhistory/XXXXX"
     case UploadImage = "https://ssv-qc-web.azurewebsites.net/api/chatdata/uploadimage"
+    case RawImage = "https://ssv-qc-web.azurewebsites.net/api/chatdata/rawimage?shipId=XXXXX&messageId=YYYYY"
     case ConnectionString = "Endpoint=sb://ssv-qc-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=qjI5K38IyGfh2arFherVgp5tNUBE2U4eVClgTEQip54="
     case HubName = "ssv-qc-sailassist-notification"
     case storage = "https://tacmiquaritycheckstorage.z31.web.core.windows.net/"
@@ -79,6 +81,7 @@ enum HttpRequestType : String {
     case SignalR = "https://ssv.jmarinecloud.com/signalr/shore"
     case PushHistory = "https://ssv.jmarinecloud.com/api/sailassist/pushhistory/XXXXX"
     case UploadImage = "https://ssv.jmarinecloud.com/api/chatdata/uploadimage"
+    case RawImage = "https://ssv.jmarinecloud.com/api/chatdata/rawimage?shipId=XXXXX&messageId=YYYYY"
     case ConnectionString = "Endpoint=sb://ssv-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=IzbO7Lo+PenhlIaHBw1MA7+NE9XaLikwieOFwCzZC50="
     case HubName = "ssv-sailassist-notification"
     case storage = "https://tacmistorage.z31.web.core.windows.net/"

Seilassist/Sailassist/Login/LoginView.swift

@@ -49,7 +49,7 @@ struct LoginView: View {
     let sessionLogin = SessionLogin()
 
     var body: some View {
-        NavigationView {
+        NavigationView {    //TODO:非推奨
             ZStack{
                 Triangle()
                     .fill(ColorSet.LoginBk03.color)

Seilassist/Sailassist/SailassistApp.swift

@@ -257,7 +257,11 @@ class SignalR: NSObject {
         request.location = 2                //1:Shore , 2:Ship
         request.from = Preferences.UserName //投稿者名
         request.fromeId = String(SharingData.my.id) //ユーザーID
-        request.message = message           //テキスト
+        if msg.mode {
+            request.message = "⚠️" + message
+        } else {
+            request.message = message
+        }
         request.stampId = 0                 //スタンプ番号 0:Fire～
 
         if message != "" {