com.xd.sdk.payment 6.23.13 → 6.26.2

package/Mobile/XDGPaymentMobile.cs

@@ -32,6 +32,10 @@ namespace  XD.SDK.Payment{
             XDGPaymentMobileImpl.GetInstance().QueryWithProductIds(productIds, callback);
         }
 
+        public static void QueryProductList(string[] productIds, Action<XDGSkuDetailInfo> callback){
+            XDGPaymentMobileImpl.GetInstance().QueryProductList(productIds, callback);
+        }
+
         public static void QueryRestoredPurchase(Action<List<XDGRestoredPurchase>> callback){
             XDGPaymentMobileImpl.GetInstance().QueryRestoredPurchase(callback);
         }
@@ -99,6 +103,11 @@ namespace  XD.SDK.Payment{
             QueryWithProductIds(productIds, callback);
         }
 
+        void IXDGPayment.QueryProductList(string[] productIds, Action<XDGSkuDetailInfo> callback)
+        {
+            QueryProductList(productIds, callback);
+        }
+
         void IXDGPayment.QueryRestoredPurchase(Action<List<XDGRestoredPurchase>> callback)
         {
             QueryRestoredPurchase(callback);

package/Mobile/XDGPaymentMobileImpl.cs

@@ -50,6 +50,31 @@ namespace  XD.SDK.Payment{
             });
         }
         
