com.xd.sdk.payment 6.29.1 → 7.0.0

package/Plugins/Android/libs/{XDGPayment_6.29.1.aar.meta → XDGBridgePayment_v7_7.0.0.aar.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 21c8dd6c6e2c640ca87c2221712567e8
+guid: d80cd6109a9b149a1ae0750375bbdbbe
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -7,7 +7,7 @@ PluginImporter:
   executionOrder: {}
   defineConstraints: []
   isPreloaded: 0
-  isOverridable: 0
+  isOverridable: 1
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:

package/Plugins/Android/libs/XDGPaymentUPPay_7.0.0.aar.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8c17143d8ef7461190fe56b2bd500899
+timeCreated: 1755682524

package/Plugins/Android/libs/XDGPayment_7.0.0.aar.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 91896ca3061b408588674ae253c11b38
+timeCreated: 1755682524

package/Plugins/Android/libs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7040c7094b873433a961bae40b47a923
+guid: 8f130c4e1ca34def8668df9b3bd045f4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Plugins/Android.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ffe4b5946970e4f978596b86f0596523
+guid: 9030895ebfad41a6b8e8205b1fa5cc20
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -2,20 +2,18 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-/** TDSGlobal 平台订单信息 */
+/// 订单信息
 @interface XDGOrderInfo : NSObject
-/// 游戏侧订单号
-@property (nonatomic,copy,readonly) NSString *outTradeNo;
+/// 游戏订单号
+@property (nonatomic,copy,readonly) NSString *gameOrderId;
 /// 商品 ID
-@property (nonatomic,copy,readonly) NSString *productIdentifier;
-/// 角色所在服务器 ID
+@property (nonatomic,copy,readonly) NSString *productId;
+/// 服务器 ID
 @property (nonatomic,copy,readonly) NSString *serverId;
 /// 角色ID
 @property (nonatomic,copy,readonly) NSString *roleId;
-/// 当前订单所用货币
-@property (nonatomic,copy,readonly) NSString *currency;
-/// 当前订单价格
-@property (nonatomic,strong,readonly) NSDecimalNumber *price;
+/// 透传参数
+@property (nonatomic, copy, readonly) NSString *extra;
 
 + (XDGOrderInfo *)createOrderInfo:(NSDictionary *)orderInfo;
 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGOrderInfo.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a6e302400ec64fb5b0e5e6c58dc14a0
+guid: 02aa63ee6fe74b69ace72b4f14e5dc63
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -1,44 +1,14 @@
 
 #import <Foundation/Foundation.h>
 
-@class XDGProductInfo;
+#import <XDPaymentSDK/XDGPaymentDefines.h>
+#import <XDPaymentSDK/XDGPaymentParams.h>
+#import <XDPaymentSDK/XDGPendingPurchase.h>
 
-@class XDGOrderInfo;
-
-@class XDGPaymentParams;
-
-#import <XDPaymentSDK/XDGTransactionInfo.h>
+#import <XDCommonSDK/NSError+XDG.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM(NSInteger,XDGRepayMentCode) {
-    XDGRepayMentCodeOk          = 0x00,                       // ok
-    XDGRepayMentCodeError       = 0xff,                      // error
-};
-/**
-  Describes the call back to the query of products
- @param result the result contains info of the products
- @param error error, if any.
- */
-typedef void(^XDGQueryProductsCallback)(NSArray<XDGProductInfo *> *_Nullable result,NSError *_Nullable error);
-
-/**
- Describes the call back to the query of unfinished transactions
-@param result the result contains unfinished transactions
- */
-typedef void(^XDGQueryRestoreProductsCallback)(NSArray<XDGTransactionInfo *> *result);
-
-/**
- Describes the call back to the transaction
-@param orderInfo info of the transaction
-@param error error, if any.
- */
-typedef void(^XDGPaymentCallback)(XDGOrderInfo *_Nullable orderInfo,NSError *_Nullable error);
-
-
-typedef void(^XDGRePaymentCallback)(XDGRepayMentCode code,NSString * _Nullable msg,NSDictionary *_Nullable data);
-
-
 @interface XDGPayment : NSObject
 
 /// 查询商品价格,请等待回调之后再做下一次查询，否则可能造成数据错乱
