Commit 695c323b authored by shigemi miura's avatar shigemi miura

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

parent 64649622
...@@ -1307,7 +1307,7 @@ ...@@ -1307,7 +1307,7 @@
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42; CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1353,7 +1353,7 @@ ...@@ -1353,7 +1353,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42; CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1536,7 +1536,7 @@ ...@@ -1536,7 +1536,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42; CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
......
...@@ -43,8 +43,13 @@ class GetEcaList { ...@@ -43,8 +43,13 @@ class GetEcaList {
value.isRunning = true value.isRunning = true
value.status = setEcaServer(status: ecaList.status) value.status = setEcaServer(status: ecaList.status)
} else { } else {
value.isRunning = false if ecaList.status == serverNoFinished {
value.status = EcaState.register value.isRunning = true
value.status = setEcaServer(status: ecaList.status)
} else {
value.isRunning = false
value.status = EcaState.register
}
} }
ecaAreas.updateValue(value, forKey: ecaList.areaId) ecaAreas.updateValue(value, forKey: ecaList.areaId)
} }
...@@ -70,6 +75,8 @@ class GetEcaList { ...@@ -70,6 +75,8 @@ class GetEcaList {
state = EcaState.startPass state = EcaState.startPass
case serverFinishPass: case serverFinishPass:
state = EcaState.finishPass state = EcaState.finishPass
case serverNoFinished:
state = EcaState.finishPass
case serverEnd: case serverEnd:
state = EcaState.end state = EcaState.end
case serverIncomplete: case serverIncomplete:
......
...@@ -23,7 +23,8 @@ let serverRegister = 0x00000000 //登録 ...@@ -23,7 +23,8 @@ let serverRegister = 0x00000000 //登録
let serverRunning = 0x10000000 //ECAタスク実行開始 let serverRunning = 0x10000000 //ECAタスク実行開始
let serverNoticePass = 0x10000001 //ECA通知円到達 let serverNoticePass = 0x10000001 //ECA通知円到達
let serverStartPass = 0x10000002 //ECA開始円到達 let serverStartPass = 0x10000002 //ECA開始円到達
let serverFinishPass = 0x00000004 //ECAタスク終了円到達 let serverFinishPass = 0x10000004 //ECAタスク終了円到達
let serverNoFinished = 0x00000004
let serverEnd = 0x00000100 //ECAタスク完了(燃料切替実施済み) let serverEnd = 0x00000100 //ECAタスク完了(燃料切替実施済み)
let serverIncomplete = 0x00000200 //ECAタスク未完了 (燃料切替未実施で終了) let serverIncomplete = 0x00000200 //ECAタスク未完了 (燃料切替未実施で終了)
let serverCancel = 0x00000400 //ECAタスクキャンセル (タスク終了・タスク未完了前にキャンセル) let serverCancel = 0x00000400 //ECAタスクキャンセル (タスク終了・タスク未完了前にキャンセル)
......
...@@ -14,7 +14,11 @@ class SetEcaArea { ...@@ -14,7 +14,11 @@ class SetEcaArea {
func start(eca : ReqTaskList) { func start(eca : ReqTaskList) {
print(debug: "called") 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>) { private func responsePostTaskList(result: Result<Data, APIError>) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment