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
e2778fbf
Commit
e2778fbf
authored
Mar 02, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ver1.0.1
・燃料切替タスク機能のON/OFF
parent
b1777788
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
ResLogin.swift
Seilassist/Sailassist/Json/ResLogin.swift
+1
-0
LoginView.swift
Seilassist/Sailassist/Login/LoginView.swift
+1
-0
SharingData.swift
Seilassist/Sailassist/SharingData/SharingData.swift
+1
-0
MainTabView.swift
Seilassist/Sailassist/Tab/MainTabView.swift
+3
-2
No files found.
Seilassist/Sailassist/Json/ResLogin.swift
View file @
e2778fbf
...
...
@@ -13,4 +13,5 @@ struct ResLogin : Codable {
var
shipName
:
String
=
""
var
imo
:
Int
=
0
var
mmsi
:
Int
=
0
var
enableFuelSwitchTask
:
Bool
=
false
}
Seilassist/Sailassist/Login/LoginView.swift
View file @
e2778fbf
...
...
@@ -250,6 +250,7 @@ struct LoginView: View {
SharingData
.
my
.
shipName
=
res
.
shipName
SharingData
.
my
.
imo
=
res
.
imo
SharingData
.
my
.
mmsi
=
res
.
mmsi
SharingData
.
my
.
isFuelSwitchTask
=
res
.
enableFuelSwitchTask
Preferences
.
shipId
=
res
.
shipId
...
...
Seilassist/Sailassist/SharingData/SharingData.swift
View file @
e2778fbf
...
...
@@ -16,6 +16,7 @@ class SharingData{
@Published
var
imo
:
Int
=
0
@Published
var
mmsi
:
Int
=
0
@Published
var
isUpDate
:
Bool
=
false
@Published
var
isFuelSwitchTask
:
Bool
=
false
@Published
var
ecaStatus
:
EcaState
?
...
...
Seilassist/Sailassist/Tab/MainTabView.swift
View file @
e2778fbf
...
...
@@ -25,6 +25,7 @@ struct MainTabView: View {
@EnvironmentObject
private
var
sceneDelegate
:
SceneDelegate
@State
var
isSignout
=
false
@State
var
isLogin
=
false
@State
var
isEcaTask
=
SharingData
.
my
.
isFuelSwitchTask
init
()
{
let
appearance
:
UITabBarAppearance
=
UITabBarAppearance
()
...
...
@@ -55,7 +56,7 @@ struct MainTabView: View {
.
tag
(
Tab
.
menu
)
}
.
hideNativeTabBar
()
.
sheet
(
isPresented
:
.
constant
(
isTaskSel
&&
isTabShow
),
content
:
{
.
sheet
(
isPresented
:
.
constant
(
isTaskSel
&&
isTabShow
&&
isEcaTask
),
content
:
{
MapTaskView
()
.
zIndex
(
0
)
.
presentationDragIndicator
(
.
hidden
)
...
...
@@ -84,7 +85,7 @@ struct MainTabView: View {
.
tag
(
Tab
.
menu
)
}
.
hideNativeTabBar
()
.
popover
(
isPresented
:
.
constant
(
isPopover
),
attachmentAnchor
:
.
point
(
.
bottom
))
{
.
popover
(
isPresented
:
.
constant
(
isPopover
&&
isEcaTask
),
attachmentAnchor
:
.
point
(
.
bottom
))
{
MapTaskView
()
.
presentationCompactAdaptation
(
.
none
)
.
zIndex
(
0
)
...
...
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