From ff1ee057c01e5b964b329aad639b55f33f514a4b Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Sat, 26 May 2018 10:09:16 +0800
Subject: [PATCH] 添加V3.6.8
---
frameworks/WASdkIntf.framework/WASdkIntf | 0
frameworks/WASdkIntf.framework/Headers/WACore.h | 2 ++
frameworks/WASdkIntf.framework/_CodeSignature/CodeResources | 26 +++++++++++++-------------
frameworks/WASdkIntf.framework/_CodeSignature/CodeDirectory | 0
WASdkIntf.podspec | 2 +-
frameworks/WASdkIntf.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WASdkIntf.framework/Headers/WASdkIntf.h | 2 +-
frameworks/WASdkIntf.framework/Info.plist | 0
frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature | 0
frameworks/WASdkIntf.framework/Headers/WALoginResult.h | 12 ++++++++++++
frameworks/WASdkIntf.framework/Headers/WACoreProxy.h | 8 ++++++++
11 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/WASdkIntf.podspec b/WASdkIntf.podspec
index fa3d45c..25ee79f 100644
--- a/WASdkIntf.podspec
+++ b/WASdkIntf.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkIntf'
-s.version = '3.6.7'
+s.version = '3.6.8'
s.summary = 'WASdkIntf framework in production environment.'
s.license = 'MIT'
s.author = { "Wuyx" => "wuyixin_gh@gamehollywood.com" }
diff --git a/frameworks/WASdkIntf.framework/Headers/WACore.h b/frameworks/WASdkIntf.framework/Headers/WACore.h
index 2a4fd6b..304beec 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACore.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACore.h
@@ -27,8 +27,10 @@
-(void)setGameUserId:(NSString*)gameUserId;
-(void)setNickName:(NSString*)nikeName;
-(void)setPuserName:(NSString *)puserName;
+-(void)setUserFlag:(NSString*)userFlag;
-(NSString*)getPuserName;
-(NSString*)getNickName;
+-(NSString*)getUserFlag;
-(void)addLogWithString:(NSString*)string;
-(void)addLogWithoutBtn:(NSString*)string;
-(NSString*)getSdkVersion;
diff --git a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
index 038377f..27bf720 100644
--- a/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
+++ b/frameworks/WASdkIntf.framework/Headers/WACoreProxy.h
@@ -118,6 +118,14 @@
*/
+(NSString*)getNickName;
/*!
+ @abstract 获取userFlag
+ */
++(void)setUserFlag:(NSString*)userFlag;
+/*!
+ @abstract 获取userFlag
+ */
++(NSString*)getUserFlag;
+/*!
@abstract 获取WA Server url
*/
+(NSString*)getWaSdkServerUrl;
diff --git a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
index 82cdff2..175ecb7 100644
--- a/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
+++ b/frameworks/WASdkIntf.framework/Headers/WALoginResult.h
@@ -70,6 +70,18 @@
*/
@property NSInteger paymentRna;
+/**!
+ @abstract 当前用户ID含义标识：
+ * 0:原账号
+ * 1:被绑账号
+ */
+@property (strong,nonatomic) NSString *userFlag;
+/**!
+ @abstract 是否被绑定用户
+ *
+ */
+@property BOOL isBindUser;
+
-(id)initWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform;
+(id)loginResultWithPUserId:(NSString*)userId pToken:(NSString*)token platform:(NSString*)platform;
@end
diff --git a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
index e185b18..9bea21f 100644
--- a/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
+++ b/frameworks/WASdkIntf.framework/Headers/WASdkIntf.h
@@ -63,4 +63,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkIntf/PublicHeader.h>
-//time:2018/4/11 14:27 ver:3.6.7
+//time:2018/5/21 15:37 ver:3.6.8
diff --git a/frameworks/WASdkIntf.framework/Info.plist b/frameworks/WASdkIntf.framework/Info.plist
index e010520..ffac24c 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 20811f9..e787def 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 566fbde..f7c8be0 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 ccd949f..0353dd6 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 3dfd561..69898d0 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeResources
@@ -50,11 +50,11 @@
</data>
<key>Headers/WACore.h</key>
<data>
- bR6FPswWVvsLhiHGECFJqyfnEsQ=
+ O7e/wvP+JVT2W8GZam+KR8ivPtM=
</data>
<key>Headers/WACoreProxy.h</key>
<data>
- ydRUzgXX9itfa1Cbt97bH2dtKs8=
+ se7dDtlw666jj4rKmqkrF450Ny0=
</data>
<key>Headers/WAError.h</key>
<data>
@@ -138,7 +138,7 @@
</data>
<key>Headers/WALoginResult.h</key>
<data>
- FIWcjNfSDvMM9LEU0emfl1cqZIc=
+ 0CU94KPLrLl2zPz4OtFnZYhd/2Y=
</data>
<key>Headers/WAParamConfigObj.h</key>
<data>
@@ -158,7 +158,7 @@
</data>
<key>Headers/WASdkIntf.h</key>
<data>
- 7bjQOUmpltp639gcQet1MjBowRs=
+ 3y/e3Vhbh0IHsVTzyLZhDhLfAa8=
</data>
<key>Headers/WAShareLinkContent.h</key>
<data>
@@ -202,7 +202,7 @@
</data>
<key>Info.plist</key>
<data>
- e2SnWx5hY0fp0ocgyAmzs/Swekk=
+ Fj6fmVVKP2Q3RYxb8BqzHQw+44Y=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -336,22 +336,22 @@
<dict>
<key>hash</key>
<data>
- bR6FPswWVvsLhiHGECFJqyfnEsQ=
+ O7e/wvP+JVT2W8GZam+KR8ivPtM=
</data>
<key>hash2</key>
<data>
- nGFf0JKkdU5az+M2UmWKNfRtfqQBJ0HxIIMTPIEiaXY=
+ j3bCNuHqNuQQo2PV2rFfx31aLS2iO9nnFPspuVZIfuI=
</data>
</dict>
<key>Headers/WACoreProxy.h</key>
<dict>
<key>hash</key>
<data>
- ydRUzgXX9itfa1Cbt97bH2dtKs8=
+ se7dDtlw666jj4rKmqkrF450Ny0=
</data>
<key>hash2</key>
<data>
- 4DT0tfqorW6QK8kI8lVH20qra8yfV25W+sst+6qBPRE=
+ Amgah4s3tXCa3MywCon2MVd5sHgfGg2QxQGUsJ9mmB8=
</data>
</dict>
<key>Headers/WAError.h</key>
@@ -578,11 +578,11 @@
<dict>
<key>hash</key>
<data>
- FIWcjNfSDvMM9LEU0emfl1cqZIc=
+ 0CU94KPLrLl2zPz4OtFnZYhd/2Y=
</data>
<key>hash2</key>
<data>
- 0ujzIlFpCins4hTEjjjYv2yDex4zKh9AG5P84pnppzk=
+ 9KmMPwVJZbPBMcjNHrUz2ZWj7PdDT9prgZ0Sy/hAW/8=
</data>
</dict>
<key>Headers/WAParamConfigObj.h</key>
@@ -633,11 +633,11 @@
<dict>
<key>hash</key>
<data>
- 7bjQOUmpltp639gcQet1MjBowRs=
+ 3y/e3Vhbh0IHsVTzyLZhDhLfAa8=
</data>
<key>hash2</key>
<data>
- EAnYL+/suhX12EFsDcufoiH3S/cbCoPC0qD00iqCYm8=
+ 2k7H39nuGbWn5eKtlqinnXI1D0eV9gc6Vb/iMNElvTY=
</data>
</dict>
<key>Headers/WAShareLinkContent.h</key>
diff --git a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
index b5fa552..0fa8bd4 100644
--- a/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WASdkIntf.framework/_CodeSignature/CodeSignature
Binary files differ
--
Gitblit v1.8.0