Commit eb91571f authored by sugita mamoru's avatar sugita mamoru

ManualのURL取得処理作成中

parent 2f9bf158
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
025C28002B034A1900BADC49 /* PDFViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025C27FF2B034A1900BADC49 /* PDFViewer.swift */; }; 025C28002B034A1900BADC49 /* PDFViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025C27FF2B034A1900BADC49 /* PDFViewer.swift */; };
025F99702B2AC2C100C9A18A /* YesNoButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025F996F2B2AC2C100C9A18A /* YesNoButtons.swift */; }; 025F99702B2AC2C100C9A18A /* YesNoButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025F996F2B2AC2C100C9A18A /* YesNoButtons.swift */; };
025F99722B2AE3AF00C9A18A /* TaskViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025F99712B2AE3AF00C9A18A /* TaskViewModel.swift */; }; 025F99722B2AE3AF00C9A18A /* TaskViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025F99712B2AE3AF00C9A18A /* TaskViewModel.swift */; };
025F99742B2C125900C9A18A /* ResGetManualUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025F99732B2C125900C9A18A /* ResGetManualUrl.swift */; };
027EF9F22B0D804C0079B825 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 027EF9F12B0D804C0079B825 /* WebView.swift */; }; 027EF9F22B0D804C0079B825 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 027EF9F12B0D804C0079B825 /* WebView.swift */; };
02A1DE2F2AFB4AA0005BCF55 /* ChatInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */; }; 02A1DE2F2AFB4AA0005BCF55 /* ChatInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */; };
02A1DE312AFB61D8005BCF55 /* MyChatContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */; }; 02A1DE312AFB61D8005BCF55 /* MyChatContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */; };
...@@ -72,6 +73,7 @@ ...@@ -72,6 +73,7 @@
02CE4DC82ADF97E8002E79BC /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DC72ADF97E8002E79BC /* View+Extensions.swift */; }; 02CE4DC82ADF97E8002E79BC /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DC72ADF97E8002E79BC /* View+Extensions.swift */; };
02CE4DCC2ADFA03F002E79BC /* SelectedTabModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DCB2ADFA03F002E79BC /* SelectedTabModel.swift */; }; 02CE4DCC2ADFA03F002E79BC /* SelectedTabModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DCB2ADFA03F002E79BC /* SelectedTabModel.swift */; };
02CE4DDA2ADFBA72002E79BC /* MapRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DD92ADFBA72002E79BC /* MapRepresentable.swift */; }; 02CE4DDA2ADFBA72002E79BC /* MapRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CE4DD92ADFBA72002E79BC /* MapRepresentable.swift */; };
02F4DB672B2C173F00E86C41 /* SessionGetManualUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F4DB662B2C173F00E86C41 /* SessionGetManualUrl.swift */; };
A0F472F6BC78C5F1C5471836 /* Pods_SailAssistTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D252BA721FD314FAE4C2B4C /* Pods_SailAssistTests.framework */; }; A0F472F6BC78C5F1C5471836 /* Pods_SailAssistTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D252BA721FD314FAE4C2B4C /* Pods_SailAssistTests.framework */; };
D51AA4042B099DCD00EBBDD4 /* SignalRService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51AA4032B099DCD00EBBDD4 /* SignalRService.swift */; }; D51AA4042B099DCD00EBBDD4 /* SignalRService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51AA4032B099DCD00EBBDD4 /* SignalRService.swift */; };
D51AA4072B099FCC00EBBDD4 /* AlertDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51AA4062B099FCC00EBBDD4 /* AlertDB.swift */; }; D51AA4072B099FCC00EBBDD4 /* AlertDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = D51AA4062B099FCC00EBBDD4 /* AlertDB.swift */; };
...@@ -195,6 +197,7 @@ ...@@ -195,6 +197,7 @@
025C27FF2B034A1900BADC49 /* PDFViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PDFViewer.swift; path = Sailassist/Menu/View/PDFViewer.swift; sourceTree = SOURCE_ROOT; }; 025C27FF2B034A1900BADC49 /* PDFViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PDFViewer.swift; path = Sailassist/Menu/View/PDFViewer.swift; sourceTree = SOURCE_ROOT; };
025F996F2B2AC2C100C9A18A /* YesNoButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YesNoButtons.swift; path = Sailassist/Parts/YesNoButtons.swift; sourceTree = SOURCE_ROOT; }; 025F996F2B2AC2C100C9A18A /* YesNoButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YesNoButtons.swift; path = Sailassist/Parts/YesNoButtons.swift; sourceTree = SOURCE_ROOT; };
025F99712B2AE3AF00C9A18A /* TaskViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TaskViewModel.swift; path = Sailassist/Map/Task/ViewModel/TaskViewModel.swift; sourceTree = SOURCE_ROOT; }; 025F99712B2AE3AF00C9A18A /* TaskViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TaskViewModel.swift; path = Sailassist/Map/Task/ViewModel/TaskViewModel.swift; sourceTree = SOURCE_ROOT; };
025F99732B2C125900C9A18A /* ResGetManualUrl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ResGetManualUrl.swift; path = Sailassist/Json/ResGetManualUrl.swift; sourceTree = SOURCE_ROOT; };
027EF9F12B0D804C0079B825 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WebView.swift; path = Sailassist/WebView.swift; sourceTree = SOURCE_ROOT; }; 027EF9F12B0D804C0079B825 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WebView.swift; path = Sailassist/WebView.swift; sourceTree = SOURCE_ROOT; };
02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChatInputView.swift; path = Sailassist/Chat/View/ChatInputView.swift; sourceTree = SOURCE_ROOT; }; 02A1DE2E2AFB4AA0005BCF55 /* ChatInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChatInputView.swift; path = Sailassist/Chat/View/ChatInputView.swift; sourceTree = SOURCE_ROOT; };
02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MyChatContentView.swift; path = Sailassist/Chat/View/MyChatContentView.swift; sourceTree = SOURCE_ROOT; }; 02A1DE302AFB61D8005BCF55 /* MyChatContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MyChatContentView.swift; path = Sailassist/Chat/View/MyChatContentView.swift; sourceTree = SOURCE_ROOT; };
...@@ -215,6 +218,7 @@ ...@@ -215,6 +218,7 @@
02CE4DCB2ADFA03F002E79BC /* SelectedTabModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedTabModel.swift; sourceTree = "<group>"; }; 02CE4DCB2ADFA03F002E79BC /* SelectedTabModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedTabModel.swift; sourceTree = "<group>"; };
02CE4DCD2ADFB9FF002E79BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 02CE4DCD2ADFB9FF002E79BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
02CE4DD92ADFBA72002E79BC /* MapRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapRepresentable.swift; sourceTree = "<group>"; }; 02CE4DD92ADFBA72002E79BC /* MapRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapRepresentable.swift; sourceTree = "<group>"; };
02F4DB662B2C173F00E86C41 /* SessionGetManualUrl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SessionGetManualUrl.swift; path = Sailassist/ServerSession/SessionGetManualUrl.swift; sourceTree = SOURCE_ROOT; };
0D252BA721FD314FAE4C2B4C /* Pods_SailAssistTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SailAssistTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0D252BA721FD314FAE4C2B4C /* Pods_SailAssistTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SailAssistTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1B7EACFAA3E1A07EF2E0E403 /* Pods-SailAssistTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SailAssistTests.release.xcconfig"; path = "Target Support Files/Pods-SailAssistTests/Pods-SailAssistTests.release.xcconfig"; sourceTree = "<group>"; }; 1B7EACFAA3E1A07EF2E0E403 /* Pods-SailAssistTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SailAssistTests.release.xcconfig"; path = "Target Support Files/Pods-SailAssistTests/Pods-SailAssistTests.release.xcconfig"; sourceTree = "<group>"; };
3C8118E85BA516EF0E884AA5 /* Pods_Sailassist.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Sailassist.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3C8118E85BA516EF0E884AA5 /* Pods_Sailassist.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Sailassist.framework; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -540,6 +544,7 @@ ...@@ -540,6 +544,7 @@
D5E03A662B04484D00D65FCE /* SessionTaskList.swift */, D5E03A662B04484D00D65FCE /* SessionTaskList.swift */,
D592D5222B0F14FE00B91A1C /* SessionUploadImage.swift */, D592D5222B0F14FE00B91A1C /* SessionUploadImage.swift */,
D59908C72B1ABD43000E13DD /* SessionPushHistory.swift */, D59908C72B1ABD43000E13DD /* SessionPushHistory.swift */,
02F4DB662B2C173F00E86C41 /* SessionGetManualUrl.swift */,
); );
path = ServerSession; path = ServerSession;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -707,6 +712,7 @@ ...@@ -707,6 +712,7 @@
D592D5262B0F182C00B91A1C /* ReqAckMessage.swift */, D592D5262B0F182C00B91A1C /* ReqAckMessage.swift */,
D592D5282B0F198100B91A1C /* ReqChatModeMessage.swift */, D592D5282B0F198100B91A1C /* ReqChatModeMessage.swift */,
D59908C52B19EA70000E13DD /* ResPushHistory.swift */, D59908C52B19EA70000E13DD /* ResPushHistory.swift */,
025F99732B2C125900C9A18A /* ResGetManualUrl.swift */,
); );
path = Json; path = Json;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -930,6 +936,7 @@ ...@@ -930,6 +936,7 @@
D5258CA72B03988600365276 /* ReqTaskList.swift in Sources */, D5258CA72B03988600365276 /* ReqTaskList.swift in Sources */,
D5CB6F9B2B021C4F00EC2010 /* LocationViewModel.swift in Sources */, D5CB6F9B2B021C4F00EC2010 /* LocationViewModel.swift in Sources */,
02CE4DC82ADF97E8002E79BC /* View+Extensions.swift in Sources */, 02CE4DC82ADF97E8002E79BC /* View+Extensions.swift in Sources */,
025F99742B2C125900C9A18A /* ResGetManualUrl.swift in Sources */,
D58E1F542B142A510092D8FE /* SessionEcaArea.swift in Sources */, D58E1F542B142A510092D8FE /* SessionEcaArea.swift in Sources */,
025C28002B034A1900BADC49 /* PDFViewer.swift in Sources */, 025C28002B034A1900BADC49 /* PDFViewer.swift in Sources */,
02C3E6092AFDF30000AF7837 /* ChatMemberView.swift in Sources */, 02C3E6092AFDF30000AF7837 /* ChatMemberView.swift in Sources */,
...@@ -941,6 +948,7 @@ ...@@ -941,6 +948,7 @@
020B98552AD924930029DE4C /* QrCodeScannerView.swift in Sources */, 020B98552AD924930029DE4C /* QrCodeScannerView.swift in Sources */,
02CE4D7F2ADE42A9002E79BC /* MenuContentView.swift in Sources */, 02CE4D7F2ADE42A9002E79BC /* MenuContentView.swift in Sources */,
D5E008782B2B022200C4070A /* MenuAboutAppView.swift in Sources */, D5E008782B2B022200C4070A /* MenuAboutAppView.swift in Sources */,
02F4DB672B2C173F00E86C41 /* SessionGetManualUrl.swift in Sources */,
D5AE351B2AEBA66A00059889 /* ResLogin.swift in Sources */, D5AE351B2AEBA66A00059889 /* ResLogin.swift in Sources */,
D592D5252B0F16CA00B91A1C /* ReqMessage.swift in Sources */, D592D5252B0F16CA00B91A1C /* ReqMessage.swift in Sources */,
02CE4D832ADE672B002E79BC /* MapTaskView.swift in Sources */, 02CE4D832ADE672B002E79BC /* MapTaskView.swift in Sources */,
......
...@@ -26,6 +26,7 @@ enum HttpRequestType : String { ...@@ -26,6 +26,7 @@ enum HttpRequestType : String {
case ConnectionString = "Endpoint=sb://ssv-canary-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=zHzVMA757FciMum5jVG4NMl82YpYVzclUgCiKOVRKf8=" case ConnectionString = "Endpoint=sb://ssv-canary-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=zHzVMA757FciMum5jVG4NMl82YpYVzclUgCiKOVRKf8="
case HubName = "ssv-canary-sailassist-notification" case HubName = "ssv-canary-sailassist-notification"
case storage = "https://ssvcanarystorage.z1.web.core.windows.net/" case storage = "https://ssvcanarystorage.z1.web.core.windows.net/"
case GetManualUrl = "https://ssv-canary-web.azurewebsites.net/api/constantdata/manual?filter=SailAssist"
} }
#elseif QC #elseif QC
enum HttpRequestType : String { enum HttpRequestType : String {
...@@ -45,6 +46,7 @@ enum HttpRequestType : String { ...@@ -45,6 +46,7 @@ enum HttpRequestType : String {
case ConnectionString = "Endpoint=sb://ssv-qc-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=qjI5K38IyGfh2arFherVgp5tNUBE2U4eVClgTEQip54=" case ConnectionString = "Endpoint=sb://ssv-qc-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=qjI5K38IyGfh2arFherVgp5tNUBE2U4eVClgTEQip54="
case HubName = "ssv-qc-sailassist-notification" case HubName = "ssv-qc-sailassist-notification"
case storage = "https://tacmiquaritycheckstorage.z31.web.core.windows.net/" case storage = "https://tacmiquaritycheckstorage.z31.web.core.windows.net/"
case GetManualUrl = "https://ssv-qc-web.azurewebsites.net/api/constantdata/manual?filter=SailAssist"
} }
#else #else
//MARK: 運用サーバー用 //MARK: 運用サーバー用
...@@ -65,5 +67,6 @@ enum HttpRequestType : String { ...@@ -65,5 +67,6 @@ enum HttpRequestType : String {
case ConnectionString = "Endpoint=sb://ssv-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=IzbO7Lo+PenhlIaHBw1MA7+NE9XaLikwieOFwCzZC50=" case ConnectionString = "Endpoint=sb://ssv-notification.servicebus.windows.net/;SharedAccessKeyName=DefaultListenSharedAccessSignature;SharedAccessKey=IzbO7Lo+PenhlIaHBw1MA7+NE9XaLikwieOFwCzZC50="
case HubName = "ssv-sailassist-notification" case HubName = "ssv-sailassist-notification"
case storage = "https://tacmistorage.z31.web.core.windows.net/" case storage = "https://tacmistorage.z31.web.core.windows.net/"
case GetManualUrl = "https://ssv.jmarinecloud.com/api/constantdata/manual?filter=SailAssist"
} }
#endif #endif
//
// ResGetManualUrl.swift
// Sailassist
//
// Created by Mamoru Sugita on 2023/12/15.
//
import Foundation
struct ResGetManualUrl: Codable{
var name: String
var path: String
}
...@@ -46,10 +46,34 @@ struct SailassistApp: App { ...@@ -46,10 +46,34 @@ struct SailassistApp: App {
.preferredColorScheme(.dark) .preferredColorScheme(.dark)
} else { } else {
ContentView() ContentView()
.onAppear(perform: {
getManualUrl()
})
} }
} }
} }
private func getManualUrl(){
let session = SessionGetManualUrl()
session.getManualUrl { response in
print(debug: "called")
switch response {
case .success(let resultData):
print(debug: String(data: resultData, encoding: .utf8))
// let serverSession = ServerSession()
// let resjson = serverSession.fromJSON(resultData: resultData, resltType: [ResEcaArea].self)
// if let res = resjson {
// print(debug: res)
// }
case .failure(let errorCode):
print(debug: errorCode)
break
}
}
}
} }
//class notificationTags: NSObject { //class notificationTags: NSObject {
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
import Foundation import Foundation
typealias SessionResponse = Result<Data, APIError>
class ServerSession{ class ServerSession{
// JSON 文字列に変換 // JSON 文字列に変換
......
//
// SessionGetManualUrl.swift
// Sailassist
//
// Created by Mamoru Sugita on 2023/12/15.
//
import Foundation
class SessionGetManualUrl{
private let serverSession = ServerSession()
/**
* マニュアル類のURL取得
*/
func getManualUrl(_ completion: @escaping ((Result<Data, APIError>)) -> Void) {
print(debug: "calld")
// リクエストURLの組み立て
let url_string = HttpRequestType.GetManualUrl.rawValue
guard let req_url = URL(string : url_string) else {
return
}
serverSession.getJson(req_url, completion: completion)
}
}
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