From db899475f272053560e50c6170868fccc3904cc8 Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Fri, 27 May 2022 17:46:10 +0900
Subject: [PATCH] =?UTF-8?q?WebViewController=20=E5=86=85=E3=81=AE=E5=BC=B7?=
 =?UTF-8?q?=E5=8F=82=E7=85=A7=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Main/View/MainViewController.storyboard   | 13 ------------
 .../WebView/View/WebViewController.swift      | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard b/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
index f8f3f62..28eee85 100644
--- a/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
+++ b/AgileWorks/AgileWorks/Main/View/MainViewController.storyboard
@@ -19,24 +19,11 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="selectedImageTintColor" name="DarkMauve"/>
                     </tabBar>
-                    <connections>
-                        <segue destination="MmL-W6-jGI" kind="relationship" relationship="viewControllers" id="QXt-5N-LTd"/>
-                    </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jza-Nd-YhY" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="52" y="846"/>
         </scene>
-        <!--WebViewNavigationController-->
-        <scene sceneID="dyb-eK-y2Z">
-            <objects>
-                <viewControllerPlaceholder storyboardName="WebViewController" referencedIdentifier="WebViewNavigationController" id="MmL-W6-jGI" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Item" id="xa1-lm-SCh"/>
-                </viewControllerPlaceholder>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="vfN-4V-s6J" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1047" y="845"/>
-        </scene>
     </scenes>
     <resources>
         <namedColor name="DarkMauve">
diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index f5f1203..629356c 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
             }
         }
         // モニタリングスタート
-- 
GitLab