@aigens/aigens-sdk-core 0.0.24 → 0.0.26

package/android/src/main/java/com/aigens/sdk/WebContainerActivity.java

@@ -17,6 +17,7 @@ import android.webkit.ServiceWorkerController;
 import android.webkit.ValueCallback;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.Button;
 
@@ -49,6 +50,7 @@ import java.util.Map;
 
 public class WebContainerActivity extends BridgeActivity {
 
+    private boolean isFirstError = true;
     static Bundle perviousInstanceState;
     static Intent perviousIntent;
     private boolean DEBUG = CorePlugin.DEBUG;
@@ -235,9 +237,13 @@ public class WebContainerActivity extends BridgeActivity {
         this.bridge.getWebView().setWebViewClient(wvc);
         this.bridge.getWebView().setWebContentsDebuggingEnabled(true);
 
+        // disable zoom
         this.bridge.getWebView().getSettings().setUseWideViewPort(true);
         this.bridge.getWebView().getSettings().setLoadWithOverviewMode(true);
 
+        // set http & https mixed
+        this.bridge.getWebView().getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+
         if (clearCache) {
             this.bridge.getWebView().clearCache(true);
         }
@@ -675,7 +681,12 @@ public class WebContainerActivity extends BridgeActivity {
         @Override
         public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
             debug("onReceivedErrorOld", errorCode, description, failingUrl);
-
+            System.out.println("onReceivedErrorOld:"+description+failingUrl);
+            if (isFirstError) { // reload
+                isFirstError = false;
+                reload();
+                return;
+            }
             initLayout(false, true, true);
         }
 

package/ios/Plugin/WebContainer.xib

@@ -31,9 +31,12 @@
                                 <constraint firstAttribute="height" constant="100" id="SFb-3i-Gvl"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rie-2B-ejA" userLabel="reload">
-                            <rect key="frame" x="237.5" y="579" width="70" height="31"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rie-2B-ejA" userLabel="reload">
+                            <rect key="frame" x="237.5" y="579" width="100" height="31"/>
                             <color key="backgroundColor" systemColor="linkColor"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="eZU-e3-pAz"/>
+                            </constraints>
                             <state key="normal" title="Button"/>
                             <buttonConfiguration key="configuration" style="filled" title="Reload">
                                 <color key="baseForegroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -49,9 +52,12 @@
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                         </textView>
-                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3jG-Lv-8dD" userLabel="back">
-                            <rect key="frame" x="120.5" y="579" width="70" height="31"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3jG-Lv-8dD" userLabel="back">
+                            <rect key="frame" x="76.5" y="579" width="100" height="31"/>
                             <color key="backgroundColor" systemColor="linkColor"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="DQH-u1-8bh"/>
+                            </constraints>
                             <state key="normal" title="Button"/>
                             <buttonConfiguration key="configuration" style="filled" title="Back">
                                 <color key="baseForegroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

package/ios/Plugin/WebContainerViewController.swift

@@ -13,7 +13,7 @@ import Capacitor
 
     // {themeColor: "#xxxxxx"}
     public var options: Dictionary<String, Any>?
-
+    private var isFirstError = true
     private var redirectLink = ""
     private var universalLink = ""
     var externalProtocols: [String] = [
@@ -186,6 +186,7 @@ import Capacitor
 
     deinit {
         print("WebContainerViewController deinit")
+        NotificationCenter.default.removeObserver(self)
     }
 
 
@@ -197,6 +198,8 @@ extension WebContainerViewController: WKNavigationDelegate {
     public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         // Reset the bridge on each navigation
 //        self.bridge?.reset()
+        webContainerView.showError(false)
+        webContainerView.showLoading(true)
     }
 
     public func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
@@ -306,37 +309,44 @@ extension WebContainerViewController: WKNavigationDelegate {
     // The force unwrap is part of the protocol declaration, so we should keep it.
     // swiftlint:disable:next implicitly_unwrapped_optional
     public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-//        if case .initialLoad(let isOpaque) = webViewLoadingState {
-//            webView.isOpaque = isOpaque
-//            webViewLoadingState = .subsequentLoad
-//        }
-        webContainerView.showLoading(false)
-
-        webContainerView.showError(true, error.localizedDescription)
         CAPLog.print("⚡️  WebView failed to load")
         CAPLog.print("⚡️  Error: " + error.localizedDescription)
+        webContainerView.showLoading(false)
+
+        if isFirstError {
+            CAPLog.print("⚡️  WebView failed didFail reload")
+            isFirstError = false
+            // reload
+            webView.reload()
+            return;
+        }
+
+        let e = error as NSError
+        if (e.code == NSURLErrorCancelled || e.code == -999) {
+        }else {
+            webContainerView.showError(true, error.localizedDescription)
+        }
+
     }
 
 //    // The force unwrap is part of the protocol declaration, so we should keep it.
 //    // swiftlint:disable:next implicitly_unwrapped_optional
 //    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-//        webContainerView.showLoading(false)
-//        // cancel
-//        let e = error as NSError
-//        if (e.code == NSURLErrorCancelled || e.code == -999) {
-//            webContainerView.showError(false)
-//        }
 //        CAPLog.print("⚡️  WebView failed provisional navigation")
 //        CAPLog.print("⚡️  Error: " + error.localizedDescription)
 //
-//        if let errorUrl = webView.url?.absoluteString {
-//            print("navURL-- errorUrl: \(errorUrl)")
-//            if (!self.redirectLink.isEmpty && errorUrl.starts(with: self.redirectLink)) {
-//                webContainerView.showError(false)
-//                webContainerView.showLoading(true)
-//            }else {
-//                webContainerView.showError(true, error.localizedDescription)
-//            }
+//        webContainerView.showLoading(false)
+//
+//        if isFirstError {
+//            CAPLog.print("⚡️  WebView failed provisional reload")
+//            isFirstError = false
+//            // reload
+//            webView.reload()
+//            return;
+//        }
+//
+//        let e = error as NSError
+//        if (e.code == NSURLErrorCancelled || e.code == -999) {
 //        }else {
 //            webContainerView.showError(true, error.localizedDescription)
 //        }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",