ECA/NGA通信不具合修正

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -1307,7 +1307,7 @@
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1353,7 +1353,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;
@@ -1536,7 +1536,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;

Seilassist/Sailassist/ECA/RegisteredEca.swift

@@ -31,7 +31,7 @@ let serverCancel =  0x00000400       //ECAタスクキャンセル (タスク終
 struct RegisteredEca {
     var id: String = ""
     var areaId: Int = 0
-    var userName: String = ""
+    var userName: String?
     var isEnable: Bool = false      //ECA有効
     var isRunning: Bool = false     //ECA実行中
     var name: String = ""           //ECA名称
@@ -42,7 +42,7 @@ struct RegisteredEca {
     var datetime: String = ""       //時刻（UTC ISO8601準拠）
     var color: String = ""          //ライン色（ARGB）
     var width: Int = 1              //ライン幅
-    var lastUpdateTime: String = ""
+    var lastUpdateTime: String? = ""
     var centerPosition: CLLocationCoordinate2D = CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0)
     var zoomLevel: CGFloat = 11.0
     var points: [CLLocationCoordinate2D] = []

Seilassist/Sailassist/Json/ReqNgaList.swift

@@ -9,7 +9,7 @@ import Foundation
 
 struct ReqNgaList : Codable {
     var id: String = ""
-    var name: String = ""
+    var name: String? = ""
     var lock: Bool = false
     var enabled: Bool = false
     var geometry: [points] = []

Seilassist/Sailassist/Json/ReqTaskList.swift

@@ -11,12 +11,12 @@ struct ReqTaskList : Codable {
     var id: String = ""
     var areaId: Int = 0
     var taskName: String = ""
-    var userName: String = ""
+    var userName: String? = ""
     var noticeRange: Float = 0.0
     var startRange: Float = 0.0
     var finishRange: Float = 0.0
+    var lastUpdateTime: String? = ""
     var status: Int = 0
-    var lastUpdateTime: String = ""
 
     init(Id: Int) {
         self.areaId = Id

Seilassist/Sailassist/NGA/GetNgaList.swift

@@ -29,7 +29,9 @@ class GetNgaList {
                 for ngaList in res {
                     if let id = NSUUID(uuidString: ngaList.id) {
                         if var nga = ngaAreas[id as UUID] {
-                            nga.name = ngaList.name
+                            if let name = ngaList.name {
+                                nga.name = name
+                            }
                             nga.isLock = ngaList.lock
                             nga.points.removeAll()
                             for pos in ngaList.geometry{
@@ -40,7 +42,9 @@ class GetNgaList {
                         } else {
                             if var nga = RegisteredNga(areaName: "test dammy") {    //TODO: 名称はダミー
                                 nga.areaId = id as UUID
-                                nga.name = ngaList.name
+                                if let name = ngaList.name {
+                                    nga.name = name
+                                }
                                 nga.isLock = ngaList.lock
                                 nga.isRunning = ngaList.enabled
                                 if !ngaList.enabled {