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
3c61640f
Commit
3c61640f
authored
Aug 26, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Warning文字列間違い対応
parent
1fd6024f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
project.pbxproj
Seilassist/Sailassist.xcodeproj/project.pbxproj
+3
-3
ChatView.swift
Seilassist/Sailassist/Chat/ChatView.swift
+3
-3
MapRepresentable.swift
Seilassist/Sailassist/Map/MapRepresentable.swift
+1
-1
SharingData.swift
Seilassist/Sailassist/SharingData/SharingData.swift
+2
-2
StatusEnum.swift
Seilassist/Sailassist/SharingData/StatusEnum.swift
+2
-2
No files found.
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @
3c61640f
...
@@ -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
;
...
...
Seilassist/Sailassist/Chat/ChatView.swift
View file @
3c61640f
...
@@ -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
)
//War
r
ningモードは既読は返さない
//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
(
"War
r
ning 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
(
"War
r
ning 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
()
...
...
Seilassist/Sailassist/Map/MapRepresentable.swift
View file @
3c61640f
...
@@ -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
.
War
r
ning
:
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
...
...
Seilassist/Sailassist/SharingData/SharingData.swift
View file @
3c61640f
...
@@ -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
.
War
r
ning
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
.
War
r
ning
rmsAlarm
=
AlertStatusType
.
Warning
case
4
:
case
4
:
rmsAlarm
=
AlertStatusType
.
Alarm
rmsAlarm
=
AlertStatusType
.
Alarm
case
5
:
case
5
:
...
...
Seilassist/Sailassist/SharingData/StatusEnum.swift
View file @
3c61640f
...
@@ -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
War
r
ning
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
War
r
ning
case
Warning
case
Alarm
case
Alarm
case
Emergency
case
Emergency
}
}
...
...
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