@@ -51,36 +21,14 @@ typedef void(^XDGRePaymentCallback)(XDGRepayMentCode code,NSString * _Nullable m
 /// @param completionHandler 支付结果回调
 + (void)payWithParams:(XDGPaymentParams *)paymentParam completionHandler:(XDGPaymentCallback)completionHandler;
 
-/// 支付商品
-/// @param orderId 商品ID
-/// @param productId 商品ID
-/// @param roleId 角色ID
-/// @param serverId 服务器ID
-/// @param ext 支付额外信息EXT
-/// @param completionHandler 支付结果处理
-+ (void)payWithOrderId:(NSString *)orderId
-             productId:(NSString *)productId
-                roleId:(NSString *)roleId
-              serverId:(NSString *)serverId
-                   ext:(NSString *)ext
-     completionHandler:(XDGPaymentCallback)completionHandler;
-
 /// 查询当前是否有未处理订单或者礼包码
 /// @param completionHandler 查询结果处理
-+ (void)queryRestoredPurchases:(XDGQueryRestoreProductsCallback)completionHandler;
++ (void)queryPendingPurchases:(XDGQueryPendingPurchasesCallback)completionHandler;
 
-/// 恢复一笔订单/礼包码
-/// @param restoreTransaction 需要回复的订单信息，queryRestoredProducts回调中返回
-/// @param orderId 商品ID
-/// @param roleId 角色ID
-/// @param serverId 服务器ID
-/// @param ext 支付EXT信息
+/// 消费订单/礼包码
+/// @param paymentParam 支付参数
 /// @param completionHandler 回调处理
-+ (void)restorePurchase:(XDGTransactionInfo *)restoreTransaction
-                orderId:(NSString *)orderId
-                 roleId:(NSString *)roleId
-               serverId:(NSString *)serverId
-                    ext:(NSString *)ext
++ (void)handlePendingPurchase:(XDGPaymentParams *)paymentParam
       completionHandler:(XDGPaymentCallback)completionHandler;
 
 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPayment.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de11b94aca349419d97b1eac261fa471
+guid: aecbd8e422bc4e24aa04d95a77c623eb
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -0,0 +1,49 @@
+//
+//  XDGPaymentDefines.h
+//  XDPaymentSDK
+//
+//  Created by Fattycat on 2025/3/28.
+//
+
+#import <Foundation/Foundation.h>
+#import <XDPaymentSDK/XDGProductInfo.h>
+#import <XDPaymentSDK/XDGOrderInfo.h>
+#import <XDPaymentSDK/XDGPendingPurchase.h>
+
+#import <XDCommonSDK/NSError+XDG.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, XDGRepayMentCode) {
+    XDGRepayMentCodeOk = XDGErrorCodeSuccess,   // ok
+    XDGRepayMentCodeError = XDGErrorCodeFailed, // error
+};
+
+/**
+ 商品查询回调
+ @param result 商品信息
+ @param error 错误信息
+ */
+typedef void (^XDGQueryProductsCallback)(NSArray<XDGProductInfo *> *_Nullable result, NSError *_Nullable error);
+
+/**
+ 支付回调
+ @param orderInfo 订单信息
+ @param error 错误信息
+ */
+typedef void (^XDGPaymentCallback)(XDGOrderInfo *_Nullable orderInfo, NSError *_Nullable error);
+
+/**
+ 未处理订单查询回调
+ @param result 未处理订单信息
+ */
+typedef void (^XDGQueryPendingPurchasesCallback)(NSArray<XDGPendingPurchase *> *result);
+
+/// 补款回调
+typedef void (^XDGRePaymentCallback)(XDGRepayMentCode code, NSString *_Nullable msg, NSDictionary *_Nullable data);
+
+@interface XDGPaymentDefines : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

package/{README.md.meta → Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentDefines.h.meta}

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 209e968e45fcd47c69bde9feec5e0a07
-TextScriptImporter:
+guid: 16fd62a0a7e74bd9ae4af1504eaf43bb
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

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

@@ -11,14 +11,32 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XDGPaymentParams : NSObject
 
+/// 游戏订单 ID，可选
 @property(nonatomic, strong, nullable) NSString *gameOrderId;
