com.xd.sdk.payment 7.2.1-alpha.2 → 7.2.1-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Plugins/Android/libs/XDGBridgePayment_v7_7.3.0.aar +0 -0
- package/Plugins/Android/libs/{XDGPaymentUPPay_7.2.0.aar → XDGPaymentUPPay_7.3.0.aar} +0 -0
- package/Plugins/Android/libs/XDGPayment_7.3.0.aar +0 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGOrderInfo.h +6 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentApi.h +25 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentApi.h.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentVersion.h +3 -3
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGProductInfo.h +9 -6
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDPaymentSDK-Swift.h +360 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDPaymentSDK-Swift.h.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDPaymentSDK.h +1 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Info.plist +0 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/Project.meta +8 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.abi.json +9 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.abi.json.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.swiftdoc.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.swiftmodule +0 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.swiftmodule.meta +7 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule.meta +8 -0
- package/Plugins/iOS/XDPaymentSDK.framework/Modules/module.modulemap +5 -0
- package/Plugins/iOS/XDPaymentSDK.framework/XDPaymentSDK +0 -0
- package/Runtime/Internal/Standalone/AliyunTrack.Payment.cs +2 -2
- package/Runtime/Internal/Standalone/PayModule.cs +5 -5
- package/Runtime/Internal/Standalone/PaymentFeaturesImpl.cs +1 -1
- package/package.json +2 -2
- package/Plugins/Android/libs/XDGBridgePayment_v7_7.2.0.aar +0 -0
- package/Plugins/Android/libs/XDGPayment_7.2.0.aar +0 -0
- /package/Plugins/Android/libs/{XDGBridgePayment_v7_7.2.0.aar.meta → XDGBridgePayment_v7_7.3.0.aar.meta} +0 -0
- /package/Plugins/Android/libs/{XDGPaymentUPPay_7.2.0.aar.meta → XDGPaymentUPPay_7.3.0.aar.meta} +0 -0
- /package/Plugins/Android/libs/{XDGPayment_7.2.0.aar.meta → XDGPayment_7.3.0.aar.meta} +0 -0
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -17,6 +17,12 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
17
17
|
|
|
18
18
|
+ (XDGOrderInfo *)createOrderInfo:(NSDictionary *)orderInfo;
|
|
19
19
|
|
|
20
|
+
- (instancetype)initWithGameOrderId:(NSString *)gameOrderId
|
|
21
|
+
productId:(NSString *)productId
|
|
22
|
+
serverId:(NSString *)serverId
|
|
23
|
+
roleId:(NSString *)roleId
|
|
24
|
+
extra:(NSString *)extra;
|
|
25
|
+
|
|
20
26
|
- (NSDictionary *)toDictionary;
|
|
21
27
|
@end
|
|
22
28
|
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
//
|
|
2
|
+
// XDGPaymentApi.h
|
|
3
|
+
// TDSSDK
|
|
4
|
+
//
|
|
5
|
+
// Created by JiangJiahao on 2020/10/26.
|
|
6
|
+
// Copyright © 2020 JiangJiahao. All rights reserved.
|
|
7
|
+
//
|
|
8
|
+
|
|
9
|
+
#import <Foundation/Foundation.h>
|
|
10
|
+
|
|
11
|
+
#import <XDCommonSDK/XDGHttp.h>
|
|
12
|
+
#import <XDCommonSDK/XDGEntryType.h>
|
|
13
|
+
|
|
14
|
+
NS_ASSUME_NONNULL_BEGIN
|
|
15
|
+
|
|
16
|
+
static NSString * const XDG_CREATE_ORDER = @"/trade/v1/client/createOrder"; // 创建预支付订单
|
|
17
|
+
|
|
18
|
+
static NSString * const XDG_UPLOAD_RECEIPT = @"/callback/v1/client/pay/notify"; // 上传票据
|
|
19
|
+
|
|
20
|
+
static NSString * const XDG_PAYBACK_LIST = @"/order/v1/user/repayOrders"; // 查询补款订单信息
|
|
21
|
+
|
|
22
|
+
@interface XDGPaymentAPI : NSObject
|
|
23
|
+
+ (void)checkThirdPay:(NSDictionary *)params completionHandler:(XDGInitCallback)handler;
|
|
24
|
+
@end
|
|
25
|
+
NS_ASSUME_NONNULL_END
|
|
@@ -12,26 +12,26 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
12
12
|
@property (nonatomic, strong, readonly) NSString *displayPrice;
|
|
13
13
|
|
|
14
14
|
/// 本地化标题
|
|
15
|
-
@property(nonatomic,strong,readonly) NSString *localizedTitle;
|
|
15
|
+
@property(nonatomic,strong,readonly, nullable) NSString *localizedTitle;
|
|
16
16
|
|
|
17
17
|
/// 本地化描述
|
|
18
|
-
@property (nonatomic, strong, readonly) NSString *localizedDescription;
|
|
18
|
+
@property (nonatomic, strong, readonly, nullable) NSString *localizedDescription;
|
|
19
19
|
|
|
20
20
|
/// 商品价格
|
|
21
21
|
/// 建议直接使用 displayPrice
|
|
22
|
-
@property(nonatomic,strong,readonly) NSDecimalNumber *price;
|
|
22
|
+
@property(nonatomic,strong,readonly, nullable) NSDecimalNumber *price;
|
|
23
23
|
|
|
24
24
|
/// 价格符号
|
|
25
25
|
/// 建议直接使用 displayPrice
|
|
26
|
-
@property (nonatomic, strong, readonly) NSString *currencySymbol;
|
|
26
|
+
@property (nonatomic, strong, readonly, nullable) NSString *currencySymbol;
|
|
27
27
|
|
|
28
28
|
/// 价格代码
|
|
29
29
|
/// 建议直接使用 displayPrice
|
|
30
|
-
@property (nonatomic, strong, readonly) NSString *currencyCode;
|
|
30
|
+
@property (nonatomic, strong, readonly, nullable) NSString *currencyCode;
|
|
31
31
|
|
|
32
32
|
/// 价格本地化信息
|
|
33
33
|
/// 建议直接使用 displayPrice
|
|
34
|
-
@property(nonatomic,strong,readonly) NSLocale *priceLocale;
|
|
34
|
+
@property(nonatomic,strong,readonly, nullable) NSLocale *priceLocale;
|
|
35
35
|
|
|
36
36
|
- (nonnull XDGProductInfo *)initWithProductId:(nonnull NSString *)productId
|
|
37
37
|
price:(nonnull NSDecimalNumber *)price
|
|
@@ -39,6 +39,9 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
39
39
|
localizedTitle:(nonnull NSString *)localizedTitle
|
|
40
40
|
localizedDescription:(nonnull NSString *)localizedDescription;
|
|
41
41
|
|
|
42
|
+
- (nonnull XDGProductInfo *)initWithProductId:(nonnull NSString *)productId
|
|
43
|
+
displayPrice:(nonnull NSString *)displayPrice;
|
|
44
|
+
|
|
42
45
|
- (NSDictionary *)toDictionary;
|
|
43
46
|
|
|
44
47
|
@end
|
|
@@ -0,0 +1,360 @@
|
|
|
1
|
+
#if 0
|
|
2
|
+
#elif defined(__arm64__) && __arm64__
|
|
3
|
+
// Generated by Apple Swift version 6.2.1 effective-5.10 (swiftlang-6.2.1.4.8 clang-1700.4.4.1)
|
|
4
|
+
#ifndef XDPAYMENTSDK_SWIFT_H
|
|
5
|
+
#define XDPAYMENTSDK_SWIFT_H
|
|
6
|
+
#pragma clang diagnostic push
|
|
7
|
+
#pragma clang diagnostic ignored "-Wgcc-compat"
|
|
8
|
+
|
|
9
|
+
#if !defined(__has_include)
|
|
10
|
+
# define __has_include(x) 0
|
|
11
|
+
#endif
|
|
12
|
+
#if !defined(__has_attribute)
|
|
13
|
+
# define __has_attribute(x) 0
|
|
14
|
+
#endif
|
|
15
|
+
#if !defined(__has_feature)
|
|
16
|
+
# define __has_feature(x) 0
|
|
17
|
+
#endif
|
|
18
|
+
#if !defined(__has_warning)
|
|
19
|
+
# define __has_warning(x) 0
|
|
20
|
+
#endif
|
|
21
|
+
|
|
22
|
+
#if __has_include(<swift/objc-prologue.h>)
|
|
23
|
+
# include <swift/objc-prologue.h>
|
|
24
|
+
#endif
|
|
25
|
+
|
|
26
|
+
#pragma clang diagnostic ignored "-Wauto-import"
|
|
27
|
+
#if defined(__OBJC__)
|
|
28
|
+
#include <Foundation/Foundation.h>
|
|
29
|
+
#endif
|
|
30
|
+
#if defined(__cplusplus)
|
|
31
|
+
#include <cstdint>
|
|
32
|
+
#include <cstddef>
|
|
33
|
+
#include <cstdbool>
|
|
34
|
+
#include <cstring>
|
|
35
|
+
#include <stdlib.h>
|
|
36
|
+
#include <new>
|
|
37
|
+
#include <type_traits>
|
|
38
|
+
#else
|
|
39
|
+
#include <stdint.h>
|
|
40
|
+
#include <stddef.h>
|
|
41
|
+
#include <stdbool.h>
|
|
42
|
+
#include <string.h>
|
|
43
|
+
#endif
|
|
44
|
+
#if defined(__cplusplus)
|
|
45
|
+
#pragma clang diagnostic push
|
|
46
|
+
#pragma clang diagnostic ignored "-Wnon-modular-include-in-framework-module"
|
|
47
|
+
#if defined(__arm64e__) && __has_include(<ptrauth.h>)
|
|
48
|
+
# include <ptrauth.h>
|
|
49
|
+
#else
|
|
50
|
+
#pragma clang diagnostic push
|
|
51
|
+
#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
|
|
52
|
+
# ifndef __ptrauth_swift_value_witness_function_pointer
|
|
53
|
+
# define __ptrauth_swift_value_witness_function_pointer(x)
|
|
54
|
+
# endif
|
|
55
|
+
# ifndef __ptrauth_swift_class_method_pointer
|
|
56
|
+
# define __ptrauth_swift_class_method_pointer(x)
|
|
57
|
+
# endif
|
|
58
|
+
#pragma clang diagnostic pop
|
|
59
|
+
#endif
|
|
60
|
+
#pragma clang diagnostic pop
|
|
61
|
+
#endif
|
|
62
|
+
|
|
63
|
+
#if !defined(SWIFT_TYPEDEFS)
|
|
64
|
+
# define SWIFT_TYPEDEFS 1
|
|
65
|
+
# if __has_include(<uchar.h>)
|
|
66
|
+
# include <uchar.h>
|
|
67
|
+
# elif !defined(__cplusplus)
|
|
68
|
+
typedef unsigned char char8_t;
|
|
69
|
+
typedef uint_least16_t char16_t;
|
|
70
|
+
typedef uint_least32_t char32_t;
|
|
71
|
+
# endif
|
|
72
|
+
typedef float swift_float2 __attribute__((__ext_vector_type__(2)));
|
|
73
|
+
typedef float swift_float3 __attribute__((__ext_vector_type__(3)));
|
|
74
|
+
typedef float swift_float4 __attribute__((__ext_vector_type__(4)));
|
|
75
|
+
typedef double swift_double2 __attribute__((__ext_vector_type__(2)));
|
|
76
|
+
typedef double swift_double3 __attribute__((__ext_vector_type__(3)));
|
|
77
|
+
typedef double swift_double4 __attribute__((__ext_vector_type__(4)));
|
|
78
|
+
typedef int swift_int2 __attribute__((__ext_vector_type__(2)));
|
|
79
|
+
typedef int swift_int3 __attribute__((__ext_vector_type__(3)));
|
|
80
|
+
typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
|
|
81
|
+
typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2)));
|
|
82
|
+
typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3)));
|
|
83
|
+
typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
|
|
84
|
+
#endif
|
|
85
|
+
|
|
86
|
+
#if !defined(SWIFT_PASTE)
|
|
87
|
+
# define SWIFT_PASTE_HELPER(x, y) x##y
|
|
88
|
+
# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
|
|
89
|
+
#endif
|
|
90
|
+
#if !defined(SWIFT_METATYPE)
|
|
91
|
+
# define SWIFT_METATYPE(X) Class
|
|
92
|
+
#endif
|
|
93
|
+
#if !defined(SWIFT_CLASS_PROPERTY)
|
|
94
|
+
# if __has_feature(objc_class_property)
|
|
95
|
+
# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
|
|
96
|
+
# else
|
|
97
|
+
# define SWIFT_CLASS_PROPERTY(...)
|
|
98
|
+
# endif
|
|
99
|
+
#endif
|
|
100
|
+
#if !defined(SWIFT_RUNTIME_NAME)
|
|
101
|
+
# if __has_attribute(objc_runtime_name)
|
|
102
|
+
# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
|
|
103
|
+
# else
|
|
104
|
+
# define SWIFT_RUNTIME_NAME(X)
|
|
105
|
+
# endif
|
|
106
|
+
#endif
|
|
107
|
+
#if !defined(SWIFT_COMPILE_NAME)
|
|
108
|
+
# if __has_attribute(swift_name)
|
|
109
|
+
# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
|
|
110
|
+
# else
|
|
111
|
+
# define SWIFT_COMPILE_NAME(X)
|
|
112
|
+
# endif
|
|
113
|
+
#endif
|
|
114
|
+
#if !defined(SWIFT_METHOD_FAMILY)
|
|
115
|
+
# if __has_attribute(objc_method_family)
|
|
116
|
+
# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
|
|
117
|
+
# else
|
|
118
|
+
# define SWIFT_METHOD_FAMILY(X)
|
|
119
|
+
# endif
|
|
120
|
+
#endif
|
|
121
|
+
#if !defined(SWIFT_NOESCAPE)
|
|
122
|
+
# if __has_attribute(noescape)
|
|
123
|
+
# define SWIFT_NOESCAPE __attribute__((noescape))
|
|
124
|
+
# else
|
|
125
|
+
# define SWIFT_NOESCAPE
|
|
126
|
+
# endif
|
|
127
|
+
#endif
|
|
128
|
+
#if !defined(SWIFT_RELEASES_ARGUMENT)
|
|
129
|
+
# if __has_attribute(ns_consumed)
|
|
130
|
+
# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
|
|
131
|
+
# else
|
|
132
|
+
# define SWIFT_RELEASES_ARGUMENT
|
|
133
|
+
# endif
|
|
134
|
+
#endif
|
|
135
|
+
#if !defined(SWIFT_WARN_UNUSED_RESULT)
|
|
136
|
+
# if __has_attribute(warn_unused_result)
|
|
137
|
+
# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
|
|
138
|
+
# else
|
|
139
|
+
# define SWIFT_WARN_UNUSED_RESULT
|
|
140
|
+
# endif
|
|
141
|
+
#endif
|
|
142
|
+
#if !defined(SWIFT_NORETURN)
|
|
143
|
+
# if __has_attribute(noreturn)
|
|
144
|
+
# define SWIFT_NORETURN __attribute__((noreturn))
|
|
145
|
+
# else
|
|
146
|
+
# define SWIFT_NORETURN
|
|
147
|
+
# endif
|
|
148
|
+
#endif
|
|
149
|
+
#if !defined(SWIFT_CLASS_EXTRA)
|
|
150
|
+
# define SWIFT_CLASS_EXTRA
|
|
151
|
+
#endif
|
|
152
|
+
#if !defined(SWIFT_PROTOCOL_EXTRA)
|
|
153
|
+
# define SWIFT_PROTOCOL_EXTRA
|
|
154
|
+
#endif
|
|
155
|
+
#if !defined(SWIFT_ENUM_EXTRA)
|
|
156
|
+
# define SWIFT_ENUM_EXTRA
|
|
157
|
+
#endif
|
|
158
|
+
#if !defined(SWIFT_CLASS)
|
|
159
|
+
# if __has_attribute(objc_subclassing_restricted)
|
|
160
|
+
# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
|
|
161
|
+
# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
|
|
162
|
+
# else
|
|
163
|
+
# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
|
|
164
|
+
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
|
|
165
|
+
# endif
|
|
166
|
+
#endif
|
|
167
|
+
#if !defined(SWIFT_RESILIENT_CLASS)
|
|
168
|
+
# if __has_attribute(objc_class_stub)
|
|
169
|
+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
|
|
170
|
+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
|
|
171
|
+
# else
|
|
172
|
+
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
|
|
173
|
+
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
|
|
174
|
+
# endif
|
|
175
|
+
#endif
|
|
176
|
+
#if !defined(SWIFT_PROTOCOL)
|
|
177
|
+
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
|
|
178
|
+
# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
|
|
179
|
+
#endif
|
|
180
|
+
#if !defined(SWIFT_EXTENSION)
|
|
181
|
+
# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
|
|
182
|
+
#endif
|
|
183
|
+
#if !defined(OBJC_DESIGNATED_INITIALIZER)
|
|
184
|
+
# if __has_attribute(objc_designated_initializer)
|
|
185
|
+
# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
|
|
186
|
+
# else
|
|
187
|
+
# define OBJC_DESIGNATED_INITIALIZER
|
|
188
|
+
# endif
|
|
189
|
+
#endif
|
|
190
|
+
#if !defined(SWIFT_ENUM_ATTR)
|
|
191
|
+
# if __has_attribute(enum_extensibility)
|
|
192
|
+
# define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
|
|
193
|
+
# else
|
|
194
|
+
# define SWIFT_ENUM_ATTR(_extensibility)
|
|
195
|
+
# endif
|
|
196
|
+
#endif
|
|
197
|
+
#if !defined(SWIFT_ENUM)
|
|
198
|
+
# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
|
|
199
|
+
# if __has_feature(generalized_swift_name)
|
|
200
|
+
# 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
|
|
201
|
+
# else
|
|
202
|
+
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
|
|
203
|
+
# endif
|
|
204
|
+
#endif
|
|
205
|
+
#if !defined(SWIFT_UNAVAILABLE)
|
|
206
|
+
# define SWIFT_UNAVAILABLE __attribute__((unavailable))
|
|
207
|
+
#endif
|
|
208
|
+
#if !defined(SWIFT_UNAVAILABLE_MSG)
|
|
209
|
+
# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
|
|
210
|
+
#endif
|
|
211
|
+
#if !defined(SWIFT_AVAILABILITY)
|
|
212
|
+
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
|
|
213
|
+
#endif
|
|
214
|
+
#if !defined(SWIFT_WEAK_IMPORT)
|
|
215
|
+
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
|
|
216
|
+
#endif
|
|
217
|
+
#if !defined(SWIFT_DEPRECATED)
|
|
218
|
+
# define SWIFT_DEPRECATED __attribute__((deprecated))
|
|
219
|
+
#endif
|
|
220
|
+
#if !defined(SWIFT_DEPRECATED_MSG)
|
|
221
|
+
# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
|
|
222
|
+
#endif
|
|
223
|
+
#if !defined(SWIFT_DEPRECATED_OBJC)
|
|
224
|
+
# if __has_feature(attribute_diagnose_if_objc)
|
|
225
|
+
# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
|
|
226
|
+
# else
|
|
227
|
+
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
|
|
228
|
+
# endif
|
|
229
|
+
#endif
|
|
230
|
+
#if defined(__OBJC__)
|
|
231
|
+
#if !defined(IBSegueAction)
|
|
232
|
+
# define IBSegueAction
|
|
233
|
+
#endif
|
|
234
|
+
#endif
|
|
235
|
+
#if !defined(SWIFT_EXTERN)
|
|
236
|
+
# if defined(__cplusplus)
|
|
237
|
+
# define SWIFT_EXTERN extern "C"
|
|
238
|
+
# else
|
|
239
|
+
# define SWIFT_EXTERN extern
|
|
240
|
+
# endif
|
|
241
|
+
#endif
|
|
242
|
+
#if !defined(SWIFT_CALL)
|
|
243
|
+
# define SWIFT_CALL __attribute__((swiftcall))
|
|
244
|
+
#endif
|
|
245
|
+
#if !defined(SWIFT_INDIRECT_RESULT)
|
|
246
|
+
# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
|
|
247
|
+
#endif
|
|
248
|
+
#if !defined(SWIFT_CONTEXT)
|
|
249
|
+
# define SWIFT_CONTEXT __attribute__((swift_context))
|
|
250
|
+
#endif
|
|
251
|
+
#if !defined(SWIFT_ERROR_RESULT)
|
|
252
|
+
# define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
|
|
253
|
+
#endif
|
|
254
|
+
#if defined(__cplusplus)
|
|
255
|
+
# define SWIFT_NOEXCEPT noexcept
|
|
256
|
+
#else
|
|
257
|
+
# define SWIFT_NOEXCEPT
|
|
258
|
+
#endif
|
|
259
|
+
#if !defined(SWIFT_C_INLINE_THUNK)
|
|
260
|
+
# if __has_attribute(always_inline)
|
|
261
|
+
# if __has_attribute(nodebug)
|
|
262
|
+
# define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline)) __attribute__((nodebug))
|
|
263
|
+
# else
|
|
264
|
+
# define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline))
|
|
265
|
+
# endif
|
|
266
|
+
# else
|
|
267
|
+
# define SWIFT_C_INLINE_THUNK inline
|
|
268
|
+
# endif
|
|
269
|
+
#endif
|
|
270
|
+
#if defined(_WIN32)
|
|
271
|
+
#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
|
|
272
|
+
# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
|
|
273
|
+
#endif
|
|
274
|
+
#else
|
|
275
|
+
#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
|
|
276
|
+
# define SWIFT_IMPORT_STDLIB_SYMBOL
|
|
277
|
+
#endif
|
|
278
|
+
#endif
|
|
279
|
+
#if defined(__OBJC__)
|
|
280
|
+
#if __has_feature(objc_modules)
|
|
281
|
+
#if __has_warning("-Watimport-in-framework-header")
|
|
282
|
+
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
|
|
283
|
+
#endif
|
|
284
|
+
@import ObjectiveC;
|
|
285
|
+
#endif
|
|
286
|
+
|
|
287
|
+
#endif
|
|
288
|
+
#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
|
|
289
|
+
#pragma clang diagnostic ignored "-Wduplicate-method-arg"
|
|
290
|
+
#if __has_warning("-Wpragma-clang-attribute")
|
|
291
|
+
# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
|
|
292
|
+
#endif
|
|
293
|
+
#pragma clang diagnostic ignored "-Wunknown-pragmas"
|
|
294
|
+
#pragma clang diagnostic ignored "-Wnullability"
|
|
295
|
+
#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
|
|
296
|
+
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
|
|
297
|
+
|
|
298
|
+
#if __has_attribute(external_source_symbol)
|
|
299
|
+
# pragma push_macro("any")
|
|
300
|
+
# undef any
|
|
301
|
+
# 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))
|
|
302
|
+
# pragma pop_macro("any")
|
|
303
|
+
#endif
|
|
304
|
+
|
|
305
|
+
#if defined(__OBJC__)
|
|
306
|
+
|
|
307
|
+
@class NSArray;
|
|
308
|
+
@class NSError;
|
|
309
|
+
@class XDGPaymentParams;
|
|
310
|
+
@class XDGOrderInfo;
|
|
311
|
+
/// Objective-C 桥接类,用于调用 XDGStore 并提供 OC 友好的接口
|
|
312
|
+
SWIFT_CLASS("_TtC12XDPaymentSDK14XDGStoreBridge") SWIFT_AVAILABILITY(ios,introduced=15.0.0)
|
|
313
|
+
@interface XDGStoreBridge : NSObject
|
|
314
|
+
/// 开始监听交易更新
|
|
315
|
+
+ (void)observeTransactionUpdates;
|
|
316
|
+
/// 请求商品信息 - NSArray 版本(更 OC 友好)
|
|
317
|
+
/// \param identifiers 商品标识符数组
|
|
318
|
+
///
|
|
319
|
+
/// \param completion 完成回调,返回 XDGProductInfo 数组或错误
|
|
320
|
+
///
|
|
321
|
+
+ (void)requestProductsWith:(NSArray * _Nullable)identifiers completion:(void (^ _Nonnull)(NSArray * _Nullable, NSError * _Nullable))completion;
|
|
322
|
+
/// 发起购买
|
|
323
|
+
/// <ul>
|
|
324
|
+
/// <li>
|
|
325
|
+
/// Parameters:
|
|
326
|
+
/// </li>
|
|
327
|
+
/// <li>
|
|
328
|
+
/// params: 支付参数
|
|
329
|
+
/// </li>
|
|
330
|
+
/// <li>
|
|
331
|
+
/// completion: 完成回调,返回 XDGOrderInfo 或错误
|
|
332
|
+
/// </li>
|
|
333
|
+
/// </ul>
|
|
334
|
+
+ (void)purchaseWith:(XDGPaymentParams * _Nullable)params completion:(void (^ _Nonnull)(XDGOrderInfo * _Nullable, NSError * _Nullable))completion;
|
|
335
|
+
/// 查询未完成交易
|
|
336
|
+
/// tips: 交易数据不包含 appAccountToken 信息
|
|
337
|
+
/// \param completion 完成回调,返回 XDGPendingPurchase 数组
|
|
338
|
+
///
|
|
339
|
+
+ (void)queryPendingPurchasesWithCompletion:(void (^ _Nonnull)(NSArray * _Nullable))completion;
|
|
340
|
+
/// 处理未完成交易
|
|
341
|
+
/// \param params 支付参数
|
|
342
|
+
///
|
|
343
|
+
/// \param completion 完成回调,返回 XDGOrderInfo 或错误
|
|
344
|
+
///
|
|
345
|
+
+ (void)handlePendingPurchaseWith:(XDGPaymentParams * _Nullable)params completion:(void (^ _Nonnull)(XDGOrderInfo * _Nullable, NSError * _Nullable))completion;
|
|
346
|
+
- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
|
|
347
|
+
@end
|
|
348
|
+
|
|
349
|
+
#endif
|
|
350
|
+
#if __has_attribute(external_source_symbol)
|
|
351
|
+
# pragma clang attribute pop
|
|
352
|
+
#endif
|
|
353
|
+
#if defined(__cplusplus)
|
|
354
|
+
#endif
|
|
355
|
+
#pragma clang diagnostic pop
|
|
356
|
+
#endif
|
|
357
|
+
|
|
358
|
+
#else
|
|
359
|
+
#error unsupported Swift architecture
|
|
360
|
+
#endif
|
|
Binary file
|
|
Binary file
|
package/Plugins/iOS/XDPaymentSDK.framework/Modules/XDPaymentSDK.swiftmodule/arm64-apple-ios.swiftdoc
ADDED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -67,9 +67,9 @@ namespace XD.SDK.Payment.Internal.Standalone
|
|
|
67
67
|
{
|
|
68
68
|
string eventId = "sdkcharge_order_request";
|
|
69
69
|
Dictionary<string, string> data = GetPaymentModuleCommonProperties(eventId);
|
|
70
|
-
if (
|
|
70
|
+
if (SteamUtils.IsSDKSupported)
|
|
71
71
|
{
|
|
72
|
-
data["pick_country"] =
|
|
72
|
+
data["pick_country"] = SteamUtils.Instance.GetSteamCountry();
|
|
73
73
|
}
|
|
74
74
|
CommonAliyunTrack.LogEventAsync(eventId, data);
|
|
75
75
|
}
|
|
@@ -125,7 +125,7 @@ namespace XD.SDK.Payment.Internal.Standalone
|
|
|
125
125
|
{
|
|
126
126
|
CreateOrderResult createOrderResult = await CreateSteamOrder(productId, serverId, roldId, orderId, ext);
|
|
127
127
|
|
|
128
|
-
string microTxn = await
|
|
128
|
+
string microTxn = await SteamUtils.Instance.GetMicroTxn(createOrderResult.TradeNo);
|
|
129
129
|
AliyunTrack.ReceiveSteamOrder(createOrderResult.TradeNo.ToString());
|
|
130
130
|
await ReportSteamOrder(productId, createOrderResult.TradeNo, microTxn);
|
|
131
131
|
}
|
|
@@ -143,8 +143,8 @@ namespace XD.SDK.Payment.Internal.Standalone
|
|
|
143
143
|
AliyunTrack.CreateOrder();
|
|
144
144
|
try
|
|
145
145
|
{
|
|
146
|
-
string steamId =
|
|
147
|
-
string steamLanguage =
|
|
146
|
+
string steamId = SteamUtils.Instance.GetSteamId();
|
|
147
|
+
string steamLanguage = SteamUtils.Instance.GetSteamLanguage();
|
|
148
148
|
Dictionary<string, object> data = new Dictionary<string, object>
|
|
149
149
|
{
|
|
150
150
|
{ "productId", productId },
|
|
@@ -234,9 +234,9 @@ namespace XD.SDK.Payment.Internal.Standalone
|
|
|
234
234
|
{ "skus", string.Join(",", productIds) }
|
|
235
235
|
};
|
|
236
236
|
var url = XDG_QUERY_PRODUCTS_V2;
|
|
237
|
-
if (
|
|
237
|
+
if (SteamUtils.IsSDKSupported)
|
|
238
238
|
{
|
|
239
|
-
queryParams.Add("steamId",
|
|
239
|
+
queryParams.Add("steamId", SteamUtils.Instance.GetSteamId());
|
|
240
240
|
url = XDG_QUERY_PRODUCTS;
|
|
241
241
|
}
|
|
242
242
|
var response = await XDHttpClient.Client.GetAsync<QueryProductsResponse>(url,
|
|
@@ -82,7 +82,7 @@ namespace XD.SDK.Payment.Internal.Standalone
|
|
|
82
82
|
|
|
83
83
|
try
|
|
84
84
|
{
|
|
85
|
-
if (
|
|
85
|
+
if (SteamUtils.IsSDKSupported)
|
|
86
86
|
{
|
|
87
87
|
await PayModule.PayWithSteam(paymentParams.ProductId, paymentParams.ServerId, paymentParams.RoleId,
|
|
88
88
|
paymentParams.GameOrderId,
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "com.xd.sdk.payment",
|
|
3
3
|
"displayName": "XDGSDK Payment",
|
|
4
|
-
"version": "7.2.1-alpha.
|
|
4
|
+
"version": "7.2.1-alpha.4",
|
|
5
5
|
"description": "XDGSDK",
|
|
6
6
|
"unity": "2019.3",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"com.xd.sdk.common": "7.2.1-alpha.
|
|
9
|
+
"com.xd.sdk.common": "7.2.1-alpha.4"
|
|
10
10
|
}
|
|
11
11
|
}
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
/package/Plugins/Android/libs/{XDGPaymentUPPay_7.2.0.aar.meta → XDGPaymentUPPay_7.3.0.aar.meta}
RENAMED
|
File without changes
|
|
File without changes
|