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
64649622
Commit
64649622
authored
Jul 29, 2024
by
shigemi miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文字列変更
チャットのPush通知OFF時に警告メッセージを表示 ECAの最終ライン通過時にサーバーに送るステータスを変更
parent
989e443a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
7 deletions
+16
-7
project.pbxproj
Seilassist/Sailassist.xcodeproj/project.pbxproj
+3
-3
ChatTitleView.swift
Seilassist/Sailassist/Chat/View/ChatTitleView.swift
+9
-0
MyChatContentView.swift
Seilassist/Sailassist/Chat/View/MyChatContentView.swift
+1
-1
OtherChatContentView.swift
Seilassist/Sailassist/Chat/View/OtherChatContentView.swift
+1
-1
RegisteredEca.swift
Seilassist/Sailassist/ECA/RegisteredEca.swift
+1
-1
NgaNotificationView.swift
...assist/Sailassist/Map/Task/View/NgaNotificationView.swift
+1
-1
No files found.
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @
64649622
...
@@ -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
=
4
1
;
CURRENT_PROJECT_VERSION
=
4
2
;
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
=
4
1
;
CURRENT_PROJECT_VERSION
=
4
2
;
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
=
4
1
;
CURRENT_PROJECT_VERSION
=
4
2
;
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/View/ChatTitleView.swift
View file @
64649622
...
@@ -11,6 +11,7 @@ struct ChatTitleView: View {
...
@@ -11,6 +11,7 @@ struct ChatTitleView: View {
@Binding
var
isShowMember
:
Bool
@Binding
var
isShowMember
:
Bool
@Binding
var
isNotification
:
Bool
@Binding
var
isNotification
:
Bool
@ObservedObject
var
message
=
SharingData
.
message
@ObservedObject
var
message
=
SharingData
.
message
@State
var
isChatWarning
:
Bool
=
false
var
body
:
some
View
{
var
body
:
some
View
{
VStack
{
VStack
{
...
@@ -54,6 +55,11 @@ struct ChatTitleView: View {
...
@@ -54,6 +55,11 @@ struct ChatTitleView: View {
Button
{
Button
{
isNotification
=
chatNotification
()
isNotification
=
chatNotification
()
if
isNotification
{
isChatWarning
=
false
}
else
{
isChatWarning
=
true
}
}
label
:
{
}
label
:
{
Image
(
isNotification
?
"chat_alert"
:
"chat_alert_none"
)
Image
(
isNotification
?
"chat_alert"
:
"chat_alert_none"
)
.
resizable
()
.
resizable
()
...
@@ -63,6 +69,9 @@ struct ChatTitleView: View {
...
@@ -63,6 +69,9 @@ struct ChatTitleView: View {
.
frame
(
width
:
48
,
height
:
48
)
.
frame
(
width
:
48
,
height
:
48
)
}
}
.
frame
(
height
:
60
)
.
frame
(
height
:
60
)
.
alert
(
isPresented
:
$
isChatWarning
)
{
Alert
(
title
:
Text
(
"Caution"
),
message
:
Text
(
"You can’t receive notifications even in warning mode."
),
dismissButton
:
.
default
(
Text
(
"OK"
),
action
:{}))
}
Divider
()
Divider
()
.
background
(
ColorSet
.
LineColor04
.
color
)
.
background
(
ColorSet
.
LineColor04
.
color
)
...
...
Seilassist/Sailassist/Chat/View/MyChatContentView.swift
View file @
64649622
...
@@ -23,7 +23,7 @@ struct MyChatContentView: View {
...
@@ -23,7 +23,7 @@ struct MyChatContentView: View {
.
foregroundColor
(
ColorSet
.
BodyChat
.
color
)
.
foregroundColor
(
ColorSet
.
BodyChat
.
color
)
.
padding
(
15
)
.
padding
(
15
)
.
background
(
ColorSet
.
ChatBaloon
.
color
)
.
background
(
ColorSet
.
ChatBaloon
.
color
)
.
border
(
Color
.
red
.
gradient
.
opacity
(
0.
6
),
width
:
(
message
.
mode
==
1
?
6
:
0
))
.
border
(
Color
.
red
.
gradient
.
opacity
(
0.
8
),
width
:
(
message
.
mode
==
1
?
2
:
0
))
.
clipShape
(
.
clipShape
(
.
rect
(
.
rect
(
topLeadingRadius
:
10
,
topLeadingRadius
:
10
,
...
...
Seilassist/Sailassist/Chat/View/OtherChatContentView.swift
View file @
64649622
...
@@ -28,7 +28,7 @@ struct OtherChatContentView: View {
...
@@ -28,7 +28,7 @@ struct OtherChatContentView: View {
.
foregroundColor
(
ColorSet
.
BodyChat
.
color
)
.
foregroundColor
(
ColorSet
.
BodyChat
.
color
)
.
padding
(
15
)
.
padding
(
15
)
.
background
(
ColorSet
.
ChatBaloon
.
color
)
.
background
(
ColorSet
.
ChatBaloon
.
color
)
.
border
(
Color
.
red
.
gradient
.
opacity
(
0.
6
),
width
:
(
message
.
mode
==
1
?
6
:
0
))
.
border
(
Color
.
red
.
gradient
.
opacity
(
0.
8
),
width
:
(
message
.
mode
==
1
?
2
:
0
))
.
clipShape
(
.
clipShape
(
.
rect
(
.
rect
(
topLeadingRadius
:
10
,
topLeadingRadius
:
10
,
...
...
Seilassist/Sailassist/ECA/RegisteredEca.swift
View file @
64649622
...
@@ -23,7 +23,7 @@ let serverRegister = 0x00000000 //登録
...
@@ -23,7 +23,7 @@ let serverRegister = 0x00000000 //登録
let
serverRunning
=
0x10000000
//ECAタスク実行開始
let
serverRunning
=
0x10000000
//ECAタスク実行開始
let
serverNoticePass
=
0x10000001
//ECA通知円到達
let
serverNoticePass
=
0x10000001
//ECA通知円到達
let
serverStartPass
=
0x10000002
//ECA開始円到達
let
serverStartPass
=
0x10000002
//ECA開始円到達
let
serverFinishPass
=
0x
1
0000004
//ECAタスク終了円到達
let
serverFinishPass
=
0x
0
0000004
//ECAタスク終了円到達
let
serverEnd
=
0x00000100
//ECAタスク完了(燃料切替実施済み)
let
serverEnd
=
0x00000100
//ECAタスク完了(燃料切替実施済み)
let
serverIncomplete
=
0x00000200
//ECAタスク未完了 (燃料切替未実施で終了)
let
serverIncomplete
=
0x00000200
//ECAタスク未完了 (燃料切替未実施で終了)
let
serverCancel
=
0x00000400
//ECAタスクキャンセル (タスク終了・タスク未完了前にキャンセル)
let
serverCancel
=
0x00000400
//ECAタスクキャンセル (タスク終了・タスク未完了前にキャンセル)
...
...
Seilassist/Sailassist/Map/Task/View/NgaNotificationView.swift
View file @
64649622
...
@@ -111,7 +111,7 @@ struct NgaMenuView: View {
...
@@ -111,7 +111,7 @@ struct NgaMenuView: View {
ngaData
.
editNga
=
nga
ngaData
.
editNga
=
nga
isDelete
=
true
isDelete
=
true
}
label
:
{
}
label
:
{
Text
(
"Delete NGA
Notification
"
)
Text
(
"Delete NGA
Task
"
)
}
.
disabled
(
nga
.
isLock
)
}
.
disabled
(
nga
.
isLock
)
}
label
:
{
}
label
:
{
Image
(
systemName
:
"ellipsis"
)
Image
(
systemName
:
"ellipsis"
)
...
...
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