diff --git a/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard b/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
index f8f3f62050e368d9f0d213d16f5cefe299869db6..28eee85e04dec129ddb75cb3eec02e77fb756964 100644
--- a/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
+++ b/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
@@ -19,24 +19,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index f5f1203f0124c8122b56cadc698d6468f8f4c6ea..629356c07f8efe433859cf5ab7688f1663127a00 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -26,7 +26,7 @@ class WebViewController: UIViewController {
var showNotification = false
// UserAgent
let kCustomUserAgent = "AwMobileApp Safari/605.1.15"
- var messageHandler: WebViewScriptMessageHandler!
+ //var messageHandler: WebViewScriptMessageHandler!
var refreshControl: UIRefreshControl!
private let monitor = NWPathMonitor()
private let queue = DispatchQueue(label: "jp.atled.agileworks")
@@ -90,8 +90,12 @@ class WebViewController: UIViewController {
let cookieScript = WKUserScript(source: script, injectionTime: .atDocumentStart, forMainFrameOnly: false)
userContentController.addUserScript(cookieScript)
- self.messageHandler = WebViewScriptMessageHandler(webViewController: self)
+ /*
+ if self.messageHandler == nil {
+ self.messageHandler = WebViewScriptMessageHandler(webViewController: self)
+ }
self.messageHandler.registerHandlers(controller: userContentController)
+ */
let configuration = WKWebViewConfiguration()
configuration.userContentController = userContentController
@@ -249,26 +253,26 @@ class WebViewController: UIViewController {
// ネットワークモニタリング開始
func startNetworkMonitor() {
// ネットワーク変更時 handler
- monitor.pathUpdateHandler = { path in
+ monitor.pathUpdateHandler = { [weak self](path) in
// ネットワーク接続時
if path.status == .satisfied {
// オフラインView非表示
DispatchQueue.main.async {
- self.disablingView.isHidden = true
+ self?.disablingView.isHidden = true
}
AppDelegate.appShared.setOnlineStatus(isOnline: true)
// ネットワーク非接続時
} else {
// 書類表示時
- if self.isShowDoc {
+ if ((self?.isShowDoc) != nil) && self!.isShowDoc {
// オフラインView表示
DispatchQueue.main.async {
- self.disablingView.isHidden = false
- self.checkConnectButton.isEnabled = true
+ self?.disablingView.isHidden = false
+ self?.checkConnectButton.isEnabled = true
}
}
AppDelegate.appShared.setOnlineStatus(isOnline: false)
- self.initLoadComp = false
+ self?.initLoadComp = false
}
}
// モニタリングスタート