+
+/// 商品 ID，必填
 @property(nonatomic, strong) NSString *productId;
+
+/// 角色 ID
 @property(nonatomic, strong, nullable) NSString *roleId;
+
+/// 服务器 ID
 @property(nonatomic, strong, nullable) NSString *serverId;
-@property(nonatomic, strong, nullable) NSString *ext;
+
+/// 透传参数
+@property(nonatomic, strong, nullable) NSString *extra;
+
+/// 商品数量，默认为1，可选 1-10，恢复订单时不可用
 @property(nonatomic, assign) NSInteger quantity;
 
-- (NSError *_Nullable)checkValid;
+/// 需要恢复的订单 ID，只在恢复订单时使用，可选
+@property(nonatomic, strong, nullable) NSString *pendingPurchaseToken;
+
++ (XDGPaymentParams *_Nullable)createWithDictionary:(NSDictionary *)dict;
+
+- (NSError * _Nullable)checkValid:(BOOL)isPendingPurchase;
+
+- (NSDictionary *)toDictionary;
 
 @end
 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentParams.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99b31cdab1e4b4b14b89b4dcd5003f5e
+guid: 6b4c247d4d8a435dae17c345219fc0a1
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentService.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5eed740debc946778d5d509c185c571
+guid: 868372ba49d64c42b6c7a40866ebbfa4
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2023/4/14.
 //
 
-#define XDGPayment_VERSION @"6.29.0"
-#define XDSPayment_VERSION_CODE @"6029000"
-// HASH 702c456
+#define XDGPayment_VERSION @"7.0.0"
+#define XDSPayment_VERSION_CODE @"7000000"
+// HASH 7e458e32

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a66214e2c0144f17a3c2055b12331de
+guid: 95699cd0991e405ebfabb9329310ee4c
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -0,0 +1,18 @@
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XDGPendingPurchase : NSObject
+
+/// 交易 ID
+@property (nonatomic, strong) NSString *pendingPurchaseToken;
+
+/// 商品 ID
+@property (nonatomic, strong) NSString *productId;
+
+- (NSDictionary *)toDictionary;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPendingPurchase.h.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d15d8872bd114b46a01e312264952a16
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -4,17 +4,42 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XDGProductInfo : NSObject
-@property(nonatomic,strong,readonly) NSString *localizedDescription;
 
+/// 商品 ID
+@property (nonatomic, strong, readonly) NSString *productIdentifier;
+
+/// 商品展示价格（包含本地化符号 & 价格）
+@property (nonatomic, strong, readonly) NSString *displayPrice;
+
+/// 本地化标题
 @property(nonatomic,strong,readonly) NSString *localizedTitle;
 
+/// 本地化描述
+@property (nonatomic, strong, readonly) NSString *localizedDescription;
+
+/// 商品价格
+/// 建议直接使用 displayPrice
 @property(nonatomic,strong,readonly) NSDecimalNumber *price;
 
+/// 价格符号
+/// 建议直接使用 displayPrice
+@property (nonatomic, strong, readonly) NSString *currencySymbol;
+
+/// 价格代码
+/// 建议直接使用 displayPrice
+@property (nonatomic, strong, readonly) NSString *currencyCode;
+
+/// 价格本地化信息
+/// 建议直接使用 displayPrice
 @property(nonatomic,strong,readonly) NSLocale *priceLocale;
 
-@property(nonatomic,strong,readonly) NSString *productIdentifier;
+- (nonnull XDGProductInfo *)initWithProductId:(nonnull NSString *)productId
+                                        price:(nonnull NSDecimalNumber *)price
+                                  priceLocale:(nonnull NSLocale *)priceLocale
+                               localizedTitle:(nonnull NSString *)localizedTitle
+                         localizedDescription:(nonnull NSString *)localizedDescription;
 
-@property(nonatomic,strong,readonly) NSString *displayPrice;
+- (NSDictionary *)toDictionary;
 
 @end
 

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1bb57965c05be447c9e8ddb08a09c146
+guid: 5f6c44f9c3e44b579243205c47bbc64b
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -4,10 +4,14 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XDGTransactionInfo : NSObject
-// The unique server-provided identifier
-@property (nonatomic,strong,readonly) NSString *transactionIdentifier;
 
