com.xd.sdk.payment 7.7.0 → 7.7.3

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentVersion.h

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2023/4/14.
 //
 
-#define XDGPayment_VERSION @"7.7.0"
-#define XDSPayment_VERSION_CODE @"7070000"
-// HASH a8b1407f
+#define XDGPayment_VERSION @"7.7.3"
+#define XDSPayment_VERSION_CODE @"7070300"
+// HASH 18c75b8c

package/Runtime/Internal/Standalone/PaymentAlert.cs

@@ -1,15 +1,15 @@
-#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
+#if ((UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX) || ((UNITY_EDITOR_WIN || UNITY_EDITOR_OSX) && !UNITY_ANDROID && !UNITY_IOS))
 using System;
 using UnityEngine;
 using UnityEngine.UI;
-using Vuplex.WebView;
+using XD.SDK.WebView;
 using XD.SDK.Common.Internal.Standalone;
 
 namespace XD.SDK.Payment.Internal.Standalone
 {
     public class PaymentAlert : UIElement
     {
-        CanvasWebViewPrefab canvasWebViewPrefab;
+        IXDWebViewPanel webViewPanel;
         Button closeButton;
 
         GameObject loadFailedGO;
@@ -18,15 +18,14 @@ namespace XD.SDK.Payment.Internal.Standalone
 
         private void Awake()
         {
-            GameObject webviewGO = Instantiate(Resources.Load("CanvasWebViewPrefab")) as GameObject;
-            canvasWebViewPrefab = webviewGO.GetComponent<CanvasWebViewPrefab>();
-            canvasWebViewPrefab.Resolution = 2;
+            webViewPanel = XDWebViewService.Provider.CreatePanel();
+            webViewPanel.Resolution = 2;
 
+            GameObject webviewGO = webViewPanel.GameObject;
             webviewGO.transform.SetParent(transform.Find("WebViewContainer"));
             RectTransform rectTransform = webviewGO.GetComponent<RectTransform>();
             rectTransform.offsetMin = Vector2.zero;
             rectTransform.offsetMax = Vector2.zero;
-            canvasWebViewPrefab = webviewGO.GetComponent<CanvasWebViewPrefab>();
 
             closeButton = GameObject.Find("CloseButton").GetComponent<Button>();
             closeButton.onClick.AddListener(OnCloseButtonClicked);
@@ -44,10 +43,10 @@ namespace XD.SDK.Payment.Internal.Standalone
 
         private async void Start()
         {
-            await canvasWebViewPrefab.WaitUntilInitialized();
+            await webViewPanel.WaitUntilInitialized();
 
-            canvasWebViewPrefab.WebView.UrlChanged += OnUrlChanged;
-            canvasWebViewPrefab.WebView.PageLoadFailed += OnPageLoadFailed;
+            webViewPanel.WebView.UrlChanged += OnUrlChanged;
+            webViewPanel.WebView.PageLoadFailed += OnPageLoadFailed;
 
             LoadPaymentPage();
         }
@@ -62,17 +61,17 @@ namespace XD.SDK.Payment.Internal.Standalone
             else
             {
                 string url = Extra["url"] as string;
-                canvasWebViewPrefab.WebView.LoadUrl(url);
+                webViewPanel.WebView.LoadUrl(url);
             }
         }
 
         private void OnDestroy()
         {
-            canvasWebViewPrefab.WebView.UrlChanged -= OnUrlChanged;
-            canvasWebViewPrefab.WebView.PageLoadFailed -= OnPageLoadFailed;
+            webViewPanel.WebView.UrlChanged -= OnUrlChanged;
+            webViewPanel.WebView.PageLoadFailed -= OnPageLoadFailed;
         }
 
-        void OnUrlChanged(object sender, UrlChangedEventArgs eventArgs)
+        void OnUrlChanged(object sender, XDWebViewUrlChangedEventArgs eventArgs)
         {
             string url = eventArgs.Url;
             Uri uri = new Uri(url);

package/Runtime/Internal/Standalone/PaymentFeaturesImpl.cs

@@ -9,6 +9,9 @@ using XD.SDK.Account;
 using XD.SDK.Common;
 using XD.SDK.Common.Internal;
 using XD.SDK.Common.Internal.Standalone;
+#if ((UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX) || ((UNITY_EDITOR_WIN || UNITY_EDITOR_OSX) && !UNITY_ANDROID && !UNITY_IOS))
+using XD.SDK.WebView;
+#endif
 using Task = System.Threading.Tasks.Task;
 
 namespace XD.SDK.Payment.Internal.Standalone
@@ -212,7 +215,13 @@ namespace XD.SDK.Payment.Internal.Standalone
             }
             else
             {
-#if (UNITY_STANDALONE || (UNITY_EDITOR && !UNITY_ANDROID && !UNITY_IOS)) && !XDSDK_DISABLE_VUPLEX
+#if ((UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX) || ((UNITY_EDITOR_WIN || UNITY_EDITOR_OSX) && !UNITY_ANDROID && !UNITY_IOS))
+                if (!XDWebViewService.IsAvailable)
+                {
+                    XDGLogger.Error("[XDSDK WebView] XDWebViewService.Provider is not registered. Please check whether XD.SDK.WebView.Vuplex is included and preserved in the build.", XDGLoggerTag.Pay);
+                    throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+                }
+
                 var tcs = new TaskCompletionSource<object>();
 
                 var data = new Dictionary<string, object>

package/Runtime/XD.SDK.Payment.asmdef

@@ -5,7 +5,7 @@
         "XD.SDK.Common",
         "XD.SDK.Account",
         "XD.SDK.Foundation",
-        "Vuplex.WebView"
+        "XD.SDK.WebView"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.payment",
   "displayName": "XDGSDK Payment",
-  "version": "7.7.0",
+  "version": "7.7.3",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.7.0"
+    "com.xd.sdk.common": "7.7.3"
   }
 }