com.xd.sdk.payment 7.2.0 → 7.2.1-alpha.2

package/Runtime/Internal/Standalone/AliyunTrack.Payment.cs

@@ -67,7 +67,10 @@ namespace XD.SDK.Payment.Internal.Standalone
         {
             string eventId = "sdkcharge_order_request";
             Dictionary<string, string> data = GetPaymentModuleCommonProperties(eventId);
-            data["pick_country"] = SteamUtils.Instance.GetSteamCountry();
+            if (SteamWrapper.Initialized())
+            {
+                data["pick_country"] = SteamWrapper.Instance.GetSteamCountry();    
+            }
             CommonAliyunTrack.LogEventAsync(eventId, data);
         }
 

package/Runtime/Internal/Standalone/PayListener.cs

@@ -23,7 +23,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             XDGLogger.Debug($"pay: {payRequest}",XDGLoggerTag.Pay);
             _timeLeft = TIMEOUT;
             UIManager.ShowLoading(true);
-            Application.OpenURL(Uri.EscapeUriString(payRequest));
+            Application.OpenURL(payRequest);
             AliyunTrack.PaymentCallPage();
             // 启动监听
             HttpListener server = new HttpListener();

package/Runtime/Internal/Standalone/PayModule.cs

@@ -125,7 +125,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             {
                 CreateOrderResult createOrderResult = await CreateSteamOrder(productId, serverId, roldId, orderId, ext);
 
-                string microTxn = await SteamUtils.Instance.GetMicroTxn(createOrderResult.TradeNo);
+                string microTxn = await SteamWrapper.Instance.GetMicroTxn(createOrderResult.TradeNo);
                 AliyunTrack.ReceiveSteamOrder(createOrderResult.TradeNo.ToString());
                 await ReportSteamOrder(productId, createOrderResult.TradeNo, microTxn);
             }
@@ -143,8 +143,8 @@ namespace XD.SDK.Payment.Internal.Standalone
             AliyunTrack.CreateOrder();
             try
             {
-                string steamId = SteamUtils.Instance.GetSteamId();
-                string steamLanguage = SteamUtils.Instance.GetSteamLanguage();
+                string steamId = SteamWrapper.Instance.GetSteamId();
+                string steamLanguage = SteamWrapper.Instance.GetSteamLanguage();
                 Dictionary<string, object> data = new Dictionary<string, object>
                 {
                     { "productId", productId },
@@ -234,11 +234,12 @@ namespace XD.SDK.Payment.Internal.Standalone
                 { "skus", string.Join(",", productIds) }
             };
             var url = XDG_QUERY_PRODUCTS_V2;
-#if XD_STEAM_SUPPORT
-            queryParams.Add("steamId", SteamUtils.Instance.GetSteamId());
-            url = XDG_QUERY_PRODUCTS;
-#endif
-            var response = await XDHttpClient.Client.GetAsync<QueryProductsResponse>(XDG_QUERY_PRODUCTS,
+            if (SteamWrapper.Initialized())
+            {
+                queryParams.Add("steamId", SteamWrapper.Instance.GetSteamId());
+                url = XDG_QUERY_PRODUCTS;
+            }
+            var response = await XDHttpClient.Client.GetAsync<QueryProductsResponse>(url,
                 queryParams: queryParams);
             return response.Products;
         }

package/Runtime/Internal/Standalone/PaymentAlert.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR || UNITY_STANDALONE
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
 using System;
 using UnityEngine;
 using UnityEngine.UI;

package/Runtime/Internal/Standalone/PaymentFeaturesImpl.cs

@@ -63,7 +63,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             }
             catch (XDGError e)
             {
-                callback.Invoke(null, e);
+                callback.Invoke(null, e.ParseToError());
             }
         }
 
@@ -82,13 +82,17 @@ namespace XD.SDK.Payment.Internal.Standalone
 
             try
             {
-#if XD_STEAM_SUPPORT
-                await PayModule.PayWithSteam(paymentParams.ProductId, paymentParams.ServerId, paymentParams.RoleId,
-                    paymentParams.GameOrderId,
-                    paymentParams.Extra);
-#else
-                await PayWithWeb(paymentParams);
-#endif
+                if (SteamWrapper.Initialized())
+                {
+                    await PayModule.PayWithSteam(paymentParams.ProductId, paymentParams.ServerId, paymentParams.RoleId,
+                        paymentParams.GameOrderId,
+                        paymentParams.Extra);
+                }
+                else
+                {
+                    await PayWithWeb(paymentParams);
+                }
+
                 callback.Invoke(
                     new XDGOrderInfo
                     {
@@ -101,11 +105,11 @@ namespace XD.SDK.Payment.Internal.Standalone
             }
             catch (XDGError e)
             {
-                callback.Invoke(null, e);
+                callback.Invoke(null, e.ParseToError());
             }
             catch (Exception e)
             {
-                callback.Invoke(null, new XDGError(e.Message));
+                callback.Invoke(null, e.ParseToError());
             }
         }
 
@@ -167,7 +171,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             }
             catch (XDGError e)
             {
-                callback?.Invoke(new XDGRefundResultWrapperClass(null, e));
+                callback?.Invoke(new XDGRefundResultWrapperClass(null, e.ParseToError()));
             }
         }
 
@@ -185,7 +189,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             // TODO 不需要二次 Encode
             // url = Uri.EscapeUriString(url);
             XDGLogger.Debug("支付 pay URL: " + url, XDGLoggerTag.Pay);
-
+            
             if (ConfigModule.IsGlobal)
             {
                 var payListener = new PayListener();
@@ -193,6 +197,7 @@ namespace XD.SDK.Payment.Internal.Standalone
             }
             else
             {
+#if (UNITY_EDITOR || UNITY_STANDALONE) && !XDSDK_DISABLE_VUPLEX
                 var tcs = new TaskCompletionSource<object>();
 
                 var data = new Dictionary<string, object>
@@ -204,7 +209,7 @@ namespace XD.SDK.Payment.Internal.Standalone
                     if (code == PayModule.PAY_CANCEL)
                     {
                         AliyunTrack.PaymentFailed("user_cancel");
-                        tcs.TrySetException(XDGErrorExtensions.CancelledError());
+                        tcs.TrySetException(XDGErrorExtensions.CancelledError(XDLocalization.GetCurrentLocalizableString().PayCancel));
                     }
                     else
                     {
@@ -217,7 +222,7 @@ namespace XD.SDK.Payment.Internal.Standalone
                         else if (result == PayModule.PAY_FRAGMENT_CANCEL)
                         {
                             AliyunTrack.PaymentFailed("user_cancel");
-                            tcs.TrySetException(XDGErrorExtensions.CancelledError());
+                            tcs.TrySetException(XDGErrorExtensions.CancelledError(XDLocalization.GetCurrentLocalizableString().PayCancel));
                         }
                         else
                         {
@@ -230,9 +235,12 @@ namespace XD.SDK.Payment.Internal.Standalone
                 AliyunTrack.PaymentCallPage();
                 await tcs.Task;
                 return;
+#else
+                throw new XDGError(ResponseCode.Common.Failed, "This function need vuplex enabled");
+#endif
             }
 
-            throw new XDGError(ResponseCode.Common.Failed, "Payment failed");
+            throw new XDGError(ResponseCode.Common.Failed, XDLocalization.GetCurrentLocalizableString().PayFail);
         }
     }
 }

package/package.json

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