Authored by 朱小军

移除idfa收集

@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 #include <sys/file.h> 14 #include <sys/file.h>
15 #include <sys/socket.h> 15 #include <sys/socket.h>
16 #import <UIKit/UIKit.h> 16 #import <UIKit/UIKit.h>
17 -#import <AdSupport/AdSupport.h>  
18 #import "OpenUDID.h" 17 #import "OpenUDID.h"
19 #import "JTSHardwareInfo.h" 18 #import "JTSHardwareInfo.h"
20 #import "YHEventReport.h" 19 #import "YHEventReport.h"
@@ -66,8 +65,6 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint"; @@ -66,8 +65,6 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint";
66 65
67 //Vendor标示符 66 //Vendor标示符
68 self.ifv = [[[UIDevice currentDevice] identifierForVendor] UUIDString]; 67 self.ifv = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
69 - //广告标示符  
70 - self.ifa = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];  
71 68
72 self.mac = [YH_Device getMacAddress]; 69 self.mac = [YH_Device getMacAddress];
73 70
@@ -81,6 +78,7 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint"; @@ -81,6 +78,7 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint";
81 78
82 - (NSDictionary *)jsonDictionary 79 - (NSDictionary *)jsonDictionary
83 { 80 {
  81 +
84 return @{ 82 return @{
85 YOHOAppReportKeyJsonKeyDeviceSV : self.sv ? self.sv : @"", 83 YOHOAppReportKeyJsonKeyDeviceSV : self.sv ? self.sv : @"",
86 YOHOAppReportKeyJsonKeyDeviceAK : self.ak ? self.ak : @"", 84 YOHOAppReportKeyJsonKeyDeviceAK : self.ak ? self.ak : @"",
@@ -89,7 +87,7 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint"; @@ -89,7 +87,7 @@ static NSString *const kAppFingerPrint = @"com.yoho.appfingerprint";
89 YOHOAppReportKeyJsonKeyDeviceOSV : self.osv ? self.osv : @"", 87 YOHOAppReportKeyJsonKeyDeviceOSV : self.osv ? self.osv : @"",
90 YOHOAppReportKeyJsonKeyDeviceDM : self.dm ? self.dm : @"", 88 YOHOAppReportKeyJsonKeyDeviceDM : self.dm ? self.dm : @"",
91 YOHOAppReportKeyJsonKeyDeviceUDID : self.udid ? self.udid : @"", 89 YOHOAppReportKeyJsonKeyDeviceUDID : self.udid ? self.udid : @"",
92 - YOHOAppReportKeyJsonKeyDeviceIFA : self.ifa ? self.ifa : @"", 90 + YOHOAppReportKeyJsonKeyDeviceIFA : @"",
93 YOHOAppReportKeyJsonKeyDeviceIFV : self.ifv ? self.ifv : @"", 91 YOHOAppReportKeyJsonKeyDeviceIFV : self.ifv ? self.ifv : @"",
94 YOHOAppReportKeyJsonKeyDeviceRES : self.res ? self.res : @"", 92 YOHOAppReportKeyJsonKeyDeviceRES : self.res ? self.res : @"",
95 YOHOAppReportKeyJsonKeyDeviceMAC : self.mac ? self.mac : @"", 93 YOHOAppReportKeyJsonKeyDeviceMAC : self.mac ? self.mac : @"",
@@ -360,7 +360,7 @@ @@ -360,7 +360,7 @@
360 IsStrEmpty(appInfo.os)?@"":appInfo.os,YOHOAppReportKeyOS, 360 IsStrEmpty(appInfo.os)?@"":appInfo.os,YOHOAppReportKeyOS,
361 IsStrEmpty(appInfo.osv)?@"":appInfo.osv,YOHOAppReportKeyOSV, 361 IsStrEmpty(appInfo.osv)?@"":appInfo.osv,YOHOAppReportKeyOSV,
362 IsStrEmpty(appInfo.dm)?@"":appInfo.dm,YOHOAppReportKeyDM, 362 IsStrEmpty(appInfo.dm)?@"":appInfo.dm,YOHOAppReportKeyDM,
363 - IsStrEmpty(appInfo.idfa)?@"":appInfo.idfa,YOHOAppReportKeyIDFA, 363 +// IsStrEmpty(appInfo.idfa)?@"":appInfo.idfa,YOHOAppReportKeyIDFA,
364 nil]; 364 nil];
365 return deviceInfo; 365 return deviceInfo;
366 } 366 }
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 #import <CoreTelephony/CTCarrier.h> 14 #import <CoreTelephony/CTCarrier.h>
15 #import <CoreTelephony/CTTelephonyNetworkInfo.h> 15 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
16 #import <UIKit/UIKit.h> 16 #import <UIKit/UIKit.h>
17 -#import <AdSupport/AdSupport.h>  
18 #import "YH_EventUtil.h" 17 #import "YH_EventUtil.h"
19 #import "YHEventReport.h" 18 #import "YHEventReport.h"
20 #import "NSString+ER_URL.h" 19 #import "NSString+ER_URL.h"
@@ -35,7 +34,6 @@ @@ -35,7 +34,6 @@
35 } 34 }
36 35
37 - (void)update { 36 - (void)update {
38 - self.idfa = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString] ?: @"";  
39 self.ch = [[YHEventReport sharedInstance] channelId]; 37 self.ch = [[YHEventReport sharedInstance] channelId];
40 self.udid = [OpenUDID value]; 38 self.udid = [OpenUDID value];
41 self.os = @"iOS"; 39 self.os = @"iOS";