From 56b891b2b50a493e805019147fabac796292c5d5 Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Thu, 10 Oct 2019 15:10:23 +0800
Subject: [PATCH] 1.3.0

---
 frameworks/WASdkIntf.framework/WASdkIntf                    |    0 
 frameworks/WASdkIntf.framework/Headers/WAIUser.h            |    5 +
 frameworks/WASdkIntf.framework/Headers/WAPayProxy.h         |   13 ++++
 frameworks/WASdkIntf.framework/Headers/WAChannelProduct.h   |   22 +++++++
 frameworks/WASdkIntf.framework/Headers/WASdkIntf.h          |    4 +
 frameworks/WASdkIntf.framework/Info.plist                   |    0 
 frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h   |    1 
 frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h |   38 ++++++++++++
 frameworks/WASdkIntf.framework/Headers/WAUserProxy.h        |   35 +++++++++++
 WASdkIntf_CN.podspec                                        |    2 
 frameworks/WASdkIntf.framework/Headers/WAPushProxy.h        |    2 
 frameworks/WASdkIntf.framework/Headers/WAIPay.h             |    2 
 WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec                     |   23 +++++++
 frameworks/WASdkIntf.framework/Headers/WAIPush.h            |    2 
 frameworks/WASdkIntf.framework/Headers/WACode.h             |    1 
 15 files changed, 145 insertions(+), 5 deletions(-)

diff --git a/WASdkIntf_CN.podspec b/WASdkIntf_CN.podspec
index 3027500..207a887 100644
--- a/WASdkIntf_CN.podspec
+++ b/WASdkIntf_CN.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
 s.name = 'WASdkIntf_CN'
-s.version = '1.2.1'
+s.version = '1.3.0'
 s.summary = 'WASdkIntf_CN framework in testing environment.'
 s.license = 'MIT'
 s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
diff --git a/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec b/WASdkIntf_CN/1.3.0/WASdkIntf_CN.podspec
new file mode 100644
index 0000000..207a887
--- /dev/null
+++ b/WASdkIntf_CN/1.3.0/WASdkIntf_CN.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_CN'
+s.version = '1.3.0'
+s.summary = 'WASdkIntf_CN framework in testing environment.'
+s.license = 'MIT'
+s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WASdkIntf_CN.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WASdkIntf_CN.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
\ No newline at end of file
diff --git a/frameworks/WASdkIntf.framework/Headers/WAChannelProduct.h b/frameworks/WASdkIntf.framework/Headers/WAChannelProduct.h
new file mode 100644
index 0000000..11b2978
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAChannelProduct.h
@@ -0,0 +1,22 @@
+//
+//  WAChannelProduct.h
+//  WASdkIntf
+//
+//  Created by LPW on 2019/9/17.
+//  Copyright © 2019 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WAChannelProduct : NSObject
+@property(nonatomic, strong) NSString *channel; 		  //渠道名称
+@property(nonatomic, strong) NSString *productIdentifier; //平台商品id
+@property(nonatomic, strong) NSString *localeCurrencyCode; //当前币种code USD 、CNY
+@property(nonatomic, strong) NSString *localFormattedPrice;//格式化价格 $999.99  ¥6,498.00
+@property(nonatomic, strong) NSDecimalNumber * price ;    //价格 999.99         6498
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WACode.h b/frameworks/WASdkIntf.framework/Headers/WACode.h
index 25a1799..07cd5d3 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACode.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACode.h
@@ -41,6 +41,7 @@
     WACodeLoginPlatformClosed = 4029 ,//登录渠道已关闭
     WACodeBindAccountClosed = 4048 ,//账号绑定关闭
     WACodeUnBindAccountClosed = 4049 ,//账号解绑关闭
