SSVのアラート履歴にNo Finishedを記録するための修正

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 = 42;
+				CURRENT_PROJECT_VERSION = 43;
 				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 = 42;
+				CURRENT_PROJECT_VERSION = 43;
 				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 = 42;
+				CURRENT_PROJECT_VERSION = 43;
 				DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
 				DEVELOPMENT_TEAM = D2DC7QNNJ8;
 				ENABLE_PREVIEWS = YES;

Seilassist/Sailassist/ECA/GetEcaList.swift

@@ -42,10 +42,15 @@ class GetEcaList {
                         if ecaList.status & serverRunning == serverRunning {
                             value.isRunning = true
                             value.status = setEcaServer(status: ecaList.status)
+                        } else {
+                            if ecaList.status == serverNoFinished {
+                                value.isRunning = true
+                                value.status = setEcaServer(status: ecaList.status)
                             } else {
                                 value.isRunning = false
                                 value.status = EcaState.register
                             }
+                        }
                         ecaAreas.updateValue(value, forKey: ecaList.areaId)
                     }
                 }
@@ -70,6 +75,8 @@ class GetEcaList {
             state = EcaState.startPass
         case serverFinishPass:
             state = EcaState.finishPass
+        case serverNoFinished:
+            state = EcaState.finishPass
         case serverEnd:
             state = EcaState.end
         case serverIncomplete:

Seilassist/Sailassist/ECA/RegisteredEca.swift

@@ -23,7 +23,8 @@ let serverRegister = 0x00000000      //登録
 let serverRunning = 0x10000000       //ECAタスク実行開始
 let serverNoticePass = 0x10000001    //ECA通知円到達
 let serverStartPass = 0x10000002     //ECA開始円到達
-let serverFinishPass = 0x00000004    //ECAタスク終了円到達
+let serverFinishPass = 0x10000004    //ECAタスク終了円到達
+let serverNoFinished = 0x00000004
 let serverEnd = 0x00000100           //ECAタスク完了（燃料切替実施済み)
 let serverIncomplete = 0x00000200    //ECAタスク未完了 (燃料切替未実施で終了)
 let serverCancel =  0x00000400       //ECAタスクキャンセル (タスク終了・タスク未完了前にキャンセル)

Seilassist/Sailassist/ECA/SetEcaArea.swift

@@ -14,7 +14,11 @@ class SetEcaArea {
 
     func start(eca : ReqTaskList) {
         print(debug: "called")
-        sessionTaskList.RequestPostTaskList(eca, completion: responsePostTaskList)
+        var ecaTmp = eca
+        if ecaTmp.status == serverFinishPass {
+            ecaTmp.status = serverNoFinished   //SSVのアラート履歴にNo Finishedを記録するために変換
+        }
+        sessionTaskList.RequestPostTaskList(ecaTmp, completion: responsePostTaskList)
     }
 
     private func responsePostTaskList(result: Result<Data, APIError>) {