Merge commit '49894779' into develop

Seilassist/Sailassist.xcodeproj/xcshareddata/xcschemes/Canary.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-               BuildableName = "Sailassist.app"
-               BlueprintName = "Sailassist"
-               ReferencedContainer = "container:Sailassist.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Canary"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Canary"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-            BuildableName = "Sailassist.app"
-            BlueprintName = "Sailassist"
-            ReferencedContainer = "container:Sailassist.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-            BuildableName = "Sailassist.app"
-            BlueprintName = "Sailassist"
-            ReferencedContainer = "container:Sailassist.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Canary">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Seilassist/Sailassist.xcodeproj/xcshareddata/xcschemes/QC.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1500"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-               BuildableName = "Sailassist.app"
-               BlueprintName = "Sailassist"
-               ReferencedContainer = "container:Sailassist.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Canary"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "QC"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-            BuildableName = "Sailassist.app"
-            BlueprintName = "Sailassist"
-            ReferencedContainer = "container:Sailassist.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "020B980F2AD8C3140029DE4C"
-            BuildableName = "Sailassist.app"
-            BlueprintName = "Sailassist"
-            ReferencedContainer = "container:Sailassist.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Canary">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

Seilassist/Sailassist/ContentView.swift

@@ -10,38 +10,26 @@ import SwiftUI
 struct ContentView: View {
     @State var isLogin = false//ContentView.LoginCheck()
     @EnvironmentObject private var sceneDelegate: SceneDelegate
-    @StateObject var locationViewModel = LocationViewModel()
-    var selectedTabModel = SelectedTabModel()
+    let selectedTabModel = SelectedTabModel()
+    let signalRService = SignalRService()
 
     var body: some View {
-        switch locationViewModel.authorizationStatus {
-        case .notDetermined:
-            RequestLocationView()
-                .environmentObject(locationViewModel)
-        case .restricted:
-            ErrorView(errorText: "位置情報の使用が制限されています。")
-        case .denied:
-            ErrorView(errorText: "位置情報を使用できません。")
-        case .authorizedAlways, .authorizedWhenInUse:
-            MainTabView()
-                .environmentObject(selectedTabModel)
-                .onAppear(){
-                    if isLogin{
-                        guard sceneDelegate.tabWindow == nil else{ return }
-                        sceneDelegate.addTabBar(selectedTabModel)
-                        selectedTabModel.activeTab = .task
-                    }
-                }
-                .fullScreenCover(isPresented: .constant(!isLogin), onDismiss: {
+        MainTabView()
+            .environmentObject(selectedTabModel)
+            .onAppear(){
+                if isLogin{
                     guard sceneDelegate.tabWindow == nil else{ return }
                     sceneDelegate.addTabBar(selectedTabModel)
                     selectedTabModel.activeTab = .task
-                }, content: {
-                    LoginView(isLogin: $isLogin)
-                })
-        default:
-            Text("Unexpected status")
-        }
+                }
+            }
+            .fullScreenCover(isPresented: .constant(!isLogin), onDismiss: {
+                guard sceneDelegate.tabWindow == nil else{ return }
+                sceneDelegate.addTabBar(selectedTabModel)
+                selectedTabModel.activeTab = .task
+            }, content: {
+                LoginView(isLogin: $isLogin)
+            })
     }
 }
 

Seilassist/Sailassist/DataSource/AlertDB.swift

@@ -10,7 +10,6 @@ import Foundation
 struct WarnRecord {
     var title: String
     var body: String
-    let soundName: String
 }
 
 enum SwitchingEca {
@@ -28,9 +27,9 @@ class AlertDB {
     static let OnlyOne = AlertDB()
 
     private var alertEca : [SwitchingEca: WarnRecord] = [
-        SwitchingEca.Finish: WarnRecord(title: NSLocalizedString("Eca Finish", comment: ""), body: NSLocalizedString("Arrived at switching finished point", comment: ""), soundName: "sound_eca.mp3")
-        , SwitchingEca.Start: WarnRecord(title: NSLocalizedString("Eca Start", comment: ""), body: NSLocalizedString("Arrivaed at switching start point", comment: ""), soundName: "sound_eca.mp3")
-        , SwitchingEca.Notice: WarnRecord(title: NSLocalizedString("Eca Notice", comment: ""), body: NSLocalizedString("Arrived at advance notice point", comment: ""), soundName: "sound_eca.mp3")
+        SwitchingEca.Finish: WarnRecord(title: NSLocalizedString("Eca Finish", comment: ""), body: NSLocalizedString("Arrived at switching finished point", comment: ""))
+        , SwitchingEca.Start: WarnRecord(title: NSLocalizedString("Eca Start", comment: ""), body: NSLocalizedString("Arrivaed at switching start point", comment: ""))
+        , SwitchingEca.Notice: WarnRecord(title: NSLocalizedString("Eca Notice", comment: ""), body: NSLocalizedString("Arrived at advance notice point", comment: ""))
     ]
 
     //Eca通知