Skip to content

S
Sailassist
Commit 7a2157ee authored by sugita mamoru's avatar sugita mamoru
Browse files
Options

Task関連追加、QR読み込み後処理修正

parent e43c5064
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 62 deletions
Seilassist/Sailassist/Login/LoginView.swift
View file @ 7a2157ee
...@@ -51,7 +51,7 @@ struct LoginView: View { ...@@ -51,7 +51,7 @@ struct LoginView: View {
switch viewMode{ switch viewMode{
case .SelectType: case .SelectType:
LoginTypeSelectView(isQrRead: $isQrRead, viewMode: $viewMode) LoginTypeSelectView(isQrRead: $scannerViewModel.isShowing, viewMode: $viewMode)
case .InputIdPassword: case .InputIdPassword:
InputIdPassWordView(viewMode: $viewMode, param: $loginViewParam) InputIdPassWordView(viewMode: $viewMode, param: $loginViewParam)
case .InputUserName: case .InputUserName:
...@@ -77,8 +77,8 @@ struct LoginView: View { ...@@ -77,8 +77,8 @@ struct LoginView: View {
.padding(.bottom, 30) .padding(.bottom, 30)
} }
} }
.fullScreenCover(isPresented: $isQrRead, content: { .fullScreenCover(isPresented: $scannerViewModel.isShowing, content: {
QRReadView(viewMode: .constant(.SelectType)) QRReadView(viewMode: .constant(.SelectType), viewModel: scannerViewModel)
}) })
} }
} }
......
Seilassist/Sailassist/Login/View/QRReadView.swift
View file @ 7a2157ee
...@@ -9,18 +9,18 @@ import SwiftUI ...@@ -9,18 +9,18 @@ import SwiftUI
struct QRReadView: View { struct QRReadView: View {
@Binding var viewMode: LoginViewMode @Binding var viewMode: LoginViewMode
@ObservedObject private var viewModel = ScannerViewModel() @ObservedObject var viewModel: ScannerViewModel
var body: some View { var body: some View {
//QR読み取りViewをセット：レイヤーにカメラプレビューのレイヤーをセット //QR読み取りViewをセット：レイヤーにカメラプレビューのレイヤーをセット
QrCodeScannerView() QrCodeScannerView()
.found(r: self.viewModel.onFoundQrCode) .found(r: self.viewModel.onFoundQrCode)
.torchLight(isOn: self.viewModel.isShowing) .torchLight(isOn: false)
.interval(delay: self.viewModel.scanInterval) .interval(delay: self.viewModel.scanInterval)
} }
} }
#Preview { #Preview {
QRReadView(viewMode: .constant(.SelectType)) QRReadView(viewMode: .constant(.SelectType), viewModel: ScannerViewModel())
} }
Seilassist/Sailassist/Map/Task/View/EcaSettingView.swift
View file @ 7a2157ee
...@@ -8,34 +8,25 @@ ...@@ -8,34 +8,25 @@
import SwiftUI import SwiftUI
struct EcaSettingView: View { struct EcaSettingView: View {
var body: some View {
VStack{
Button(action: {
}, label: { // @State var ecaArea: RegisteredEca = RegisteredEca(ecaName: "eca")!
Text("Register")
.padding()
})
.background(ColorSet.PrimaryActiveIcon.color)
.cornerRadius(30)
}
}
}
struct EcaSettingAreaView: View {
var body: some View { var body: some View {
VStack{ VStack{
VStack(alignment: .leading){
Text("Switching Finish - ECA") Text("Switching Finish - ECA")
.foregroundColor(ColorSet.Body.color)
HStack{ HStack{
Text("17") Text("17")
Text("NM") Text("NM")
} }
.foregroundColor(ColorSet.Body.color)
HStack{ HStack{
Button(action: { Button(action: {
}, label: { }, label: {
/*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/ Image(systemName: "minus.circle")
}) })
Slider(value: .constant(1)) Slider(value: .constant(1))
...@@ -43,14 +34,29 @@ struct EcaSettingAreaView: View { ...@@ -43,14 +34,29 @@ struct EcaSettingAreaView: View {
Button(action: { Button(action: {
}, label: { }, label: {
/*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/ Image(systemName: "plus.circle")
}) })
} }
} }
Divider()
Button(action: {
}, label: {
Text("Register")
.padding()
})
.background(ColorSet.PrimaryActiveIcon.color)
.cornerRadius(30)
}
.padding(.horizontal)
} }
} }
#Preview { #Preview {
// EcaSettingView() EcaSettingView()
EcaSettingAreaView()
} }
Seilassist/Sailassist/Map/Task/View/MapTaskView.swift
View file @ 7a2157ee
...@@ -11,11 +11,21 @@ enum TaskViewMode{ ...@@ -11,11 +11,21 @@ enum TaskViewMode{
case SwitchingMenu case SwitchingMenu
case EcaList case EcaList
case EcaSetting case EcaSetting
var title: String{
switch self{
case .SwitchingMenu:
"Fuel Switching"
case .EcaList:
"ECA List"
case .EcaSetting:
""
}
}
} }
struct MapTaskView: View { struct MapTaskView: View {
@State private var contentTitle: String = "title"
@State var viewMode: TaskViewMode = .SwitchingMenu @State var viewMode: TaskViewMode = .SwitchingMenu
var body: some View { var body: some View {
VStack{ VStack{
...@@ -39,7 +49,7 @@ struct MapTaskView: View { ...@@ -39,7 +49,7 @@ struct MapTaskView: View {
Spacer() Spacer()
Text(contentTitle) Text(viewMode.title)
.frame(height: 20) .frame(height: 20)
.padding(.vertical, 14) .padding(.vertical, 14)
...@@ -76,6 +86,9 @@ struct MapTaskView: View { ...@@ -76,6 +86,9 @@ struct MapTaskView: View {
.padding(.leading, 20) .padding(.leading, 20)
.padding(.trailing, 10) .padding(.trailing, 10)
Spacer()
.frame(height: 100)
}.onAppear{ }.onAppear{
EcaCoordinatesTable().setEcaData() EcaCoordinatesTable().setEcaData()
} }
......
Seilassist/Sailassist/Map/Task/View/TaskSwitchingMenuView.swift
View file @ 7a2157ee
...@@ -13,25 +13,55 @@ struct TaskSwitchingMenuView: View { ...@@ -13,25 +13,55 @@ struct TaskSwitchingMenuView: View {
var body: some View { var body: some View {
VStack{ VStack{
ForEach(sharingData.ecaArea.map{ $0.1 }.filter{ $0.isEnable }, id: \.name){ eca in ForEach(sharingData.ecaArea.map{ $0.1 }.filter{ $0.isEnable }, id: \.name){ eca in
VStack {
HStack { HStack {
Button {
for running in sharingData.ecaArea.map{ $0.1 }.filter{ $0.isRunning }{
running.isRunning = false
sharingData.editEcaArea(key: running.name, value: running)
}
eca.isRunning = true
sharingData.editEcaArea(key: eca.name, value: eca)
} label: {
Circle() Circle()
.frame(width: 10) .frame(width: 10)
.foregroundColor(eca.isRunning ? .red : .blue) .foregroundColor(eca.isRunning ? .red : .blue)
Text(eca.name) Text(eca.name)
.foregroundColor(ColorSet.Body.color)
}
Spacer() Spacer()
Button(action: {
for running in sharingData.ecaArea.map{ $0.1 }.filter{ $0.isRunning }{
running.isRunning = false Menu {
sharingData.editEcaArea(key: running.name, value: running) Label{
Text(eca.name)
} icon: {
Image("closeIcon")
} }
eca.isRunning = true
sharingData.editEcaArea(key: eca.name, value: eca) Button{
}, label: { viewMode = .EcaSetting
Text("Button") } label: {
}) Text("Edit Notice Setting")
}
Button{
} label: {
Text("Delete ECA Task")
}
} label: {
Image(systemName: "ellipsis")
}
.disabled(eca.isRunning)
}
.frame(height: 50)
Divider()
} }
} }
...@@ -52,32 +82,6 @@ struct TaskSwitchingMenuView: View { ...@@ -52,32 +82,6 @@ struct TaskSwitchingMenuView: View {
} }
} }
struct TaskEcaView: View {
@Binding var data : RegisteredEca
@State var isPopover: Bool = false
var body: some View {
HStack {
Circle()
.frame(width: 10)
Text(data.name)
Spacer()
Button(action: {
// isPopover = true
}, label: {
/*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/
})
.popover(isPresented: $isPopover, content: {
Text("aaaa")
})
}
.padding()
}
}
#Preview { #Preview {
TaskSwitchingMenuView(viewMode: .constant(.SwitchingMenu)) TaskSwitchingMenuView(viewMode: .constant(.SwitchingMenu))
......
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