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

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

@@ -17,6 +17,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (XDGOrderInfo *)createOrderInfo:(NSDictionary *)orderInfo;
 
+- (instancetype)initWithGameOrderId:(NSString *)gameOrderId
+                          productId:(NSString *)productId
+                           serverId:(NSString *)serverId
+                             roleId:(NSString *)roleId
+                              extra:(NSString *)extra;
+
 - (NSDictionary *)toDictionary;
 @end
 

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

@@ -0,0 +1,25 @@
+//
+//  XDGPaymentApi.h
+//  TDSSDK
+//
+//  Created by JiangJiahao on 2020/10/26.
+//  Copyright © 2020 JiangJiahao. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import <XDCommonSDK/XDGHttp.h>
+#import <XDCommonSDK/XDGEntryType.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+static NSString * const XDG_CREATE_ORDER   = @"/trade/v1/client/createOrder";         // 创建预支付订单
+
+static NSString * const XDG_UPLOAD_RECEIPT = @"/callback/v1/client/pay/notify";  // 上传票据
+
+static NSString * const XDG_PAYBACK_LIST   = @"/order/v1/user/repayOrders";  // 查询补款订单信息
+
+@interface XDGPaymentAPI : NSObject
++ (void)checkThirdPay:(NSDictionary *)params completionHandler:(XDGInitCallback)handler;
+@end
+NS_ASSUME_NONNULL_END

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

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2023/4/14.
 //
 
-#define XDGPayment_VERSION @"7.2.0"
-#define XDSPayment_VERSION_CODE @"7020000"
-// HASH 8d15387e
+#define XDGPayment_VERSION @"7.3.0"
+#define XDSPayment_VERSION_CODE @"7030000"
+// HASH e0ae45d9

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

@@ -12,26 +12,26 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) NSString *displayPrice;
 
 /// 本地化标题
-@property(nonatomic,strong,readonly) NSString *localizedTitle;
+@property(nonatomic,strong,readonly, nullable) NSString *localizedTitle;
 
 /// 本地化描述
-@property (nonatomic, strong, readonly) NSString *localizedDescription;
+@property (nonatomic, strong, readonly, nullable) NSString *localizedDescription;
 
 /// 商品价格
 /// 建议直接使用 displayPrice
-@property(nonatomic,strong,readonly) NSDecimalNumber *price;
+@property(nonatomic,strong,readonly, nullable) NSDecimalNumber *price;
 
 /// 价格符号
 /// 建议直接使用 displayPrice
-@property (nonatomic, strong, readonly) NSString *currencySymbol;
+@property (nonatomic, strong, readonly, nullable) NSString *currencySymbol;
 
 /// 价格代码
 /// 建议直接使用 displayPrice
-@property (nonatomic, strong, readonly) NSString *currencyCode;
+@property (nonatomic, strong, readonly, nullable) NSString *currencyCode;
 
 /// 价格本地化信息
 /// 建议直接使用 displayPrice
-@property(nonatomic,strong,readonly) NSLocale *priceLocale;
+@property(nonatomic,strong,readonly, nullable) NSLocale *priceLocale;
 
 - (nonnull XDGProductInfo *)initWithProductId:(nonnull NSString *)productId
                                         price:(nonnull NSDecimalNumber *)price
@@ -39,6 +39,9 @@ NS_ASSUME_NONNULL_BEGIN
                                localizedTitle:(nonnull NSString *)localizedTitle
                          localizedDescription:(nonnull NSString *)localizedDescription;
 
+- (nonnull XDGProductInfo *)initWithProductId:(nonnull NSString *)productId
+                                 displayPrice:(nonnull NSString *)displayPrice;
+
 - (NSDictionary *)toDictionary;
 
 @end

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