+    WACodeUserCenterClosed = 4059 ,//用户中心未开启
     WACodeCanNotSwitchToAnonymous = 5001 ,
     WACodeFbObjectType = 5002 ,//facebook的objectType不能为空
     WACodeFbGiftListRequestPrameterLack = 5003 ,//请求gift列表缺少appid,appSecret,objectType参数
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIPay.h b/frameworks/WASdkIntf.framework/Headers/WAIPay.h
index 3219a90..be0b470 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIPay.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIPay.h
@@ -14,6 +14,8 @@
 -(void)init4Iap;
 -(void)queryInventory:(id<WAInventoryDelegate>)delegate;
 -(void)payWithProductId:(NSString *)productId extInfo:(NSString *)extInfo delegate:(id<WAPaymentDelegate>)delegate;
+-(void)queryChannelProduct:(NSString *)channel
+			 callBackBlock:(void(^)(NSArray *channelProductsArray,NSError *error))callBackBlock;
 -(BOOL)isPayServiceAvailable;
 -(void)fetchProductInformations:(NSDictionary *)waProductIds inventoryDelegate:(id<WAInventoryDelegate>)delegate;
 - (void)checkFinishTransactions;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIPush.h b/frameworks/WASdkIntf.framework/Headers/WAIPush.h
index 64cc5fe..4d96b76 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIPush.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIPush.h
@@ -35,7 +35,7 @@
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler;
 
 // 通知的点击事件
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler;
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler;
 
 // 程序进入后台
 - (void)applicationDidEnterBackground:(UIApplication *)application;
diff --git a/frameworks/WASdkIntf.framework/Headers/WAIUser.h b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
index 8251fd5..e25dd96 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAIUser.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAIUser.h
@@ -49,4 +49,9 @@
 -(WALoginResult*)getCurrentLoginResult;
 
 -(void)didUserLogin:(void(^)(NSError* error,BOOL didLogin))block;
+
+- (void)getUserCenterNotice:(id<WAUserCenterNoticeDelegate>)delegate;
+
+- (void)showUserCenterNoticeUI:(id<WAUserCenterNoticeUIDelegate>)delegate;
+
 @end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
index 70f4edd..919db14 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAParamConfigObj.h
@@ -30,5 +30,6 @@
 @property(nonatomic) NSInteger enableUnBindAccount; // 解绑：   0-关闭，1-打开
 @property(nonatomic,copy)NSString* privacyUrl; // 用户协议url
 @property(nonatomic,copy)NSString* privacyUpdateTime; // 用户协议更新时间
+@property(nonatomic)NSInteger userCenterStatus; // 用户中心状态 0-关闭，1-打开
 
 @end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
index c7a23bc..5b5a423 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAPayProxy.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "WAIPay.h"
-@class WAIapProduct,WAIapResult;
+@class WAIapProduct,WAIapResult,WAChannelProduct;
 
 /*!
  @discussion 查询商品库存协议
@@ -60,6 +60,15 @@
  @param delegate 委托
  */
 +(void)queryInventoryWithDelegate:(id<WAInventoryDelegate>)delegate;
