@hanwha-ss1/plugin 0.4.0 → 0.4.2

package/README.md

@@ -25,6 +25,9 @@ await HanwhaPlugin.addContact({
   ext: "내선"
 })
 
+// 모달
+HanwhaPlugin.open({url: "{{url}}", isCloseBtn:true, clear: true, ext: false})
+
 // 생체인증
 await HanwhaPlugin.auth()
 ```

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

@@ -21,7 +21,7 @@ public class OpenBrowser {
      * @param url
      * @param isExternal
      */
-    public void open(AppCompatActivity activity, String url, boolean isExternal, boolean hasClose) {
+    public void open(AppCompatActivity activity, String url, boolean isExternal, boolean hasClose, boolean clear) {
         if(activity != null && url != null && !url.isEmpty()) {
             Intent intent;
             if(isExternal) {
@@ -30,6 +30,8 @@ public class OpenBrowser {
                 intent = new Intent(activity, WebViewActivity.class);
                 intent.putExtra("url", url);
                 intent.putExtra("hasClose", hasClose);
+                intent.putExtra("clear", clear);
+
             }
             activity.startActivity(intent);
         }

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

@@ -25,9 +25,10 @@ public class OpenBrowserPlugin extends Plugin {
         String url = call.getString("url");
         boolean isExternal = Boolean.TRUE.equals(call.getBoolean("ext"));
         boolean hasClose = Boolean.TRUE.equals(call.getBoolean("isCloseBtn"));
+        boolean clear = Boolean.TRUE.equals(call.getBoolean("clear"));
         if(implementation == null) {
             implementation = new OpenBrowser();
         }
-        implementation.open(getActivity(), url, isExternal, hasClose);
+        implementation.open(getActivity(), url, isExternal, hasClose, clear);
     }
 }

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

@@ -1,18 +1,30 @@
 package com.plugin.openbrowser;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.webkit.CookieManager;
+import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class WebViewActivity extends AppCompatActivity {
 
     private WebView webView;
 
+    private ValueCallback mFilePathCallback;;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -21,15 +33,39 @@ public class WebViewActivity extends AppCompatActivity {
 
         String url = getIntent().getStringExtra("url");
         boolean hasClose = getIntent().getBooleanExtra("hasClose", true);
-
-        initLayout(hasClose);
+        boolean clear = getIntent().getBooleanExtra("clear", false);
+        initLayout(hasClose, clear);
 
         openUrl(url);
     }
 
-    private void initLayout(boolean hasClose) {
+    private final ActivityResultLauncher<Intent> startActivityResult = registerForActivityResult(
+            new ActivityResultContracts.StartActivityForResult(),
+            new ActivityResultCallback<ActivityResult>() {
+                @Override
+                public void onActivityResult(ActivityResult result) {
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        mFilePathCallback.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(result.getResultCode(), result.getData()));
+                        mFilePathCallback = null;
+                    } else {
+                        mFilePathCallback.onReceiveValue(null);
+                    }
+                }
+            });
+
+    private void initLayout(boolean hasClose, boolean clear) {
         webView = findViewById(R.id.webView);
 
+        if(clear) {
+            webView.clearCache(true);
+            webView.clearHistory();
+            webView.clearFormData();
+            CookieManager cookieManager = CookieManager.getInstance();
+            cookieManager.removeAllCookies(null);
+            cookieManager.flush();
+            WebStorage.getInstance().deleteAllData();
+        }
+
         if(hasClose) {
             findViewById(R.id.ivClose).setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -48,7 +84,41 @@ public class WebViewActivity extends AppCompatActivity {
         webView.getSettings().setDisplayZoomControls(false);
         webView.getSettings().setLoadWithOverviewMode(true);
         webView.getSettings().setUseWideViewPort(true);
-        webView.setWebChromeClient(new ChromeClient((Activity)this));
+//        webView.setWebChromeClient(new ChromeClient((Activity)this));
+        webView.setWebChromeClient(new ChromeClient(this) {
+            @Override
+            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
+                mFilePathCallback = filePathCallback;
+
+                Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                intent.addCategory(Intent.CATEGORY_OPENABLE);
+                intent.setType("image/*");
+
+//                startActivityForResult(intent, 0);
+                startActivityResult.launch(intent);
+                return true;
+            }
+        });
+
+        webView.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                if(url.startsWith("close://")){
+                    WebViewActivity.this.finish();
+                } else if(url.startsWith("tel:")){
+                    Intent intent = new Intent(Intent.ACTION_DIAL);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                } else if(url.startsWith("sms:")){
+                    Intent intent = new Intent(Intent.ACTION_SENDTO);
+                    intent.setData(Uri.parse(url));
+                    startActivity(intent);
+                }
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+
+
         webView.setWebViewClient(new WebViewClient(){
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -72,4 +142,4 @@ public class WebViewActivity extends AppCompatActivity {
             super.onBackPressed();
         }
     }
-}
+}

package/dist/esm/definitions.d.ts

@@ -48,6 +48,8 @@ export interface Plugin {
     open(options: {
         url: string;
         ext: boolean;
+        isCloseBtn?: boolean;
+        clear?: boolean;
     }): Promise<{
         value: string;
     }>;

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface Plugin {\n  /**\n   * 앱 실행\n   * @param options  package : 패키지명\n   */\n  executeApp(options: {\n    package: string;\n  }): Promise<{ value: string }>;\n\n  /**\n   * 연락처 저장\n   * @param options  name : 성명\n   * @param options  phone : 전화번호\n   * @param options  email : 이메일\n   * @param options  dept : 소속\n   * @param options  ext : 내선번호\n   */\n  addContact(options: {\n    name: string;\n    phone: string;\n    email: string;\n    dept: string;\n    ext: string;\n  }): Promise<{ value: string }>;\n\n  /**\n   * TouchID, FaceID\n   */\n  auth(): Promise<{ value: string }>;\n\n  /**\n   * 시스템에 설정된 지역이 서울인지 확인\n   */\n  checkSeoulTimeZone(): Promise<{ value: string }>;\n\n  timezone(): Promise<{ value: string }>;\n\n  /**\n   *\n   * @param options  url : \"웹 페이지 주소\"\n   * @param options  ext : false(내부 웹뷰), true(외부 브라우저)\n   */\n  open(options: { url: string; ext: boolean; }): Promise<{ value: string }>;\n}\n\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface Plugin {\n  /**\n   * 앱 실행\n   * @param options  package : 패키지명\n   */\n  executeApp(options: {\n    package: string;\n  }): Promise<{ value: string }>;\n\n  /**\n   * 연락처 저장\n   * @param options  name : 성명\n   * @param options  phone : 전화번호\n   * @param options  email : 이메일\n   * @param options  dept : 소속\n   * @param options  ext : 내선번호\n   */\n  addContact(options: {\n    name: string;\n    phone: string;\n    email: string;\n    dept: string;\n    ext: string;\n  }): Promise<{ value: string }>;\n\n  /**\n   * TouchID, FaceID\n   */\n  auth(): Promise<{ value: string }>;\n\n  /**\n   * 시스템에 설정된 지역이 서울인지 확인\n   */\n  checkSeoulTimeZone(): Promise<{ value: string }>;\n\n  timezone(): Promise<{ value: string }>;\n\n  /**\n   *\n   * @param options  url : \"웹 페이지 주소\"\n   * @param options  ext : false(내부 웹뷰), true(외부 브라우저)\n   */\n  open(options: { url: string; ext: boolean; isCloseBtn?: boolean; clear?: boolean }): Promise<{ value: string }>;\n}\n\n"]}

package/dist/esm/web.d.ts

@@ -9,5 +9,7 @@ export declare class PluginWeb extends WebPlugin implements Plugin {
     open(_options: {
         url: string;
         ext: boolean;
+        isCloseBtn?: boolean;
+        clear?: boolean;
     }): Promise<any>;
 }

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG1C,MAAM,OAAO,SAAU,SAAQ,SAAS;IAEtC,KAAK,CAAC,UAAU;QACd,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAuC;QAChD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;CACF","sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport {WebPlugin} from '@capacitor/core';\nimport type {Plugin} from './definitions';\n\nexport class PluginWeb extends WebPlugin implements Plugin {\n\n  async executeApp(): Promise<any> {\n    return { results: {} };\n  }\n\n  async addContact(): Promise<any> {\n    return { results: {} };\n  }\n\n  async auth(): Promise<any> {\n    return { results: {} };\n  }\n\n  async checkSeoulTimeZone(): Promise<any> {\n    return { results: {} };\n  }\n\n  async timezone(): Promise<any> {\n    return { results: {} };\n  }\n\n  async open(_options: { url: string, ext: boolean }): Promise<any> {\n    return { results: {} };\n  }\n}\n"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG1C,MAAM,OAAO,SAAU,SAAQ,SAAS;IAEtC,KAAK,CAAC,UAAU;QACd,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAA8E;QACvF,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;CACF","sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport {WebPlugin} from '@capacitor/core';\nimport type {Plugin} from './definitions';\n\nexport class PluginWeb extends WebPlugin implements Plugin {\n\n  async executeApp(): Promise<any> {\n    return { results: {} };\n  }\n\n  async addContact(): Promise<any> {\n    return { results: {} };\n  }\n\n  async auth(): Promise<any> {\n    return { results: {} };\n  }\n\n  async checkSeoulTimeZone(): Promise<any> {\n    return { results: {} };\n  }\n\n  async timezone(): Promise<any> {\n    return { results: {} };\n  }\n\n  async open(_options: { url: string, ext: boolean, isCloseBtn?: boolean; clear?: boolean }): Promise<any> {\n    return { results: {} };\n  }\n}\n"]}

package/ios/Plugin/OpenBrowser/OpenBrowserPlugin.swift

@@ -11,10 +11,11 @@ public class OpenBrowserPlugin: CAPPlugin {
     
     @objc func openBrowser(_ call: CAPPluginCall, _bridge: CAPBridgeProtocol) {
         let url = call.getString("url") ?? ""
-        
+        let isCloseBtn = call.getBool("isCloseBtn") ?? true
+        let clear = call.getBool("clear") ?? false
         
         DispatchQueue.main.async {
-            let controller = self.implementation.builder(url: url)
+            let controller = self.implementation.builder(url: url, isCloseBtn: isCloseBtn, clear: clear)
             controller.modalPresentationStyle = .fullScreen
 
             _bridge.viewController?.present(controller, animated: true)

package/ios/Plugin/OpenBrowser/OpenBrowserService.swift

@@ -6,10 +6,12 @@ import Capacitor
 
 
 public class OpenBrowserService: NSObject {
-    @objc public func builder(url: String) -> UIViewController {
+    @objc public func builder(url: String, isCloseBtn: Bool, clear: Bool) -> UIViewController {
         let bundle = Bundle(for: self.classForCoder)
         let controller = ViewController(nibName: "ViewController", bundle: bundle)
+        controller.isCloseBtn = isCloseBtn
         controller.url = url
+        controller.clear = clear
         return controller
     }
     

package/ios/Plugin/OpenBrowser/ViewController.swift

@@ -13,16 +13,33 @@ import WebKit
 
 class ViewController: UIViewController {
     @IBOutlet var wkWebview: WKWebView!
+    @IBOutlet var btnPanel: UIView!
+    @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 {
+            btnPanel.isHidden = false
+            constraintPanelHeight.constant = 48
+        } else {
+            btnPanel.isHidden = true
+            constraintPanelHeight.constant = 0
+        }
+        
         indicator.startAnimating()
+        if clear {
+            clearCache()
+        }
+        wkWebview.uiDelegate = self
         wkWebview.navigationDelegate = self
         wkWebview.load(URLRequest.init(url: URL(string: url)!))
     }
@@ -41,15 +58,53 @@ class ViewController: UIViewController {
     @IBAction func doClose() {
         self.dismiss(animated: true)
     }
+    
+    func clearCache() {
+        let websiteDataTypes = Set([WKWebsiteDataTypeMemoryCache, WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeCookies, WKWebsiteDataTypeSessionStorage, WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeIndexedDBDatabases, WKWebsiteDataTypeWebSQLDatabases])
+        let dateFrom = Date(timeIntervalSince1970: 0)
+        
+        WKWebsiteDataStore.default().removeData(ofTypes: websiteDataTypes, modifiedSince: dateFrom) {
+            print("Cache cleared")
+        }
+    }
 }
 
 
-extension ViewController: WKNavigationDelegate {
+extension ViewController: WKNavigationDelegate, WKUIDelegate {
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         indicator.stopAnimating()
         webView.isHidden = false
     }
     
+    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) {
+            _ in completionHandler()
+        }
+        
+        alertController.addAction(cancelAction)
+        DispatchQueue.main.async {
+            self.present(alertController, animated: true, completion: nil)
+        }
+    }
+    
+    func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
+        let alertController = UIAlertController(title: "", message: message, preferredStyle: .alert)
+        let cancelAction = UIAlertAction(title: "취소", style: .cancel) { _ in
+            completionHandler(false)
+        }
+        let okAction = UIAlertAction(title: "확인", style: .default) { _ in
+            completionHandler(true)
+        }
+        alertController.addAction(cancelAction)
+        alertController.addAction(okAction)
+        DispatchQueue.main.async {
+            self.present(alertController, animated: true, completion: nil)
+        }
+    }
+    
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         
         let url = navigationAction.request.url?.absoluteString

package/ios/Plugin/OpenBrowser/ViewController.xib

@@ -3,14 +3,16 @@
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController" customModule="HanwhaSs1Plugin" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController" customModule="Plugin" customModuleProvider="target">
             <connections>
                 <outlet property="btnClose" destination="1PV-Mj-hAT" id="mlS-cq-Qaz"/>
+                <outlet property="btnPanel" destination="Uoe-RW-I9y" id="iTQ-0F-k59"/>
+                <outlet property="constraintPanelHeight" destination="G6Y-b0-xtz" id="QkE-B3-I13"/>
                 <outlet property="indicator" destination="Vt7-sZ-fvc" id="LWz-jE-fvu"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="wkWebview" destination="gNx-5x-FOs" id="rA7-7h-TvS"/>

package/package.json

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