@@ -0,0 +1,360 @@
+#if 0
+#elif defined(__arm64__) && __arm64__
+// Generated by Apple Swift version 6.2.1 effective-5.10 (swiftlang-6.2.1.4.8 clang-1700.4.4.1)
+#ifndef XDPAYMENTSDK_SWIFT_H
+#define XDPAYMENTSDK_SWIFT_H
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgcc-compat"
+
+#if !defined(__has_include)
+# define __has_include(x) 0
+#endif
+#if !defined(__has_attribute)
+# define __has_attribute(x) 0
+#endif
+#if !defined(__has_feature)
+# define __has_feature(x) 0
+#endif
+#if !defined(__has_warning)
+# define __has_warning(x) 0
+#endif
+
+#if __has_include(<swift/objc-prologue.h>)
+# include <swift/objc-prologue.h>
+#endif
+
+#pragma clang diagnostic ignored "-Wauto-import"
+#if defined(__OBJC__)
+#include <Foundation/Foundation.h>
+#endif
+#if defined(__cplusplus)
+#include <cstdint>
+#include <cstddef>
+#include <cstdbool>
+#include <cstring>
+#include <stdlib.h>
+#include <new>
+#include <type_traits>
+#else
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <string.h>
+#endif
+#if defined(__cplusplus)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-modular-include-in-framework-module"
+#if defined(__arm64e__) && __has_include(<ptrauth.h>)
+# include <ptrauth.h>
+#else
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
+# ifndef __ptrauth_swift_value_witness_function_pointer
+#  define __ptrauth_swift_value_witness_function_pointer(x)
+# endif
+# ifndef __ptrauth_swift_class_method_pointer
+#  define __ptrauth_swift_class_method_pointer(x)
+# endif
+#pragma clang diagnostic pop
+#endif
+#pragma clang diagnostic pop
+#endif
+
+#if !defined(SWIFT_TYPEDEFS)
+# define SWIFT_TYPEDEFS 1
+# if __has_include(<uchar.h>)
+#  include <uchar.h>
+# elif !defined(__cplusplus)
+typedef unsigned char char8_t;
+typedef uint_least16_t char16_t;
+typedef uint_least32_t char32_t;
+# endif
+typedef float swift_float2  __attribute__((__ext_vector_type__(2)));
+typedef float swift_float3  __attribute__((__ext_vector_type__(3)));
+typedef float swift_float4  __attribute__((__ext_vector_type__(4)));
+typedef double swift_double2  __attribute__((__ext_vector_type__(2)));
+typedef double swift_double3  __attribute__((__ext_vector_type__(3)));
+typedef double swift_double4  __attribute__((__ext_vector_type__(4)));
+typedef int swift_int2  __attribute__((__ext_vector_type__(2)));
+typedef int swift_int3  __attribute__((__ext_vector_type__(3)));
+typedef int swift_int4  __attribute__((__ext_vector_type__(4)));
+typedef unsigned int swift_uint2  __attribute__((__ext_vector_type__(2)));
+typedef unsigned int swift_uint3  __attribute__((__ext_vector_type__(3)));
+typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
+#endif
+
+#if !defined(SWIFT_PASTE)
+# define SWIFT_PASTE_HELPER(x, y) x##y
+# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
+#endif
+#if !defined(SWIFT_METATYPE)
+# define SWIFT_METATYPE(X) Class
+#endif
+#if !defined(SWIFT_CLASS_PROPERTY)
+# if __has_feature(objc_class_property)
+#  define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
+# else
+#  define SWIFT_CLASS_PROPERTY(...) 
+# endif
+#endif
+#if !defined(SWIFT_RUNTIME_NAME)
+# if __has_attribute(objc_runtime_name)
+#  define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
+# else
+#  define SWIFT_RUNTIME_NAME(X) 
+# endif
+#endif
+#if !defined(SWIFT_COMPILE_NAME)
+# if __has_attribute(swift_name)
+#  define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
+# else
+#  define SWIFT_COMPILE_NAME(X) 
+# endif
+#endif
+#if !defined(SWIFT_METHOD_FAMILY)
+# if __has_attribute(objc_method_family)
+#  define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
+# else
+#  define SWIFT_METHOD_FAMILY(X) 
+# endif
+#endif
+#if !defined(SWIFT_NOESCAPE)
+# if __has_attribute(noescape)
+#  define SWIFT_NOESCAPE __attribute__((noescape))
+# else
+#  define SWIFT_NOESCAPE 
+# endif
+#endif
+#if !defined(SWIFT_RELEASES_ARGUMENT)
+# if __has_attribute(ns_consumed)
+#  define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
+# else
+#  define SWIFT_RELEASES_ARGUMENT 
+# endif
+#endif
+#if !defined(SWIFT_WARN_UNUSED_RESULT)
+# if __has_attribute(warn_unused_result)
+#  define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+# else
+#  define SWIFT_WARN_UNUSED_RESULT 
+# endif
+#endif
+#if !defined(SWIFT_NORETURN)
+# if __has_attribute(noreturn)
+#  define SWIFT_NORETURN __attribute__((noreturn))
+# else
+#  define SWIFT_NORETURN 
+# endif
+#endif
+#if !defined(SWIFT_CLASS_EXTRA)
+# define SWIFT_CLASS_EXTRA 
+#endif
+#if !defined(SWIFT_PROTOCOL_EXTRA)
+# define SWIFT_PROTOCOL_EXTRA 
+#endif
+#if !defined(SWIFT_ENUM_EXTRA)
+# define SWIFT_ENUM_EXTRA 
+#endif
+#if !defined(SWIFT_CLASS)
+# if __has_attribute(objc_subclassing_restricted)
+#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
+#  define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+# else
+#  define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+#  define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
+# endif
+#endif
+#if !defined(SWIFT_RESILIENT_CLASS)
+# if __has_attribute(objc_class_stub)
+#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
+#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
+# else
+#  define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
+#  define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
+# endif
+#endif
+#if !defined(SWIFT_PROTOCOL)
+# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
+# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
+#endif
+#if !defined(SWIFT_EXTENSION)
+# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
+#endif
+#if !defined(OBJC_DESIGNATED_INITIALIZER)
+# if __has_attribute(objc_designated_initializer)
+#  define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
+# else
+#  define OBJC_DESIGNATED_INITIALIZER 
+# endif
+#endif
+#if !defined(SWIFT_ENUM_ATTR)
+# if __has_attribute(enum_extensibility)
+#  define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
+# else
+#  define SWIFT_ENUM_ATTR(_extensibility) 
+# endif
+#endif
+#if !defined(SWIFT_ENUM)
+# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+# if __has_feature(generalized_swift_name)
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
+# else
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
+# endif
+#endif
+#if !defined(SWIFT_UNAVAILABLE)
+# define SWIFT_UNAVAILABLE __attribute__((unavailable))
+#endif
+#if !defined(SWIFT_UNAVAILABLE_MSG)
+# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
+#endif
+#if !defined(SWIFT_AVAILABILITY)
+# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
+#endif
+#if !defined(SWIFT_WEAK_IMPORT)
+# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
+#endif
+#if !defined(SWIFT_DEPRECATED)
+# define SWIFT_DEPRECATED __attribute__((deprecated))
+#endif
+#if !defined(SWIFT_DEPRECATED_MSG)
+# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
+#endif
+#if !defined(SWIFT_DEPRECATED_OBJC)
+# if __has_feature(attribute_diagnose_if_objc)
+#  define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
+# else
+#  define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
+# endif
+#endif
+#if defined(__OBJC__)
+#if !defined(IBSegueAction)
+# define IBSegueAction 
+#endif
+#endif
+#if !defined(SWIFT_EXTERN)
+# if defined(__cplusplus)
+#  define SWIFT_EXTERN extern "C"
+# else
+#  define SWIFT_EXTERN extern
+# endif
+#endif
+#if !defined(SWIFT_CALL)
+# define SWIFT_CALL __attribute__((swiftcall))
+#endif
+#if !defined(SWIFT_INDIRECT_RESULT)
+# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
+#endif
+#if !defined(SWIFT_CONTEXT)
+# define SWIFT_CONTEXT __attribute__((swift_context))
+#endif
+#if !defined(SWIFT_ERROR_RESULT)
+# define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
+#endif
+#if defined(__cplusplus)
+# define SWIFT_NOEXCEPT noexcept
+#else
+# define SWIFT_NOEXCEPT 
+#endif
+#if !defined(SWIFT_C_INLINE_THUNK)
+# if __has_attribute(always_inline)
+# if __has_attribute(nodebug)
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline)) __attribute__((nodebug))
+# else
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline))
+# endif
+# else
+#  define SWIFT_C_INLINE_THUNK inline
+# endif
+#endif
+#if defined(_WIN32)
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
+#endif
+#else
+#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
+# define SWIFT_IMPORT_STDLIB_SYMBOL 
+#endif
+#endif
+#if defined(__OBJC__)
+#if __has_feature(objc_modules)
+#if __has_warning("-Watimport-in-framework-header")
+#pragma clang diagnostic ignored "-Watimport-in-framework-header"
+#endif
+@import ObjectiveC;
+#endif
+
+#endif
+#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
+#pragma clang diagnostic ignored "-Wduplicate-method-arg"
+#if __has_warning("-Wpragma-clang-attribute")
+# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
+#endif
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wnullability"
+#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
+
+#if __has_attribute(external_source_symbol)
+# pragma push_macro("any")
+# undef any
+# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="XDPaymentSDK",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
+# pragma pop_macro("any")
+#endif
+
+#if defined(__OBJC__)
+
+@class NSArray;
+@class NSError;
+@class XDGPaymentParams;
+@class XDGOrderInfo;
+/// Objective-C 桥接类，用于调用 XDGStore 并提供 OC 友好的接口
+SWIFT_CLASS("_TtC12XDPaymentSDK14XDGStoreBridge") SWIFT_AVAILABILITY(ios,introduced=15.0.0)
+@interface XDGStoreBridge : NSObject
+/// 开始监听交易更新
++ (void)observeTransactionUpdates;
+/// 请求商品信息 - NSArray 版本（更 OC 友好）
+/// \param identifiers 商品标识符数组
+///
+/// \param completion 完成回调，返回 XDGProductInfo 数组或错误
+///
++ (void)requestProductsWith:(NSArray * _Nullable)identifiers completion:(void (^ _Nonnull)(NSArray * _Nullable, NSError * _Nullable))completion;
+/// 发起购买
+/// <ul>
+///   <li>
+///     Parameters:
+///   </li>
+///   <li>
+///     params: 支付参数
+///   </li>
+///   <li>
+///     completion: 完成回调，返回 XDGOrderInfo 或错误
+///   </li>
+/// </ul>
++ (void)purchaseWith:(XDGPaymentParams * _Nullable)params completion:(void (^ _Nonnull)(XDGOrderInfo * _Nullable, NSError * _Nullable))completion;
+/// 查询未完成交易
+/// tips: 交易数据不包含 appAccountToken 信息
+/// \param completion 完成回调，返回 XDGPendingPurchase 数组
+///
++ (void)queryPendingPurchasesWithCompletion:(void (^ _Nonnull)(NSArray * _Nullable))completion;
+/// 处理未完成交易
+/// \param params 支付参数
+///
+/// \param completion 完成回调，返回 XDGOrderInfo 或错误
+///
++ (void)handlePendingPurchaseWith:(XDGPaymentParams * _Nullable)params completion:(void (^ _Nonnull)(XDGOrderInfo * _Nullable, NSError * _Nullable))completion;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
+#endif
+#if __has_attribute(external_source_symbol)
+# pragma clang attribute pop
+#endif
+#if defined(__cplusplus)
+#endif
+#pragma clang diagnostic pop
+#endif
+
+#else
+#error unsupported Swift architecture
+#endif

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

@@ -23,3 +23,4 @@ FOUNDATION_EXPORT const unsigned char XDPaymentSDKVersionString[];
 #import <XDPaymentSDK/XDGPaymentVersion.h>
 #import <XDPaymentSDK/XDGPaymentParams.h>
 #import <XDPaymentSDK/XDGLogger+Payment.h>
+#import <XDPaymentSDK/XDGPaymentAPI.h>

package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.abi.json

@@ -0,0 +1,9 @@
+{
+  "ABIRoot": {
+    "kind": "Root",
+    "name": "NO_MODULE",
+    "printedName": "NO_MODULE",
+    "json_format_version": 8
+  },
+  "ConstValues": []
+}

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

@@ -4,3 +4,8 @@ framework module XDPaymentSDK {
 
   module * { export * }
 }
+
+module XDPaymentSDK.Swift {
+  header "XDPaymentSDK-Swift.h"
+  requires objc
+}

package/package.json

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