From 56002eeef51424faaf8d174f03af902909e09b86 Mon Sep 17 00:00:00 2001 From: Gk40002148 Date: Tue, 20 Sep 2022 10:06:30 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=83=96=E5=88=87=E3=82=8A=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E6=99=82=E3=81=AEURL=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AgileWorks/Main/Builder/MainTabBarViewBuilder.swift | 1 + .../AgileWorks/Main/View/MainTabBarViewController.swift | 5 ++++- .../AgileWorks/WebView/View/WebViewController.swift | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift index 75fc631..f4da5dd 100644 --- a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift +++ b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift @@ -98,6 +98,7 @@ extension MainTabBarViewBuilderImpl { viewVC.loadURL = createLoadUrl(urlPath: ViewURL.documents.rawValue) viewVC.navigationItem.title = getDisplayString(key: "DocumentsTitle", comment: "") viewVC.tabTitleKey = "DocumentsTitle" + viewVC.reloadTab = true case ViewType.search.rawValue: view.tabBarItem.title = getDisplayString(key: "SearchTitle", comment: "") view.tabBarItem.image = createTabBarItem(imageName: BarItem.search.rawValue, color: normalColor) diff --git a/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift b/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift index ba8feee..288f5b0 100644 --- a/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift +++ b/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift @@ -26,6 +26,8 @@ class MainTabBarViewController: UITabBarController { } } + var selectedTabIndex = 0 + func inject(wireframe: MainTabBarViewWireframe) { self.wireframe = wireframe } @@ -103,7 +105,8 @@ extension MainTabBarViewController: UITabBarControllerDelegate { } } webView.loadViewIfNeeded() - webView.reloadWebView() + webView.reloadWebView(sameTab: selectedTabIndex == tabBarController.selectedIndex) + selectedTabIndex = tabBarController.selectedIndex } } // 多言語対応 diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift index aedf09a..eae82e9 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift @@ -22,6 +22,7 @@ class WebViewController: UIViewController { // 別ウインドウで開いたときの子ウインドウスタック var subViewStack = SubViewStack() var loadURL: String! + var reloadTab = false var showNotification = false // UserAgent let kCustomUserAgent = "AwMobileApp Safari/605.1.15" @@ -372,7 +373,7 @@ class WebViewController: UIViewController { return self.monitor.currentPath.status == .satisfied } // WebView Reload - func reloadWebView() { + func reloadWebView(sameTab: Bool) { var viewReload = false if subViewStack.isEmpty { if loadURL != nowURL { @@ -380,6 +381,12 @@ class WebViewController: UIViewController { } else if !initLoadComp { viewReload = true initLoadComp = true + } else { + if !sameTab { + viewReload = true + } else if reloadTab { + viewReload = true + } } } else { viewReload = true -- GitLab