Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
Sailassist
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
CpjJwWHV
Sailassist
Commits
695c323b
Commit
695c323b
authored
Jul 30, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SSVのアラート履歴にNo Finishedを記録するための修正
parent
64649622
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
7 deletions
+19
-7
project.pbxproj
Seilassist/Sailassist.xcodeproj/project.pbxproj
+3
-3
GetEcaList.swift
Seilassist/Sailassist/ECA/GetEcaList.swift
+9
-2
RegisteredEca.swift
Seilassist/Sailassist/ECA/RegisteredEca.swift
+2
-1
SetEcaArea.swift
Seilassist/Sailassist/ECA/SetEcaArea.swift
+5
-1
No files found.
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @
695c323b
...
...
@@ -1307,7 +1307,7 @@
CODE_SIGN_ENTITLEMENTS
=
Sailassist/Sailassist.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
4
2
;
CURRENT_PROJECT_VERSION
=
4
3
;
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
=
4
2
;
CURRENT_PROJECT_VERSION
=
4
3
;
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
=
4
2
;
CURRENT_PROJECT_VERSION
=
4
3
;
DEVELOPMENT_ASSET_PATHS
=
"\"Sailassist/Preview Content\""
;
DEVELOPMENT_TEAM
=
D2DC7QNNJ8
;
ENABLE_PREVIEWS
=
YES
;
...
...
Seilassist/Sailassist/ECA/GetEcaList.swift
View file @
695c323b
...
...
@@ -43,8 +43,13 @@ class GetEcaList {
value
.
isRunning
=
true
value
.
status
=
setEcaServer
(
status
:
ecaList
.
status
)
}
else
{
value
.
isRunning
=
false
value
.
status
=
EcaState
.
register
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
View file @
695c323b
...
...
@@ -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
View file @
695c323b
...
...
@@ -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
>
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment