From 71172661cf242ba67cf68c387ce24079ead55930 Mon Sep 17 00:00:00 2001
From: hank <hank.zhang@proficientcity.com>
Date: Fri, 03 Mar 2017 12:17:03 +0800
Subject: [PATCH] 添加V1.1.2
---
WASdkImpl_CN.podspec | 4 ++--
frameworks/WACommon.framework/_CodeSignature/CodeSignature | 0
frameworks/WACommon.framework/Headers/WAHelper.h | 1 +
frameworks/WASdkImpl.framework/WASdkImpl | 0
config/wa_sdk_impl_config_winga.xml | 2 +-
frameworks/WACommon.framework/WACommon | 0
frameworks/WASdkImpl.framework/Headers/WASdkImpl.h | 2 +-
frameworks/WASdkImpl.framework/Info.plist | 0
frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 | 0
frameworks/WACommon.framework/Info.plist | 0
frameworks/WACommon.framework/_CodeSignature/CodeDirectory | 0
frameworks/WACommon.framework/_CodeSignature/CodeResources | 14 +++++++-------
frameworks/WASdkImpl.framework/Headers/WASdkTrack.h | 4 +++-
frameworks/WACommon.framework/Headers/WACommon.h | 2 +-
14 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/WASdkImpl_CN.podspec b/WASdkImpl_CN.podspec
index ca08248..9687e92 100644
--- a/WASdkImpl_CN.podspec
+++ b/WASdkImpl_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WASdkImpl_CN'
-s.version = '1.1.1'
+s.version = '1.1.2'
s.summary = 'WASdkImpl framework in production environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
@@ -21,6 +21,6 @@
s.resources = ['config/*.xml','bundle/WASDK-Resource.bundle','localizable/*.plist']
s.libraries = 'sqlite3','z'
s.requires_arc = true
-s.dependency 'WASdkIntf_CN', '~> 1.1.1' #此处添加私有库依赖
+s.dependency 'WASdkIntf_CN', '~> 1.1.2' #此处添加私有库依赖
end
\ No newline at end of file
diff --git a/config/wa_sdk_impl_config_winga.xml b/config/wa_sdk_impl_config_winga.xml
index 34b79a3..e0b862f 100644
--- a/config/wa_sdk_impl_config_winga.xml
+++ b/config/wa_sdk_impl_config_winga.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <version val="WA1.1.0"/>
+ <version val="WA1.1.2"/>
<comps>
<!-- 用户模块 -->
<comp module="USR" plaf="WINGA" mandatory="YES" value="WASdkUser" desc="WINGA用户账户"/>
diff --git a/frameworks/WACommon.framework/Headers/WACommon.h b/frameworks/WACommon.framework/Headers/WACommon.h
index 64e9086..ef4f59d 100644
--- a/frameworks/WACommon.framework/Headers/WACommon.h
+++ b/frameworks/WACommon.framework/Headers/WACommon.h
@@ -20,5 +20,5 @@
#import <WACommon/WAHttpHelper.h>
#import <WACommon/LocalizedStringUtil.h>
-//time:2016/11/29 15:30
+//time:2017/3/1 17:21
diff --git a/frameworks/WACommon.framework/Headers/WAHelper.h b/frameworks/WACommon.framework/Headers/WAHelper.h
index 3a2cb29..66fc094 100644
--- a/frameworks/WACommon.framework/Headers/WAHelper.h
+++ b/frameworks/WACommon.framework/Headers/WAHelper.h
@@ -40,6 +40,7 @@
+(void)deleteObjFromKeyChainWithKey:(NSString *const)key;
+(NSString*)getIDFV;
+(NSString*)getIDFA;
++(NSString*)getSimulateIDFA;
+(NSString*)getPreferredLanguage;
/**
* 获取本地时间
diff --git a/frameworks/WACommon.framework/Info.plist b/frameworks/WACommon.framework/Info.plist
index f75563b..49ee6ed 100644
--- a/frameworks/WACommon.framework/Info.plist
+++ b/frameworks/WACommon.framework/Info.plist
Binary files differ
diff --git a/frameworks/WACommon.framework/WACommon b/frameworks/WACommon.framework/WACommon
index b11916b..a796d20 100644
--- a/frameworks/WACommon.framework/WACommon
+++ b/frameworks/WACommon.framework/WACommon
Binary files differ
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeDirectory b/frameworks/WACommon.framework/_CodeSignature/CodeDirectory
index 5d45591..451e8b8 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeDirectory
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1 b/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1
index f47421e..fd8c189 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeResources b/frameworks/WACommon.framework/_CodeSignature/CodeResources
index 7922192..7fd312d 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeResources
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeResources
@@ -14,11 +14,11 @@
</data>
<key>Headers/WACommon.h</key>
<data>
- IlUBxUYesRZDSO+I4vJVGTKJJjc=
+ bUuJKyBgP4eQhmVzXGptWKEPIVo=
</data>
<key>Headers/WAHelper.h</key>
<data>
- d2CWdCKE/GlmA2I2ERU0xGASLdY=
+ qbZ0Inkiod98JT9MyVli6hY3ZHA=
</data>
<key>Headers/WAHttpHelper.h</key>
<data>
@@ -26,7 +26,7 @@
</data>
<key>Info.plist</key>
<data>
- IFfGJ8XP5zBdX5AGOO/U65dJDUQ=
+ g4fFo7YpHMi0XGSN8wqr7YCRfwI=
</data>
<key>Modules/module.modulemap</key>
<data>
@@ -61,22 +61,22 @@
<dict>
<key>hash</key>
<data>
- IlUBxUYesRZDSO+I4vJVGTKJJjc=
+ bUuJKyBgP4eQhmVzXGptWKEPIVo=
</data>
<key>hash2</key>
<data>
- Myr5gsDWf2hhAMDtV45EUrpiQnZTkAQCqWn0rN0tDyc=
+ /CuVXvsfHSdF9IJsEI/zdgGLzbUvit/GbfEQlf1xi7Q=
</data>
</dict>
<key>Headers/WAHelper.h</key>
<dict>
<key>hash</key>
<data>
- d2CWdCKE/GlmA2I2ERU0xGASLdY=
+ qbZ0Inkiod98JT9MyVli6hY3ZHA=
</data>
<key>hash2</key>
<data>
- S7dTpqWQN07oLBsnoJtsyoYzUre0L4L/ijH12tTGYeg=
+ aULHpnoZeaWYlQIh122wNAjdkKBOwIQ/44cPYVe3vS8=
</data>
</dict>
<key>Headers/WAHttpHelper.h</key>
diff --git a/frameworks/WACommon.framework/_CodeSignature/CodeSignature b/frameworks/WACommon.framework/_CodeSignature/CodeSignature
index 60c61f0..9d4b5e1 100644
--- a/frameworks/WACommon.framework/_CodeSignature/CodeSignature
+++ b/frameworks/WACommon.framework/_CodeSignature/CodeSignature
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
index 4d216a5..01baef3 100644
--- a/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
+++ b/frameworks/WASdkImpl.framework/Headers/WASdkImpl.h
@@ -16,4 +16,4 @@
// In this header, you should import all the public headers of your framework using statements like #import <WASdkImpl/PublicHeader.h>
-//time:2017/1/3 17:15 ver:1.1.1
+//time:2017/3/3 9:38 ver:1.1.2
diff --git a/frameworks/WASdkImpl.framework/Headers/WASdkTrack.h b/frameworks/WASdkImpl.framework/Headers/WASdkTrack.h
index 515a0d7..59fef16 100644
--- a/frameworks/WASdkImpl.framework/Headers/WASdkTrack.h
+++ b/frameworks/WASdkImpl.framework/Headers/WASdkTrack.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import <WASdkIntf/WASdkIntf.h>
-@interface WASdkTrack : WAITrack
+@interface WASdkTrack : WAITrack<NSCopying>
@property(copy,nonatomic)NSString *deviceid;
@property(copy,nonatomic)NSString *deviceType;
@property(copy,nonatomic)NSString *deviceBrand;
@@ -19,10 +19,12 @@
@property(copy,nonatomic)NSString *tz;
@property(copy,nonatomic)NSString *currencyCode;
+
@property(copy,nonatomic)NSString *userId;
@property(strong,nonatomic)NSDictionary* mapping;
@property(strong,nonatomic)NSDictionary* trackerConfig;
@property(copy,nonatomic)NSString *url;
+(WASdkTrack*)shareTracker;
++(WASdkTrack*)getNewTrackerInstance;
+(NSString*)getSessionId;
@end
diff --git a/frameworks/WASdkImpl.framework/Info.plist b/frameworks/WASdkImpl.framework/Info.plist
index 8b32cbe..6de4b43 100644
--- a/frameworks/WASdkImpl.framework/Info.plist
+++ b/frameworks/WASdkImpl.framework/Info.plist
Binary files differ
diff --git a/frameworks/WASdkImpl.framework/WASdkImpl b/frameworks/WASdkImpl.framework/WASdkImpl
index 540bee0..1f89099 100644
--- a/frameworks/WASdkImpl.framework/WASdkImpl
+++ b/frameworks/WASdkImpl.framework/WASdkImpl
Binary files differ
--
Gitblit v1.8.0