Commit d9a61432 authored by shigemi miura's avatar shigemi miura

QRコードでログイン時に燃料切替タスクON/OFFを参照するように修正

name/passwordでログイン時に燃料切替タスクON/OFFを参照するように修正 push通知でNeCST Emergencyが取れない不具合を修正
parent 256a5573
...@@ -191,6 +191,7 @@ struct LoginView: View { ...@@ -191,6 +191,7 @@ struct LoginView: View {
SharingData.my.shipName = res.shipName SharingData.my.shipName = res.shipName
SharingData.my.imo = res.imo SharingData.my.imo = res.imo
SharingData.my.mmsi = res.mmsi SharingData.my.mmsi = res.mmsi
SharingData.my.isFuelSwitchTask = res.enableFuelSwitchTask
Preferences.shipId = res.shipId Preferences.shipId = res.shipId
......
...@@ -101,6 +101,7 @@ struct InputUserNameView: View { ...@@ -101,6 +101,7 @@ struct InputUserNameView: View {
SharingData.my.shipName = res.shipName SharingData.my.shipName = res.shipName
SharingData.my.imo = res.imo SharingData.my.imo = res.imo
SharingData.my.mmsi = res.mmsi SharingData.my.mmsi = res.mmsi
SharingData.my.isFuelSwitchTask = res.enableFuelSwitchTask
Preferences.shipId = res.shipId Preferences.shipId = res.shipId
......
...@@ -80,16 +80,16 @@ class MapViewController : UIViewController{ ...@@ -80,16 +80,16 @@ class MapViewController : UIViewController{
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
let centerCoordinate = CLLocationCoordinate2D(latitude: 37.8, longitude: -96) 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)) let options = MapInitOptions(cameraOptions: CameraOptions(center: centerCoordinate, zoom: 2))
mapView = MapView(frame: view.bounds, mapInitOptions: options) mapView = MapView(frame: view.bounds, mapInitOptions: options)
mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight] mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
self.view.addSubview(mapView) self.view.addSubview(mapView)
mapView.mapboxMap.onNext(event: .mapLoaded) { [self] _ in mapView.mapboxMap.onNext(event: .mapLoaded) { [self] _ in
self.addLayers() self.addLayers()
} }
} }
......
...@@ -66,7 +66,7 @@ class NotificationTags: NSObject { ...@@ -66,7 +66,7 @@ class NotificationTags: NSObject {
let bamTag = "bam-" + shipId let bamTag = "bam-" + shipId
let taskAlertTag = "taskalert-" + shipId let taskAlertTag = "taskalert-" + shipId
let sailassistTag = "sailassist-" + shipId let sailassistTag = "sailassist-" + shipId
let emergencyTag = "emergency" + shipId let emergencyTag = "emergency-" + shipId
// let chatTag = "chat-" + shipId // let chatTag = "chat-" + shipId
MSNotificationHub.addTags([routeTag, bamTag, taskAlertTag, sailassistTag, emergencyTag]) MSNotificationHub.addTags([routeTag, bamTag, taskAlertTag, sailassistTag, emergencyTag])
} }
......
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