Commit 61d961f1 authored by shigemi miura's avatar shigemi miura

ECA Startボタン連打対策

チャットOFF時のアイコン対応
parent 92a39654
......@@ -1307,7 +1307,7 @@
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 45;
CURRENT_PROJECT_VERSION = 46;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......@@ -1353,7 +1353,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 45;
CURRENT_PROJECT_VERSION = 46;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......@@ -1536,7 +1536,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Sailassist/Sailassist.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 45;
CURRENT_PROJECT_VERSION = 46;
DEVELOPMENT_ASSET_PATHS = "\"Sailassist/Preview Content\"";
DEVELOPMENT_TEAM = D2DC7QNNJ8;
ENABLE_PREVIEWS = YES;
......
{
"images" : [
{
"filename" : "chat_Invalid.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "chat_Dark_Invalid.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
<?xml version="1.0" encoding="UTF-8"?>
<svg id="_レイヤー_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26" fill="#fff" fill-opacity="0.2">
<defs>
<style>.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:none;opacity:.1;}</style>
</defs>
<g id="_レイヤー_4">
<rect class="cls-2" width="26" height="26" />
<path class="cls-1"
d="m20.79,3.26H5.21c-1.07,0-1.94.88-1.94,1.95v17.53s3.88-3.89,3.88-3.89h13.63c1.07,0,1.95-.88,1.95-1.95V5.21c0-1.07-.88-1.95-1.95-1.95Zm-10.71,8.76h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Z" />
</g>
</svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<svg id="_レイヤー_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26" fill="#7e7e84" fill-opacity="0.2">
<defs>
<style>.cls-1,.cls-2{stroke-width:0px;}.cls-2{fill:none;opacity:.1;}</style>
</defs>
<g id="_レイヤー_4">
<rect class="cls-2" width="26" height="26" />
<path class="cls-1"
d="m20.79,3.26H5.21c-1.07,0-1.94.88-1.94,1.95v17.53s3.88-3.89,3.88-3.89h13.63c1.07,0,1.95-.88,1.95-1.95V5.21c0-1.07-.88-1.95-1.95-1.95Zm-10.71,8.76h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Zm3.89,0h-1.95v-1.95h1.95v1.95Z" />
</g>
</svg>
\ No newline at end of file
......@@ -11,6 +11,7 @@ struct FuelSwitchingView: View {
@ObservedObject var taskViewModel: TaskViewModel
@ObservedObject var ecaData = SharingData.eca
@State var isRunningStopAlert: Bool = false
@State var isRunningButton: Bool = false
var body: some View {
VStack {
......@@ -29,6 +30,11 @@ struct FuelSwitchingView: View {
newData.isRunning = true
newData.status = EcaState.running
SharingData.eca.editEcaArea(key: eca.areaId, value: newData, type: EcaOperation.Running)
isRunningButton = true
Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { timer in
isRunningButton = false
}
}
} label: {
HStack {
......@@ -38,7 +44,7 @@ struct FuelSwitchingView: View {
Spacer()
.frame(width: 10)
}
}
}.disabled(isRunningButton)
Text(eca.name)
.font(FontStyle.DefaultText.font)
......
......@@ -140,8 +140,13 @@ struct CustomTabBar: View {
}, label: {
VStack{
ZStack(alignment: .bottomTrailing) {
if !SharingData.my.isCommunication && tab == Tab.chat {
Image("tab_chat_Invalid")
.font(.title2)
} else {
Image(selectedTabModel.activeTab == tab ? tab.rawValue + "_selected" : tab.rawValue)
.font(.title2)
}
//チャットTab上の既読マーク
if tab == Tab.chat {
......
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