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
d9a61432
Commit
d9a61432
authored
Mar 18, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QRコードでログイン時に燃料切替タスクON/OFFを参照するように修正
name/passwordでログイン時に燃料切替タスクON/OFFを参照するように修正 push通知でNeCST Emergencyが取れない不具合を修正
parent
256a5573
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
LoginView.swift
Seilassist/Sailassist/Login/LoginView.swift
+1
-0
InputUserNameView.swift
Seilassist/Sailassist/Login/View/InputUserNameView.swift
+1
-0
MapRepresentable.swift
Seilassist/Sailassist/Map/MapRepresentable.swift
+4
-4
SailassistApp.swift
Seilassist/Sailassist/SailassistApp.swift
+1
-1
No files found.
Seilassist/Sailassist/Login/LoginView.swift
View file @
d9a61432
...
...
@@ -191,6 +191,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/Login/View/InputUserNameView.swift
View file @
d9a61432
...
...
@@ -101,6 +101,7 @@ struct InputUserNameView: 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/Map/MapRepresentable.swift
View file @
d9a61432
...
...
@@ -80,16 +80,16 @@ class MapViewController : UIViewController{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
let
centerCoordinate
=
CLLocationCoordinate2D
(
latitude
:
37.8
,
longitude
:
-
96
)
// let url = StyleURI(rawValue: "mapbox://styles/jmarinecloud/cltrwnk5i01j901ra3g4n7dtz")
// let options = MapInitOptions(cameraOptions: CameraOptions(center: centerCoordinate, zoom: 2), styleURI: url)
let
options
=
MapInitOptions
(
cameraOptions
:
CameraOptions
(
center
:
centerCoordinate
,
zoom
:
2
))
mapView
=
MapView
(
frame
:
view
.
bounds
,
mapInitOptions
:
options
)
mapView
.
autoresizingMask
=
[
.
flexibleWidth
,
.
flexibleHeight
]
self
.
view
.
addSubview
(
mapView
)
mapView
.
mapboxMap
.
onNext
(
event
:
.
mapLoaded
)
{
[
self
]
_
in
self
.
addLayers
()
}
}
...
...
@@ -157,7 +157,7 @@ class MapViewController : UIViewController{
try!
mapView
.
mapboxMap
.
style
.
addSource
(
ownShipSymbol
.
source
,
id
:
ownShipSymbol
.
sourceId
)
try
?
mapView
.
mapboxMap
.
style
.
addLayer
(
ownShipSymbolLayer
)
//ECA
let
ecaLineString
=
LineString
([
LocationCoordinate2D
(
latitude
:
0
,
longitude
:
0
)])
let
ecaLinefeature
=
Feature
(
geometry
:
ecaLineString
)
...
...
Seilassist/Sailassist/SailassistApp.swift
View file @
d9a61432
...
...
@@ -66,7 +66,7 @@ class NotificationTags: NSObject {
let
bamTag
=
"bam-"
+
shipId
let
taskAlertTag
=
"taskalert-"
+
shipId
let
sailassistTag
=
"sailassist-"
+
shipId
let
emergencyTag
=
"emergency"
+
shipId
let
emergencyTag
=
"emergency
-
"
+
shipId
// let chatTag = "chat-" + shipId
MSNotificationHub
.
addTags
([
routeTag
,
bamTag
,
taskAlertTag
,
sailassistTag
,
emergencyTag
])
}
...
...
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