Commit 3c61640f authored by shigemi miura's avatar shigemi miura

Warning文字列間違い対応

parent 1fd6024f
...@@ -1307,7 +1307,7 @@ ...@@ -1307,7 +1307,7 @@
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 49; CURRENT_PROJECT_VERSION = 50;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1353,7 +1353,7 @@ ...@@ -1353,7 +1353,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 49; CURRENT_PROJECT_VERSION = 50;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
...@@ -1536,7 +1536,7 @@ ...@@ -1536,7 +1536,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements; CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 49; CURRENT_PROJECT_VERSION = 50;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8; DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
......
...@@ -58,7 +58,7 @@ struct ChatView: View { ...@@ -58,7 +58,7 @@ struct ChatView: View {
if let id = message.messages.last?.messageId { if let id = message.messages.last?.messageId {
proxy.scrollTo(id, anchor: .bottom) proxy.scrollTo(id, anchor: .bottom)
//Warrningモードは既読は返さない //Warningモードは既読は返さない
if message.messages.last?.message != nil { if message.messages.last?.message != nil {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
let getMessage = GetMessage() let getMessage = GetMessage()
...@@ -121,7 +121,7 @@ struct AlertChatMessage: View { ...@@ -121,7 +121,7 @@ struct AlertChatMessage: View {
Rectangle() Rectangle()
.fill(ColorSet.ChatDate.color) .fill(ColorSet.ChatDate.color)
.frame(width: 20, height: 1) .frame(width: 20, height: 1)
Text("Warrning mode start " + DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: "")) Text("Warning mode start " + DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: ""))
.font(FontStyle.DateText.font) .font(FontStyle.DateText.font)
.foregroundColor(ColorSet.ChatDate.color) .foregroundColor(ColorSet.ChatDate.color)
Rectangle() Rectangle()
...@@ -133,7 +133,7 @@ struct AlertChatMessage: View { ...@@ -133,7 +133,7 @@ struct AlertChatMessage: View {
Rectangle() Rectangle()
.fill(ColorSet.ChatDate.color) .fill(ColorSet.ChatDate.color)
.frame(width: 20, height: 1) .frame(width: 20, height: 1)
Text("Warrning mode end " + DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: "")) Text("Warning mode end " + DateTextLib.ISO86012FormatText(message.time, format: "yyyy/MM/dd HH:mm", errFormat: ""))
.font(FontStyle.DateText.font) .font(FontStyle.DateText.font)
.foregroundColor(ColorSet.ChatDate.color) .foregroundColor(ColorSet.ChatDate.color)
Rectangle() Rectangle()
......
...@@ -520,7 +520,7 @@ class MapViewController : UIViewController { ...@@ -520,7 +520,7 @@ class MapViewController : UIViewController {
shipIcon = IconImage.OwnShip_Normal.rawValue shipIcon = IconImage.OwnShip_Normal.rawValue
case ShipAlert.Caution: case ShipAlert.Caution:
shipIcon = IconImage.OwnShip_Caution.rawValue shipIcon = IconImage.OwnShip_Caution.rawValue
case ShipAlert.Warrning: case ShipAlert.Warning:
shipIcon = IconImage.OwnShip_Warning.rawValue shipIcon = IconImage.OwnShip_Warning.rawValue
case ShipAlert.Alarm: case ShipAlert.Alarm:
shipIcon = IconImage.OwnShip_Alarm.rawValue shipIcon = IconImage.OwnShip_Alarm.rawValue
......
...@@ -63,7 +63,7 @@ class SharingData{ ...@@ -63,7 +63,7 @@ class SharingData{
case 2: case 2:
shipAlert = ShipAlert.Caution shipAlert = ShipAlert.Caution
case 3: case 3:
shipAlert = ShipAlert.Warrning shipAlert = ShipAlert.Warning
case 4: case 4:
shipAlert = ShipAlert.Alarm shipAlert = ShipAlert.Alarm
case 5: case 5:
...@@ -88,7 +88,7 @@ class SharingData{ ...@@ -88,7 +88,7 @@ class SharingData{
case 2: case 2:
rmsAlarm = AlertStatusType.Caution rmsAlarm = AlertStatusType.Caution
case 3: case 3:
rmsAlarm = AlertStatusType.Warrning rmsAlarm = AlertStatusType.Warning
case 4: case 4:
rmsAlarm = AlertStatusType.Alarm rmsAlarm = AlertStatusType.Alarm
case 5: case 5:
......
...@@ -33,7 +33,7 @@ enum ShipAlert { ...@@ -33,7 +33,7 @@ enum ShipAlert {
case Unknown case Unknown
case Normal case Normal
case Caution case Caution
case Warrning case Warning
case Alarm case Alarm
case Emergency case Emergency
case NecstEmergency case NecstEmergency
...@@ -43,7 +43,7 @@ enum AlertStatusType { ...@@ -43,7 +43,7 @@ enum AlertStatusType {
case Unknown case Unknown
case Normal case Normal
case Caution case Caution
case Warrning case Warning
case Alarm case Alarm
case Emergency case Emergency
} }
......
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