+        public void QueryProductList(string[] productIds, Action<XDGSkuDetailInfo> callback){
+            var dic = new Dictionary<string, object>{
+                {"productIds", productIds}
+            };
+
+            var method = "queryWithProductIds";
+
+#if UNITY_ANDROID
+            method = "queryProductList";
+#endif
+
+            var command = new Command.Builder()
+                .Service(XDG_PAYMENT_SERVICE)
+                .Method(method)
+                .Args(dic)
+                .Callback(true)
+                .OnceTime(true)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command, result => {
+                XDGLogger.Debug("queryWithProductIds 方法结果: " + result.ToJSON());
+                callback(new XDGSkuDetailInfoMobile(result.content) as XDGSkuDetailInfo);
+            });
+        }
+        
         public void PayWithParams(XDGPaymentParams paymentParams, Action<XDGOrderInfoWrapper> callback)
         {
             var paramsDic = new Dictionary<string, object>{

package/Plugins/Android/libs/{XDGPayment_6.23.13.aar.meta → XDGPayment_6.26.2.aar.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 144543d77bad74c1fa342af5b293a64f
+guid: d8986cf39263342d984411d425169b25
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2023/4/14.
 //
 
-#define XDGPayment_VERSION @"6.23.8"
-#define XDGPayment_VERSION_CODE @"6023080"
-// HASH 838231ea
+#define XDGPayment_VERSION @"6.26.2"
+#define XDSPayment_VERSION_CODE @"6026020"
+// HASH 3e572e74

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

@@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(nonatomic,strong,readonly) NSString *productIdentifier;
 
+@property(nonatomic,strong,readonly) NSString *displayPrice;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/Runtime/IXDGPayment.cs

@@ -21,6 +21,7 @@ namespace XD.SDK.Payment
             Action<WebPayResultType, string> callback);
 
         void QueryWithProductIds(string[] productIds, Action<XDGSkuDetailInfo> callback);
+        void QueryProductList(string[] productIds, Action<XDGSkuDetailInfo> callback);
 
         void QueryRestoredPurchase(Action<List<XDGRestoredPurchase>> callback);
 

package/Runtime/XDGPayment.cs

@@ -52,6 +52,10 @@ namespace XD.SDK.Payment{
         public static void QueryWithProductIds(string[] productIds, Action<XDGSkuDetailInfo> callback){
             platformWrapper.QueryWithProductIds(productIds, callback);
         }
+        
+        public static void QueryProductList(string[] productIds, Action<XDGSkuDetailInfo> callback){
+            platformWrapper.QueryProductList(productIds, callback);
+        }
 
         public static void QueryRestoredPurchase(Action<List<XDGRestoredPurchase>> callback){
             platformWrapper.QueryRestoredPurchase(callback);

package/Runtime/XDGSkuDetailInfo.cs

@@ -14,9 +14,15 @@ namespace XD.SDK.Payment
         List<SkuDetailBean> skuDetailList { get; }
     }
 
+    public class BaseSkuDetailBean
+    {
+        [JsonProperty("productId")] public string ProductId;
+        [JsonProperty("displayCostPrice")] public string DisplayPrice;
+    }
+
 #if UNITY_IOS
     [Serializable]
-    public class SkuDetailBean
+    public class SkuDetailBean: BaseSkuDetailBean
     {
         public string localizedDescription;
 
@@ -36,7 +42,8 @@ namespace XD.SDK.Payment
             this.localeIdentifier = SafeDictionary.GetValue<string>(dic,"localeIdentifier");
             this.localizedTitle = SafeDictionary.GetValue<string>(dic,"localizedTitle") ;
             this.price = SafeDictionary.GetValue<double>(dic, "price");
-            this.productIdentifier = SafeDictionary.GetValue<string>(dic,"productIdentifier");
+            ProductId = this.productIdentifier = SafeDictionary.GetValue<string>(dic,"productIdentifier");
+            DisplayPrice = SafeDictionary.GetValue<string>(dic,"displayPrice");
             Dictionary<string,object> priceLocaleDic =
  SafeDictionary.GetValue<Dictionary<string,object>>(dic,"priceLocale") as Dictionary<string,object>;
             this.priceLocale = new PriceLocale(priceLocaleDic);
@@ -47,7 +54,8 @@ namespace XD.SDK.Payment
             this.localeIdentifier = SafeDictionary.GetValue<string>(dic,"localeIdentifier");
             this.localizedTitle = SafeDictionary.GetValue<string>(dic,"localizedTitle") ;
             this.price = SafeDictionary.GetValue<double>(dic,"price");
-            this.productIdentifier = SafeDictionary.GetValue<string>(dic,"productIdentifier");
+            ProductId = this.productIdentifier = SafeDictionary.GetValue<string>(dic,"productIdentifier");
+            DisplayPrice = SafeDictionary.GetValue<string>(dic,"displayPrice");
             Dictionary<string,object> priceLocaleDic =
  SafeDictionary.GetValue<Dictionary<string,object>>(dic,"priceLocale") as Dictionary<string,object>;
             this.priceLocale = new PriceLocale(priceLocaleDic);
@@ -95,7 +103,7 @@ namespace XD.SDK.Payment
 
 #elif UNITY_ANDROID
     [Serializable]
-    public class SkuDetailBean
+    public class SkuDetailBean : BaseSkuDetailBean
     {
         private string _originString;
         public string description;
@@ -116,65 +124,73 @@ namespace XD.SDK.Payment
             _originString = SafeDictionary.GetValue<string>(dic, "originString");
             description = SafeDictionary.GetValue<string>(dic, "description");
             name = SafeDictionary.GetValue<string>(dic, "name");
-            productId = SafeDictionary.GetValue<string>(dic, "productId");
+            var tempProductId = SafeDictionary.GetValue<string>(dic, "productId");
+            if (string.IsNullOrEmpty(tempProductId))
+            {
+                tempProductId = SafeDictionary.GetValue<string>(dic, "productSkuCode");
+            }
+
+            ProductId = productId = tempProductId;
             productType = SafeDictionary.GetValue<string>(dic, "productType");
             title = SafeDictionary.GetValue<string>(dic, "title");
-            googleOneTimePurchaseOfferDetails = new GoogleOneTimePurchaseOfferDetails(SafeDictionary.GetValue<Dictionary<string, object>>(dic, "googleOneTimePurchaseOfferDetails"));
+            var googleDic = SafeDictionary.GetValue<Dictionary<string, object>>(dic, "googleOneTimePurchaseOfferDetails");
+            if (googleDic != null && googleDic.Count > 0)
+            {
+                googleOneTimePurchaseOfferDetails = new GoogleOneTimePurchaseOfferDetails(googleDic);
+                DisplayPrice = googleOneTimePurchaseOfferDetails.formattedPrice;
+            }
+            else
+            {
+                DisplayPrice = SafeDictionary.GetValue<string>(dic, "displayPrice");
+            }
         }
     }
-    
+
     [Serializable]
-        public class GoogleOneTimePurchaseOfferDetails
-        {
-            public string formattedPrice;
-            public long priceAmountMicros;
-            public string priceCurrencyCode;
+    public class GoogleOneTimePurchaseOfferDetails
+    {
+        public string formattedPrice;
+        public long priceAmountMicros;
+        public string priceCurrencyCode;
 
-            public GoogleOneTimePurchaseOfferDetails(Dictionary<string, object> dic)
-            {
-                formattedPrice = SafeDictionary.GetValue<string>(dic, "formattedPrice");
-                priceAmountMicros = SafeDictionary.GetValue<long>(dic, "priceAmountMicros");
-                priceCurrencyCode = SafeDictionary.GetValue<string>(dic, "priceCurrencyCode");
-            }
+        public GoogleOneTimePurchaseOfferDetails(Dictionary<string, object> dic)
+        {
+            formattedPrice = SafeDictionary.GetValue<string>(dic, "formattedPrice");
+            priceAmountMicros = SafeDictionary.GetValue<long>(dic, "priceAmountMicros");
+            priceCurrencyCode = SafeDictionary.GetValue<string>(dic, "priceCurrencyCode");
         }
+    }
 #else
-    public class SkuDetailBean
+    public class SkuDetailBean : BaseSkuDetailBean
     {
-        [JsonProperty("productSkuName")]
-        public string ProductSkuName { get; set; }
+        [JsonProperty("productSkuName")] public string ProductSkuName { get; set; }
 
-        [JsonProperty("productSkuCode")]
-        public string ProductSkuCode { get; set; }
+        [JsonProperty("productSkuCode")] public string ProductSkuCode { get; set; }
 
-        [JsonProperty("desc")]
-        public string Desc { get; set; }
+        [JsonProperty("desc")] public string Desc { get; set; }
 
-        [JsonProperty("channelSkuCode")]
-        public string ChannelSkuCode { get; set; }
+        [JsonProperty("channelSkuCode")] public string ChannelSkuCode { get; set; }
 
-        [JsonProperty("currency")]
-        public string Currency { get; set; }
+        [JsonProperty("currency")] public string Currency { get; set; }
 
-        [JsonProperty("region")]
-        public string Region { get; set; }
+        [JsonProperty("region")] public string Region { get; set; }
 
-        [JsonProperty("costPrice")]
-        public double CostPrice { get; set; }
+        [JsonProperty("costPrice")] public double CostPrice { get; set; }
 
-        [JsonProperty("salePrice")]
-        public double SalePrice { get; set; }
+        [JsonProperty("salePrice")] public double SalePrice { get; set; }
 
-        public string ToJSON(){
+        public string ToJSON()
+        {
             return JsonConvert.SerializeObject(this);
         }
     }
 #endif
-    
+
     [Serializable]
     public class XDGRestoredPurchase
     {
         public string purchaseToken;
-        
+
         public string productId;
 
 #if UNITY_ANDROID
@@ -202,7 +218,7 @@ namespace XD.SDK.Payment
             if (dic == null) return;
 #if UNITY_IOS
             this.purchaseToken = SafeDictionary.GetValue<string>(dic,"transactionIdentifier") ;
-            this.productId = SafeDictionary.GetValue<string>(dic,"productIdentifier") ; 
+            this.productId = SafeDictionary.GetValue<string>(dic,"productIdentifier") ;
 #elif UNITY_ANDROID
             purchaseToken = SafeDictionary.GetValue<string>(dic, "purchaseToken");
             productId = SafeDictionary.GetValue<string>(dic, "productId");
@@ -237,7 +253,9 @@ namespace XD.SDK.Payment
 
         public string ext;
 
-        public XDGOrderInfo() { }
+        public XDGOrderInfo()
+        {
+        }
 
         public XDGOrderInfo(Dictionary<string, object> dic)
         {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.xd.sdk.payment",
   "displayName": "XDSDK Payment",
-  "version": "6.23.13",
+  "version": "6.26.2",
   "description": "XDSDK",
   "unity": "2018.3",
   "license": "MIT",