@hanwha-ss1/plugin 0.5.1 → 0.5.3

package/android/src/main/java/com/plugin/openbrowser/WebViewActivity.java

@@ -120,12 +120,9 @@ public class WebViewActivity extends AppCompatActivity {
                     startActivity(intent);
                     return true;
                 } else if(url.startsWith("viewer://")) {
-                    Map<String, String> param = parseViewerParam(url);
-                    if(param != null) {
-                        Intent intent = new Intent("com.hanwha.cleverselite.OPEN_URL");
-                        intent.putExtra("url", param.get("downloadUrl"));
-                        sendBroadcast(intent);
-                    }
+                    Intent intent = new Intent("com.hanwha.cleverselite.OPEN_URL");
+                    intent.putExtra("url",url);
+                    sendBroadcast(intent);
                     return true;
                 } else {
                     return super.shouldOverrideUrlLoading(view, url);
@@ -146,6 +143,7 @@ public class WebViewActivity extends AppCompatActivity {
      *                  extension=pdf
      * @return file 주소
      */
+    @Deprecated
     private Map<String, String> parseViewerParam(String uriString) {
         try {
             URI uri = new URI(uriString);
@@ -176,12 +174,8 @@ public class WebViewActivity extends AppCompatActivity {
         webView.loadUrl(url);
 
         if(url.startsWith("viewer://")) {
-            Map<String, String> param = parseViewerParam(url);
-            if(param != null) {
-                Intent intent = new Intent("com.hanwha.cleverselite.OPEN_URL");
-                intent.putExtra("url", param.get("downloadUrl"));
-                sendBroadcast(intent);
-            }
+            Intent intent = new Intent("com.hanwha.cleverselite.OPEN_URL");
+            intent.putExtra("url", url);
         }
     }
 

package/ios/Plugin/OpenBrowser/OpenBrowserPlugin.swift

@@ -17,8 +17,9 @@ public class OpenBrowserPlugin: CAPPlugin {
         DispatchQueue.main.async {
             let controller = self.implementation.builder(url: url, isCloseBtn: isCloseBtn, clear: clear)
             controller.modalPresentationStyle = .fullScreen
-
-            _bridge.viewController?.present(controller, animated: true)
+            // 브라우저 중첩되게 호출하는 경우가 있어서 아래와 같이 처리
+            let topController = UIViewController.topViewController(controller: _bridge.viewController)
+            topController?.present(controller, animated: true)
         }
 
 

package/ios/Plugin/OpenBrowser/UIViewController+Extention.swift

@@ -0,0 +1,27 @@
+//
+//  UIViewController+Extention.swift
+//  Plugin
+//
+//  Created by 구정현 on 10/30/24.
+//  Copyright © 2024 Max Lynch. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+extension UIViewController {
+    static func topViewController(controller: UIViewController? = UIApplication.shared.keyWindow?.rootViewController) -> UIViewController? {
+        if let navigationController = controller as? UINavigationController {
+            return topViewController(controller: navigationController.visibleViewController)
+        }
+        if let tabController = controller as? UITabBarController {
+            if let selected = tabController.selectedViewController {
+                return topViewController(controller: selected)
+            }
+        }
+        if let presented = controller?.presentedViewController {
+            return topViewController(controller: presented)
+        }
+        return controller
+    }
+}

package/ios/Plugin/OpenBrowser/ViewController.swift

@@ -17,14 +17,14 @@ class ViewController: UIViewController {
     @IBOutlet var constraintPanelHeight: NSLayoutConstraint!
     @IBOutlet var btnClose: UIButton!
     @IBOutlet var indicator: UIActivityIndicatorView!
-        
-
+    
+    
     var url: String = ""
     var isCloseBtn: Bool = false
     var clear: Bool = false
     var naviTitle: String = ""
     
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         if isCloseBtn {
@@ -44,16 +44,26 @@ class ViewController: UIViewController {
         wkWebview.load(URLRequest.init(url: URL(string: url)!))
     }
     
-
+    
     /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+     // MARK: - Navigation
+     
+     // In a storyboard-based application, you will often want to do a little preparation before navigation
+     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+     // Get the new view controller using segue.destination.
+     // Pass the selected object to the new view controller.
+     }
+     */
+    
+    @IBAction func callFileViewer(urlString: String) {
+        
+        let userInfo:[AnyHashable:Any] = ["payload":urlString]
+        
+        NotificationCenter.default.post(name: Notification.Name("CallFileViewer"), object: nil, userInfo: userInfo)
+        
+        
+      
     }
-    */
     
     @IBAction func doClose() {
         self.dismiss(animated: true)
@@ -77,7 +87,7 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {
     }
     
     func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Swift.Void) {
-            
+        
         let alertController = UIAlertController(title: message, message: nil, preferredStyle: .alert);
         
         let cancelAction = UIAlertAction(title: "확인", style: .cancel) {
@@ -107,13 +117,16 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {
     
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         
-        let url = navigationAction.request.url?.absoluteString
+        let url = navigationAction.request.url?.absoluteString ?? ""
         
         if "close://" == url {
             doClose()
+        }else if url.contains("viewer://") {
+            callFileViewer(urlString: url)
         }
-        
 
+        
+        
         decisionHandler(.allow)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanwha-ss1/plugin",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",