-@property (nonatomic,strong,readonly) NSString *productIdentifier;
+/// 交易 ID
+@property (nonatomic, strong) NSString *transactionId;
+
+/// 商品 ID
+@property (nonatomic, strong) NSString *productIdentifier;
+
+- (NSDictionary *)toDictionary;
 
 @end
 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGTransactionInfo.h.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ddc4fa5e2132c41af84c2de3bf4285f8
+guid: 84a4f4801ef8445d86373578c30d9a1f
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -17,7 +17,7 @@ FOUNDATION_EXPORT const unsigned char XDPaymentSDKVersionString[];
 
 #import <XDPaymentSDK/XDGPayment.h>
 #import <XDPaymentSDK/XDGProductInfo.h>
-#import <XDPaymentSDK/XDGTransactionInfo.h>
+#import <XDPaymentSDK/XDGPendingPurchase.h>
 #import <XDPaymentSDK/XDGOrderInfo.h>
 #import <XDPaymentSDK/XDGPaymentService.h>
 #import <XDPaymentSDK/XDGPaymentVersion.h>

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a7dd4428ac9d4aaba441ab7800eaf2d
+guid: 1c22284443524667a04e2dcb9edf2f3a
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Plugins/iOS/XDPaymentSDK.framework/Headers.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1491b204ddf68442190d15d77f8ea1bb
+guid: a010deb5886949a88351753c45978f1c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Plugins/iOS/XDPaymentSDK.framework/Info.plist.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 343cc7ec566ef4279afec3c7ad7400c8
+guid: 1f53717552eb4b7fbd2610e0ce0fa349
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Plugins/iOS/XDPaymentSDK.framework/Modules/module.modulemap.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b1c4b11139d0e478a9020c8f617019ea
+guid: 5b84f42d927f4cfb9d47738519492304
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Plugins/iOS/XDPaymentSDK.framework/Modules.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8989c5f0c4138463e8fd956ad3675b2b
+guid: a6b78f8f7fc04f48903a1295fc5f31bf
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Plugins/iOS/XDPaymentSDK.framework/XDPaymentSDK.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9cbbc27ecd0014d379296b97392a2f4d
+guid: dde358aee99f44bb9c1ad933d2d06148
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Plugins/iOS/XDPaymentSDK.framework.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 9f60a694492a145c183edb575f87ad88
-folderAsset: yes
+guid: 1c090750ca3b4befae689c38c0aa0c47
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -21,6 +20,7 @@ PluginImporter:
         Exclude Editor: 1
         Exclude Linux64: 1
         Exclude OSXUniversal: 1
+        Exclude WebGL: 1
         Exclude Win: 1
         Exclude Win64: 1
         Exclude iOS: 0
@@ -72,7 +72,7 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        AddToEmbeddedBinaries: false
+        AddToEmbeddedBinaries: true
         CPU: AnyCPU
         CompileFlags: 
         FrameworkDependencies: 

package/Plugins/iOS.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 026724d2bfe7d43d597db1b01b5fb845
+guid: 3723976a3c1f4c15a741031e5b8ed3d1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Plugins.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 44f60da4cd1904757931064b14592226
+guid: 12061ffa64bc4618be0548b44b8d8bd3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/{Mobile → Runtime/Internal/Mobile}/PaymentConstants.cs

@@ -1,4 +1,6 @@
-namespace XD.SDK.Payment
+#if UNITY_ANDROID || UNITY_IOS
+
+namespace XD.SDK.Payment.Internal.Mobile
 {
     public class PaymentConstants
     {
@@ -10,12 +12,6 @@ namespace XD.SDK.Payment
             public static int USER_CANCEL = 1;
             public static int PURCHASE_PROCESSING = 2;
         }
-        
-        internal static class PayTypeInternal
-        {
-            public const string ALIPAY = "Alipay";
-            public const string WECHAT_PAY = "WeChatPay";
-            public const string CLOUD_QUICK_PAY = "CloudQuickPay";
-        }
     }
-}
+}
+#endif

package/{Mobile → Runtime/Internal/Mobile}/PaymentConstants.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1ab389c0b21841f288cf3a4c446ecf7a
+guid: 868ad620f20a428ba42fbe2ba78970ed
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2