Skip to content

S
Sailassist
Commit 276727af authored by shigemi miura's avatar shigemi miura
Browse files
Options

マニュアル更新

チャット期限削除
parent 9cdd7983
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 43 deletions
Seilassist/Sailassist.xcodeproj/project.pbxproj
View file @ 276727af
...@@ -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 = 54; CURRENT_PROJECT_VERSION = 55;
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 = 54; CURRENT_PROJECT_VERSION = 55;
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 = 54; CURRENT_PROJECT_VERSION = 55;
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 @ 276727af
...@@ -31,21 +31,19 @@ struct ChatView: View { ...@@ -31,21 +31,19 @@ struct ChatView: View {
.frame(height: 20) .frame(height: 20)
ForEach(message.messages, id: \.messageId) { msg in ForEach(message.messages, id: \.messageId) { msg in
if displayPeriod(messageTime: msg.time) { if msg.message != nil {
if msg.message != nil { if msg.from == Preferences.UserName {
if msg.from == Preferences.UserName { //自分のメッセージ
//自分のメッセージ MyChatContentView(message: msg)
MyChatContentView(message: msg) .padding(.bottom, 24)
.padding(.bottom, 24) }else{
}else{ //他人のメッセージ
//他人のメッセージ OtherChatContentView(message: msg)
OtherChatContentView(message: msg)
.padding(.bottom, 24)
}
} else {
AlertChatMessage(message: msg)
.padding(.bottom, 24) .padding(.bottom, 24)
} }
} else {
AlertChatMessage(message: msg)
.padding(.bottom, 24)
} }
} }
} }
...@@ -113,21 +111,6 @@ struct ChatView: View { ...@@ -113,21 +111,6 @@ struct ChatView: View {
} }
.background(ColorSet.BackgroundPrimary.color) .background(ColorSet.BackgroundPrimary.color)
} }
func displayPeriod(messageTime: String) -> Bool {
var period = false
var interval = 0.0
if let megTime = DateTextLib.ISO8601Text2Date(messageTime) {
interval = Date.now.timeIntervalSince(megTime)
}
if interval <= unixTimeMonth { //2,592,000.0
period = true
}
return period
}
} }
struct AlertChatMessage: View { struct AlertChatMessage: View {
......
Seilassist/Sailassist/html/Manual/help.html
View file @ 276727af
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
<div id="contents"> <div id="contents">
<div class="btn_area"> <div class="btn_area">
<p><a href="#link_01">１．Fuel Switching</a></p> <p><a href="#link_01">１．Fuel Switching</a></p>
<p><a href="#link_02">２．Notice</a></p> <p><a href="#link_02">２．NGA</a></p>
<p><a href="#link_03">３．Menu</a></p> <p><a href="#link_03">３．Chat Communication</a></p>
<p><a href="#link_04">４．Notice</a></p>
<p><a href="#link_05">５．Menu</a></p>
</div> </div>
...@@ -43,21 +45,53 @@ ...@@ -43,21 +45,53 @@
</div> </div>
<div id="link_02" class="box_area"> <div id="link_02" class="box_area">
<h2>Notice<br><br></h2> <h2>NGA<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/02-1.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-2.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-3.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-4.png?v20211213"></p>
</div>
<div class="imgBox"> <div class="imgBox">
<p><img src="content/images/sp/help/02.png?v20211213"></p> <p><img src="content/images/sp/help/02-5.png?v20211213"></p>
</div> </div>
</div> </div>
<div id="link_03" class="box_area"> <div id="link_03" class="box_area">
<h2>Menu<br><br></h2> <h2>Chat Communication<br><br></h2>
<div class="imgBox"> <div class="imgBox">
<p><img src="content/images/sp/help/03.png?v20211213"></p> <p><img src="content/images/sp/help/03.png?v20211213"></p>
</div> </div>
<div id="link_04" class="box_area">
<h2>Notice<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/04.png?v20211213"></p>
</div>
</div>
<div id="link_05" class="box_area">
<h2>Menu<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/05.png?v20211213"></p>
</div>
</div> </div>
...@@ -75,7 +109,7 @@ ...@@ -75,7 +109,7 @@
</div> </div>
</div> </div>
<script src="//jrcit.sharepoint.com///code.jquery.com/jquery-1.10.2.js"></script> <script src="//jrcit.sharepoint.com///jrcit.sharepoint.com///code.jquery.com/jquery-1.10.2.js"></script>
<script type="text/javascript" src="assets/files/shared/js/sp_jsmodules.js"></script> <script type="text/javascript" src="assets/files/shared/js/sp_jsmodules.js"></script>
......
Seilassist/Sailassist/html/Manual/help.jp.html
View file @ 276727af
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
<div id="contents"> <div id="contents">
<div class="btn_area"> <div class="btn_area">
<p><a href="#link_01">１．Fuel Switching</a></p> <p><a href="#link_01">１．Fuel Switching</a></p>
<p><a href="#link_02">２．Notice</a></p> <p><a href="#link_02">２．NGA</a></p>
<p><a href="#link_03">３．Menu</a></p> <p><a href="#link_03">３．Chat Communication</a></p>
<p><a href="#link_04">４．Notice</a></p>
<p><a href="#link_05">５．Menu</a></p>
</div> </div>
...@@ -43,21 +45,53 @@ ...@@ -43,21 +45,53 @@
</div> </div>
<div id="link_02" class="box_area"> <div id="link_02" class="box_area">
<h2>Notice<br><br></h2> <h2>NGA<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/02-1.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-2.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-3.png?v20211213"></p>
</div>
<div class="imgBox">
<p><img src="content/images/sp/help/02-4.png?v20211213"></p>
</div>
<div class="imgBox"> <div class="imgBox">
<p><img src="content/images/sp/help/02.png?v20211213"></p> <p><img src="content/images/sp/help/02-5.png?v20211213"></p>
</div> </div>
</div> </div>
<div id="link_03" class="box_area"> <div id="link_03" class="box_area">
<h2>Menu<br><br></h2> <h2>Chat Communication<br><br></h2>
<div class="imgBox"> <div class="imgBox">
<p><img src="content/images/sp/help/03.png?v20211213"></p> <p><img src="content/images/sp/help/03.png?v20211213"></p>
</div> </div>
<div id="link_04" class="box_area">
<h2>Notice<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/04.png?v20211213"></p>
</div>
</div>
<div id="link_05" class="box_area">
<h2>Menu<br><br></h2>
<div class="imgBox">
<p><img src="content/images/sp/help/05.png?v20211213"></p>
</div>
</div> </div>
...@@ -75,7 +109,7 @@ ...@@ -75,7 +109,7 @@
</div> </div>
</div> </div>
<script src="//jrcit.sharepoint.com///code.jquery.com/jquery-1.10.2.js"></script> <script src="//jrcit.sharepoint.com///jrcit.sharepoint.com///code.jquery.com/jquery-1.10.2.js"></script>
<script type="text/javascript" src="assets/files/shared/js/sp_jsmodules.js"></script> <script type="text/javascript" src="assets/files/shared/js/sp_jsmodules.js"></script>
......
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