+
+/*!
+@abstract 查询渠道商品调用方法
+@param callBackBlock 回掉
+*/
++ (void)queryChannelProduct:(NSString *)channel
+			  callBackBlock:(void(^)(NSArray <WAChannelProduct *>*channelProductsArray,NSError *error))callBackBlock;
+
+
 /*!
  @abstract 支付某个商品
  @param productId 商品id
@@ -75,4 +84,6 @@
 
 +(void)payLog:(NSString *)logInfo;
 
+
+
 @end
diff --git a/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h b/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h
index 9a8e6e3..e2b1bb3 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAPushProxy.h
@@ -34,7 +34,7 @@
 + (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler;
 
 // 通知的点击事件
-+ (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler;
++ (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler;
 
 // 程序进入后台
 + (void)applicationDidEnterBackground:(UIApplication *)application;
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index 3f88759..b10ee02 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -25,6 +25,7 @@
 #import <WASdkIntf/WAIPay.h>
 #import <WASdkIntf/WAPayProxy.h>
 #import <WASdkIntf/WAIapProduct.h>
+#import <WASdkIntf/WAChannelProduct.h>
 #import <WASdkIntf/WAPayChannel.h>
 #import <WASdkIntf/WAIapResult.h>
 #import <WASdkIntf/WAISocial.h>
@@ -35,6 +36,7 @@
 #import <WASdkIntf/WATrackProxy.h>
 #import <WASdkIntf/WABindingResult.h>
 #import <WASdkIntf/WALoginResult.h>
+#import <WASdkIntf/WAUserCenterResult.h>
 #import <WASdkIntf/WAIUser.h>
 #import <WASdkIntf/WAUserProxy.h>
 #import <WASdkIntf/WAAccount.h>
@@ -65,4 +67,4 @@
 
 // In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
 
-//time:2018/10/26 10:38 ver:1.2.1
+//time:2019/10/09 09:15 ver:1.3.0
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h b/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h
new file mode 100644
index 0000000..8a5e5b1
--- /dev/null
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserCenterResult.h
@@ -0,0 +1,38 @@
+//
+//  WAUserCenterResult.h
+//  WASdkIntf
+//
+//  Created by hank on 2019/5/8.
+//  Copyright © 2019年 GHW-T-01. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WAUserCenterResult : NSObject<NSCoding,NSCopying>
+
+/*!
+ @abstract 状态码
+ */
+@property NSInteger code;
+/*!
+ @abstract 结果描述
+ */
+@property(copy,nonatomic)NSString *msg;
+/*!
+ @abstract 用户中心文字内容
+ */
+@property(copy,nonatomic)NSString *userCenterInfo;
+/*!
+ @abstract 用户名
+ */
+@property(copy,nonatomic)NSString *userName;
+/*!
+ @abstract 初始密码
+ */
+@property(copy,nonatomic)NSString *password;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
index b8822bc..6b5269d 100644
--- a/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WAUserProxy.h
@@ -11,6 +11,7 @@
 #import "WALoginResult.h"
 #import "WABindingResult.h"
 #import "WAAccount.h"
+#import "WAUserCenterResult.h"
 #import "WAAppUser.h"
 /*!
  @discussion 登录协议
@@ -110,6 +111,36 @@
 -(void)switchAcctDidCompleteWithResult:(WALoginResult*)result;
 @end
 
+/*!
+ @discussion 用户中心
+ - - -
+ */
+@protocol WAUserCenterNoticeDelegate <NSObject>
+/*!
+ @abstract 获取用户中心数据回调接口
+ @param result 用户中心数据信息
+ */
+- (void)userCenterNoticeWithResult:(WAUserCenterResult *)result;
+
+@end
+
+/*!
+ @discussion 用户中心
+ - - -
+ */
+@protocol WAUserCenterNoticeUIDelegate <NSObject>
+/*!
+ @abstract 用户中心界面关闭回调接口
+ */
+- (void)userCenterNoticeClose;
+/*!
+ @abstract 用户中心界面错误回调接口
+ @param error 用户中心错误信息
+ */
+- (void)userCenterNoticeError:(NSError *)error;
+
+@end
+
 
 /*!
  @discussion WAUserProxy 是用户模块的代理类。功能包括设置登录流程、登录、登出、绑定、解绑、查询当前用户绑定的第三方平台账户列表、切换账号、创建账号等等。
@@ -203,6 +234,10 @@
 
 //+(NSString*)transferWithPlatform:(NSString *const)platform;
 
++ (void)getUserCenterNotice:(id<WAUserCenterNoticeDelegate>)delegate;
+
++ (void)showUserCenterNoticeUI:(id<WAUserCenterNoticeUIDelegate>)delegate;
+
 /*!
  @discussion 处理UIApplicationDelegate的方法[-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions]传递过来的参数。
  */
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index 55deff5..98c7282 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 635c654..c8c0148 100644
--- a/frameworks/WASdkIntf.framework/WASdkIntf
+++ b/frameworks/WASdkIntf.framework/WASdkIntf
Binary files differ

--
Gitblit v1.8.0