From bbf4d57fc99d4452ac7ab8c6a264bec6979c5035 Mon Sep 17 00:00:00 2001
From: lpw <812862340@qq.com>
Date: Tue, 22 Jul 2025 15:27:30 +0800
Subject: [PATCH] 提交版本 4.6.0
---
frameworks/WASdkIntf.framework/Headers/WAIUser.h | 34 ++++++++
frameworks/WASdkIntf.framework/WASdkIntf | 0
WASdkIntf/4.6.0/WASdkIntf.podspec | 23 +++++
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 53 ++++++++----
WASdkIntf.podspec | 2
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 3
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WAIAdmob.h | 10 --
frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h | 2
frameworks/WASdkIntf.framework/Headers/WAUserProxy.h | 30 +++++++
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WATrackProxy.h | 4 +
frameworks/WASdkIntf.framework/Headers/WACustomerResult.h | 40 ++++++++++
15 files changed, 169 insertions(+), 32 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index 2984095..ac24de8 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '4.5.0'
+s.version = '4.6.0'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/WASdkIntf/4.6.0/WASdkIntf.podspec b/WASdkIntf/4.6.0/WASdkIntf.podspec
new file mode 100644
index 0000000..ac24de8
--- /dev/null
+++ b/WASdkIntf/4.6.0/WASdkIntf.podspec
@@ -0,0 +1,23 @@
+#
+# Be sure to run `pod spec lint WASdkIntf.podspec' to ensure this is a
+# valid spec and to remove all comments including this before submitting the spec.
+#
+# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+s.name = 'WASdkIntf'
+s.version = '4.6.0'
+s.summary = 'WASdkIntf framework in production environment.'
+s.license = 'MIT'
+s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkIntf.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkIntf.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/WASdkIntf.framework'
+#s.resources = ['config/*.plist']
+s.requires_arc = true
+end
diff --git a/frameworks/WASdkIntf.framework/Headers/WACustomerResult.h b/frameworks/WASdkIntf.framework/Headers/WACustomerResult.h
new file mode 100644
index 0000000..46c1ab2
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WACustomerResult.h
@@ -0,0 +1,40 @@
+//
+// WACustomerResult.h
+// WASdkIntf
+//
+// Created by lpw on 2025/7/15.
+// Copyright © 2025 GHW-T-01. All rights reserved.
+// 打开聚合客服中心回调结果
+
+#import <Foundation/Foundation.h>
+#import "WALoginResult.h"
+#import "WABindingResult.h"
+NS_ASSUME_NONNULL_BEGIN
+
+
+/// 客户中心回掉类型（对应不同业务场景）
+typedef NS_ENUM(NSUInteger, WACustomerOperationType) {
+ WACustomerOperationTypeDeleteAccount, // 删除账号申请
+ WACustomerOperationTypeNewAccount, // 新建账户
+ WACustomerOperationTypeSwitchAccount, // 切换账户
+ WACustomerOperationTypeBindAccount // 绑定账号
+};
+
+
+
+
+@interface WACustomerResult : NSObject
+
+/// 操作类型（标记当前回调对应的业务）
+@property (nonatomic, assign) WACustomerOperationType operationType;
+/// 错误信息（非空表示操作失败）
+@property (nonatomic, strong) NSError *error;
+/// 账号删除状态（仅 operationType 为 DeleteAccount 时有效，对应旧接口的 status）
+@property (nonatomic, assign) NSUInteger deleteStatus;
+/// 登录结果（仅 operationType 为 NewAccount/SwitchAccount 时有效）
+@property (nonatomic, strong) WALoginResult *loginResult;
+/// 绑定结果（仅 operationType 为 BindAccount 时有效）
+@property (nonatomic, strong) WABindingResult *bindingResult;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h b/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h
index 6fb6d3f..9c6a439 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIAdmob.h
@@ -158,16 +158,6 @@
-/**
- * 获取推广任务列表
- * @param completion 完成回调，返回任务列表数组或错误信息
- * 数组元素格式为:
- * @{
- * @"taskName": @"任务名称",
- * @"taskStatus": @"0/1" // 0表示未完成，1表示已完成
- * }
- */
-- (void)fetchPromotionTasksWithCompletion:(void(^)(NSArray<NSDictionary *> * _Nullable tasks, NSError * _Nullable error))completion;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index db70293..0f50f06 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -9,7 +9,9 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <WASdkIntf/WAUserProxy.h>
-#import <WASdkIntf/WASdkIntf.h>
+
+
+
@interface WAIUser : NSObject
-(void)setLoginFlowType:(int)flowType;
-(int)getLoginFlowType;
@@ -179,4 +181,34 @@
*/
- (void)checkConsentPreferencesWithCompletion:(void (^)(NSError *error, BOOL isShow))completionBlock;
+/*!
+@discussion 打开客服中心 4.6.0增加
+ */
+
+- (void)showCustomerCenterWithCompletion:(void(^)(WACustomerResult*deleteResult))completionBlock;
+
+
+
+ /**
+ @discussion 获取任务列表 4.6.0增加
+ * 获取推广任务列表
+ * @param completeBlock 完成回调，返回任务列表数组或错误信息
+ * 数组元素格式为:
+ * @{
+ * @"taskName": @"任务名称",
+ * @"taskStatus": @"0/1" // 0表示未完成，1表示已完成
+ * }
+ */
+
+-(void)fetchPromotionTasksWithCompletion:(void(^_Nullable)(NSArray<NSDictionary *> * _Nullable tasks, NSError * _Nullable error))completeBlock;
+
+
+
+
+/*!
+@discussion 查询玩家任务完成情况 4.6.0增加
+ */
+- (void)checkPlayerTask:(void(^_Nullable)(NSError * _Nullable error, BOOL success))completeBlock;
+
+
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index 701e9f8..a8982f7 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -73,5 +73,7 @@
*/
@property(nonatomic,copy)NSString * consentNoticeId;
+//4.6.0 add
+@property(nonatomic)NSInteger iosPromotionSwitch; // iOS 互推广告开关0：关闭 1：打开
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index f8c6529..803432b 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -75,6 +75,7 @@
#import <WASdkIntf/WADeleteResult.h>
#import <WASdkIntf/WAIAdmob.h>
#import <WASdkIntf/WAAdMobProxy.h>
+#import <WASdkIntf/WACustomerResult.h>
//! Project version number for WASdkIntf.
FOUNDATION_EXPORT double WASdkIntfVersionNumber;
@@ -84,5 +85,5 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2025/06/25 12:29 ver:4.5.0
+//time:2025/0722 12:29 ver:4.6.0
// 2
diff --git a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
index c48ffa4..efa262e 100644
--- a/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WATrackProxy.h
@@ -97,6 +97,10 @@
extern NSString *const WAEventForApplePayStateChanged; //苹果支付状态改变
extern NSString *const WAEventForOrderCheckNoTransaction; //下单检测未消耗事件
+// 20250717
+extern NSString *const WAEventAdmobAd_Show; //admob 广告事件
+extern NSString *const WAEventParameterNameAdmobAdType; //admob 广告事件参数 adtype
+extern NSString *const WAEventParameterNameAdmobAdName; //admob 广告事件参数 adname
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index 3db7d3b..0e73235 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -16,6 +16,7 @@
#import <WASdkIntf/WACertificationInfo.h>
#import <WASdkIntf/WADeleteRequestModel.h>
#import <WASdkIntf/WADeleteResult.h>
+#import <WASdkIntf/WACustomerResult.h>
typedef NS_ENUM(NSInteger, OpenGameReviewState) {
OpenGameReviewStateReject=0, //游戏评价结果：不，谢谢！
@@ -481,4 +482,33 @@
+ (void)checkConsentPreferencesWithCompletion:(void (^)(NSError *error, BOOL isShow))completionBlock;
+
+
+/*!
+@discussion 客服中心弹窗
+ */
++ (void)showCustomerCenterWithCompletion:(void(^)(WACustomerResult*customerResult))block;
+
+
+
+
+/**
+ * 获取推广任务列表
+ * @param completeBlock 完成回调，返回任务列表数组或错误信息
+ * 数组元素格式为:
+ * @{
+ * @"taskName": @"任务名称",
+ * @"taskStatus": @"0/1" // 0表示未完成，1表示已完成
+ * }
+ */
++(void)fetchPromotionTasksWithCompletion:(void(^_Nullable)(NSArray<NSDictionary *> * _Nullable tasksArray, NSError * _Nullable error))completeBlock;
+
+
+
+
+/*!
+@discussion 查询玩家任务完成情况 4.6.0增加
+ */
++ (void)checkPlayerTask:(void(^_Nullable)(NSError * _Nullable error, BOOL success))completeBlock;
+
@end
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 57b2efc..264e9eb 100644
--- a/frameworks/WASdkIntf.framework/Info.plist
+++ b/frameworks/WASdkIntf.framework/Info.plist
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/WASdkIntf b/frameworks/WASdkIntf.framework/WASdkIntf
index 9000a79..0b73246 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
index 9c08018..3d53b46 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
index 50cdf3c..db7c4e3 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
index 6a2f4af..0421124 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -72,6 +72,10 @@
<data>
Bc5uZcS2ME+WIkMNcw6xSDUjMiU=
</data>
+ <key>Headers/WACustomerResult.h</key>
+ <data>
+ imaYmKgkNRJeKWJ+KRO4YSnW/RU=
+ </data>
<key>Headers/WADeleteRequestModel.h</key>
<data>
Id44Dt0yFFa6r/ptN6njtnh/sGw=
@@ -126,7 +130,7 @@
</data>
<key>Headers/WAIAdmob.h</key>
<data>
- M6fZT7s7HmdZZJBhz2mBwmH9JLw=
+ 0cN5unbl5N4QLDX3Kp3O/XkYKfs=
</data>
<key>Headers/WAIApw.h</key>
<data>
@@ -158,7 +162,7 @@
</data>
<key>Headers/WAIUser.h</key>
<data>
- OwFm7Uv1NXGieM/YFTedkNRIWiY=
+ S+pAAoouqr9mF7rOb6YT9oKJ8HY=
</data>
<key>Headers/WAIapProduct.h</key>
<data>
@@ -186,7 +190,7 @@
</data>
<key>Headers/WAParamConfigObj.h</key>
<data>
- FrukpxfPKBdCDqnBHjRUX4f+tG8=
+ muEWkslRmgeSB8iR15l1vqqSgz8=
</data>
<key>Headers/WAPayChannel.h</key>
<data>
@@ -210,7 +214,7 @@
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- QCgt7ib7Crsl4d7Y4TW8PVMtvOA=
+ +Y5IAaf74DUI8sNVDwq5u7Ct8W4=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -242,7 +246,7 @@
</data>
<key>Headers/WATrackProxy.h</key>
<data>
- dzWu92Ef+tVz1sHfUju6+8/JCS8=
+ aOp/Lnv3zUdqPX6DEO57qyUZL4Y=
</data>
<key>Headers/WATutorialCompletedEvent.h</key>
<data>
@@ -274,11 +278,11 @@
</data>
<key>Headers/WAUserProxy.h</key>
<data>
- O8SUMuT8nDgJFUspxEHStkWSD1I=
+ 2j1uOpV/wVtiBLDnFfozVBWv6bk=
</data>
<key>Info.plist</key>
<data>
- CxzmwXE2WyEi77Szz0EUej7MMsA=
+ 9mFa8oonjFtT3GguTBB/Z58Uvxw=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -474,6 +478,17 @@
58LXLJLhp6zRg5oHzSifIb7Z95lZPfSZqQCAjGH6Elo=
</data>
</dict>
+ <key>Headers/WACustomerResult.h</key>
+ <dict>
+ <key>hash</key>
+ <data>
+ imaYmKgkNRJeKWJ+KRO4YSnW/RU=
+ </data>
+ <key>hash2</key>
+ <data>
+ 7zrgGR0pRU/j+8NAJFqSB+eKkkB2+jWNy1kr+FI9PaQ=
+ </data>
+ </dict>
<key>Headers/WADeleteRequestModel.h</key>
<dict>
<key>hash</key>
@@ -621,11 +636,11 @@
<dict>
<key>hash</key>
<data>
- M6fZT7s7HmdZZJBhz2mBwmH9JLw=
+ 0cN5unbl5N4QLDX3Kp3O/XkYKfs=
</data>
<key>hash2</key>
<data>
- lF0Qmic+Ls5y7WkA6cT8go0hJQrnC9cXGXkKvwNMxRg=
+ jyi//A1M/Q0wrcB0IqdtzbnCg1xU6E8AHZsTvWqkesE=
</data>
</dict>
<key>Headers/WAIApw.h</key>
@@ -709,11 +724,11 @@
<dict>
<key>hash</key>
<data>
- OwFm7Uv1NXGieM/YFTedkNRIWiY=
+ S+pAAoouqr9mF7rOb6YT9oKJ8HY=
</data>
<key>hash2</key>
<data>
- Q4GzGuojZEIZKaa91Spas7FarnXLfxx8CgfR5Y1yc4E=
+ wNFSwAqZDoGydTiMOMALDak/ufWGkePSOQRRKP7uLUo=
</data>
</dict>
<key>Headers/WAIapProduct.h</key>
@@ -786,11 +801,11 @@
<dict>
<key>hash</key>
<data>
- FrukpxfPKBdCDqnBHjRUX4f+tG8=
+ muEWkslRmgeSB8iR15l1vqqSgz8=
</data>
<key>hash2</key>
<data>
- NSKvlJXFt4RyhTEAbGm4UaflJsdJWdQRei70rAvqHks=
+ Ti9A6lum778jU8EIGoyow0OEGSFswZpeUM4wIa+VA0A=
</data>
</dict>
<key>Headers/WAPayChannel.h</key>
@@ -852,11 +867,11 @@
<dict>
<key>hash</key>
<data>
- QCgt7ib7Crsl4d7Y4TW8PVMtvOA=
+ +Y5IAaf74DUI8sNVDwq5u7Ct8W4=
</data>
<key>hash2</key>
<data>
- bJAkedPctqLHOMgSvnhaHxlJrTrcDsWx5GL4Lj9CF3U=
+ hvV7TgqNIJvMgCQk0laNSRJXkZif7UR/EtA6YUauOtw=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
@@ -940,11 +955,11 @@
<dict>
<key>hash</key>
<data>
- dzWu92Ef+tVz1sHfUju6+8/JCS8=
+ aOp/Lnv3zUdqPX6DEO57qyUZL4Y=
</data>
<key>hash2</key>
<data>
- 5Ye3UhzUi5p//zuns2ilRmFhM9csx86wC81NkLidvrM=
+ Zas6TrFUcmqo9savhtnzHt1+S5rNNlOhjrDeAy0OhEg=
</data>
</dict>
<key>Headers/WATutorialCompletedEvent.h</key>
@@ -1028,11 +1043,11 @@
<dict>
<key>hash</key>
<data>
- O8SUMuT8nDgJFUspxEHStkWSD1I=
+ 2j1uOpV/wVtiBLDnFfozVBWv6bk=
</data>
<key>hash2</key>
<data>
- irFrP91ofnnuo65wkG176wAYeitt9EgON6Rz3T/6gTc=
+ 9IMGx/9PqTgoK988NhivzBBIg2KTOoDHip2rFNP0v9Q=
</data>
</dict>
<key>Modules/module.modulemap</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index ab44546..d2daf5c 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0