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
54
Merge Requests
54
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
gr-ssv
Sailassist
Commits
575810d0
Commit
575810d0
authored
Dec 24, 2023
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
不具合修正
parent
f1e7b24d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
EcaTask.swift
Seilassist/Sailassist/ECA/EcaTask.swift
+2
-2
TaskSwitchingMenuView.swift
...sist/Sailassist/Map/Task/View/TaskSwitchingMenuView.swift
+1
-1
MainTabView.swift
Seilassist/Sailassist/Tab/MainTabView.swift
+1
-1
No files found.
Seilassist/Sailassist/ECA/EcaTask.swift
View file @
575810d0
...
@@ -84,7 +84,7 @@ class EcaTask {
...
@@ -84,7 +84,7 @@ class EcaTask {
SharingData
.
my
.
ecaStatus
=
EcaState
.
finishPass
SharingData
.
my
.
ecaStatus
=
EcaState
.
finishPass
}
}
if
0.0
>=
Float
(
distance
)
&&
eca
.
status
==
EcaState
.
start
Pass
{
if
0.0
>=
Float
(
distance
)
&&
eca
.
status
==
EcaState
.
finish
Pass
{
SharingData
.
eca
.
isShowEcaAlert
=
true
SharingData
.
eca
.
isShowEcaAlert
=
true
SharingData
.
my
.
ecaStatus
=
EcaState
.
incomplete
SharingData
.
my
.
ecaStatus
=
EcaState
.
incomplete
}
}
...
@@ -101,7 +101,7 @@ class EcaTask {
...
@@ -101,7 +101,7 @@ class EcaTask {
var
result
=
false
var
result
=
false
var
newData
=
eca
var
newData
=
eca
if
0.0
>=
Float
(
distance
){
if
0.0
>=
Float
(
distance
){
newData
.
status
=
EcaState
.
incomplete
newData
.
status
=
EcaState
.
finishPass
result
=
true
result
=
true
}
}
...
...
Seilassist/Sailassist/Map/Task/View/TaskSwitchingMenuView.swift
View file @
575810d0
...
@@ -92,7 +92,7 @@ struct TaskSwitchingMenuView: View {
...
@@ -92,7 +92,7 @@ struct TaskSwitchingMenuView: View {
if
let
ecaArea
=
taskViewModel
.
edittingEcaArea
{
if
let
ecaArea
=
taskViewModel
.
edittingEcaArea
{
var
newData
=
ecaArea
var
newData
=
ecaArea
newData
.
isEnable
=
false
newData
.
isEnable
=
false
newData
.
status
=
EcaState
.
register
newData
.
status
=
EcaState
.
cancel
ecaData
.
editEcaArea
(
key
:
ecaArea
.
name
,
value
:
newData
,
type
:
EcaOperation
.
Delete
)
ecaData
.
editEcaArea
(
key
:
ecaArea
.
name
,
value
:
newData
,
type
:
EcaOperation
.
Delete
)
deleteEcaArea
.
start
(
ecaId
:
ecaArea
.
id
)
deleteEcaArea
.
start
(
ecaId
:
ecaArea
.
id
)
...
...
Seilassist/Sailassist/Tab/MainTabView.swift
View file @
575810d0
...
@@ -110,7 +110,7 @@ struct CustomTabBar: View {
...
@@ -110,7 +110,7 @@ struct CustomTabBar: View {
}
message
:
{
}
message
:
{
Text
(
"Do you change an emargency mode?"
)
Text
(
"Do you change an emargency mode?"
)
}
}
.
alert
(
"
l
ocation"
,
isPresented
:
$
selectedTabModel
.
isLocationAlert
)
{
.
alert
(
"
L
ocation"
,
isPresented
:
$
selectedTabModel
.
isLocationAlert
)
{
Button
(
"OK"
)
{
Button
(
"OK"
)
{
}
}
}
message
:
{
}
message
:
{
...
...
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