通知画面実装

Seilassist/Sailassist/Alert/NotificationView.swift

@@ -8,15 +8,20 @@
 import SwiftUI
 
 struct NotificationView: View {
+    @ObservedObject var pushHist = SharingData.pushHistory
     var body: some View {
         VStack(spacing: 0){
             TitleView()
             
-            NotificationContentView()
-            
-            Divider()
-                .frame(height: 1)
-                .background(ColorSet.LineColor04.color)
+            ScrollView {
+                ForEach(pushHist.pushHistoryData.map{ $1 }.sorted{ DateTextLib.ISO8601Text2UnixTime($0.time) > DateTextLib.ISO8601Text2UnixTime($1.time)}, id: \.id){ data in
+                    NotificationContentView(pushData: data)
+                    
+                    Divider()
+                        .frame(height: 1)
+                        .background(ColorSet.LineColor04.color)
+                }
+            }
             
             Spacer()
         }

Seilassist/Sailassist/Alert/View/NotificationContentView.swift

@@ -8,14 +8,15 @@
 import SwiftUI
 
 struct NotificationContentView: View {
+    var pushData: ResPushHistory
     var body: some View {
         VStack(alignment: .leading, spacing: 4){
             HStack(spacing: 10) {
-                Text("2023-07-13T08::17:40Z")
+                Text(pushData.time ?? "2023-07-13T08::17:40Z")
                     .foregroundColor(ColorSet.BodyDescriptiion.color)
                     .font(FontStyle.SupplementText2.font)
                 
-                Text("Emergency")
+                Text(PushStatus(rawValue: pushData.status ?? 0)?.title ?? PushStatus.Unknown.title)
                     .padding(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
                     .border(ColorSet.Body.color, width: 1, cornerRadius: 4)
                     .foregroundColor(ColorSet.Body.color)
@@ -24,11 +25,11 @@ struct NotificationContentView: View {
                 Spacer()
             }
             
-            Text("JTest-Ship")
+            Text(pushData.title ?? "JTest-Ship")
                 .foregroundColor(ColorSet.Body.color)
                 .font(FontStyle.EmphasisText.font)
             
-            Text("Fire emergency notice from ship")
+            Text(pushData.message ?? "Fire emergency notice from ship")
                 .foregroundColor(ColorSet.BodyDescriptiion.color)
                 .font(FontStyle.SupplementText2.font)
         }
@@ -38,5 +39,5 @@ struct NotificationContentView: View {
 }
 
 #Preview {
-    NotificationContentView()
+    NotificationContentView(pushData: ResPushHistory())
 }

Seilassist/Sailassist/ECA/EcaCoordinatesTable.swift

@@ -4313,7 +4313,7 @@ class EcaCoordinatesTable : NSObject {
     }
 
     var ecaDataTable:[ecaData] = [
-        ecaData(id: 11, name: "North American Atlantic Coasts", table: northAmericanAtlanticCoasts)
+//        ecaData(id: 11, name: "North American Atlantic Coasts", table: northAmericanAtlanticCoasts)
 //        ecaData(id: 12, name: "North American Hawai", table: northAmericanHawai),
 //        ecaData(id: 31, name: "Unites States Caribbean", table: unitesStatesCaribbean),
 //        ecaData(id: 21, name: "North Sea 1", table: northSea1),   //err
@@ -4332,7 +4332,7 @@ class EcaCoordinatesTable : NSObject {
 //        ecaData(id: 17, name: "Korea Busan Port West", table: koreaBusanPortWest),
 //        ecaData(id: 18, name: "Korea Ulsan Port", table: koreaUlsanPort),
 //        ecaData(id: 19, name: "Panama Canal Atlantic Entrance", table: panamaCanalAtlanticEntrance),
-//        ecaData(id: 20, name: "Panama Canal Pacific Entrance", table: panamaCanalPacificEntrance)
+        ecaData(id: 20, name: "Panama Canal Pacific Entrance", table: panamaCanalPacificEntrance)
     ]
 
     func setEcaData() {

Seilassist/Sailassist/Json/ResPushHistory.swift

@@ -8,19 +8,40 @@
 import Foundation
 
 //status
-let statusUnknown = 0
-let statusNormal = 1
-let statusCaution = 2
-let statusWarning = 3
-let statusAlarm = 4
-let statusEmergency = 5
+enum PushStatus: Int {
+    case Unknown = 0
+    case Normal = 1
+    case Caution = 2
+    case Warning = 3
+    case Alarm = 4
+    case Emergency = 5
+    
+    var title: String{
+        switch self {
+        case .Unknown:
+            "Unknown"
+        case .Normal:
+            "Normal"
+        case .Caution:
+            "Caution"
+        case .Warning:
+            "Warning"
+        case .Alarm:
+            "Alerm"
+        case .Emergency:
+            "Emergency"
+        }
+    }
+}
 
 //type
-let typeRouteAlert = 0
-let typeBamAlert = 1
-let typeEmergency = 2
-let typeChat = 3
-let typeSailassistTask = 4
+enum PushType: Int{
+    case RouteAlert = 0
+    case BamAlert = 1
+    case Emergency = 2
+    case Chat = 3
+    case SailassistTask = 4
+}
 
 struct ResPushHistory : Codable {
     var id: Int?