Commit 575810d0 authored by shigemi miura's avatar shigemi miura

不具合修正

parent f1e7b24d
...@@ -84,7 +84,7 @@ class EcaTask { ...@@ -84,7 +84,7 @@ class EcaTask {
SharingData.my.ecaStatus = EcaState.finishPass SharingData.my.ecaStatus = EcaState.finishPass
} }
if 0.0 >= Float(distance) && eca.status == EcaState.startPass { if 0.0 >= Float(distance) && eca.status == EcaState.finishPass {
SharingData.eca.isShowEcaAlert = true SharingData.eca.isShowEcaAlert = true
SharingData.my.ecaStatus = EcaState.incomplete SharingData.my.ecaStatus = EcaState.incomplete
} }
...@@ -101,7 +101,7 @@ class EcaTask { ...@@ -101,7 +101,7 @@ class EcaTask {
var result = false var result = false
var newData = eca var newData = eca
if 0.0 >= Float(distance){ if 0.0 >= Float(distance){
newData.status = EcaState.incomplete newData.status = EcaState.finishPass
result = true result = true
} }
......
...@@ -92,7 +92,7 @@ struct TaskSwitchingMenuView: View { ...@@ -92,7 +92,7 @@ struct TaskSwitchingMenuView: View {
if let ecaArea = taskViewModel.edittingEcaArea { if let ecaArea = taskViewModel.edittingEcaArea {
var newData = ecaArea var newData = ecaArea
newData.isEnable = false newData.isEnable = false
newData.status = EcaState.register newData.status = EcaState.cancel
ecaData.editEcaArea(key: ecaArea.name, value: newData, type: EcaOperation.Delete) ecaData.editEcaArea(key: ecaArea.name, value: newData, type: EcaOperation.Delete)
deleteEcaArea.start(ecaId: ecaArea.id) deleteEcaArea.start(ecaId: ecaArea.id)
......
...@@ -110,7 +110,7 @@ struct CustomTabBar: View { ...@@ -110,7 +110,7 @@ struct CustomTabBar: View {
} message: { } message: {
Text("Do you change an emargency mode?") Text("Do you change an emargency mode?")
} }
.alert("location", isPresented: $selectedTabModel.isLocationAlert) { .alert("Location", isPresented: $selectedTabModel.isLocationAlert) {
Button("OK") { Button("OK") {
} }
} message: { } message: {
......
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