diff --git a/Demo/.DS_Store b/Demo/.DS_Store index 06e3dae402046d8d46c059e4073cfe5fa052e61d..902a35b24e234ffa5221e153368c4aa74350605d 100644 Binary files a/Demo/.DS_Store and b/Demo/.DS_Store differ diff --git a/Demo/Demo/AppDelegate.m b/Demo/Demo/AppDelegate.m index 561216af1bff61a63b1233d7044f52c92415410a..10e5e1b471a60639d920a88c5a837b10ae5360f3 100755 --- a/Demo/Demo/AppDelegate.m +++ b/Demo/Demo/AppDelegate.m @@ -12,28 +12,32 @@ //#import "ViewController.h" //#import "TabCoverViewController.h" //#import "PageViewController.h" +#if __has_include() #import +#endif @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - - if (@available(iOS 14, *)) { - // iOS14及以上版本需要先请求权限 - [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) { - - if (status == ATTrackingManagerAuthorizationStatusAuthorized) { - NSLog(@"同意授权"); - - - }else{ - NSLog(@"被拒绝，请在设置-隐私-广告中打开广告跟踪功能"); - } - }]; - } - +// #if __has_include() +// +// if (@available(iOS 14, *)) { +// // iOS14及以上版本需要先请求权限 +// [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) { +// +// if (status == ATTrackingManagerAuthorizationStatusAuthorized) { +// NSLog(@"同意授权"); +// +// +// }else{ +// NSLog(@"被拒绝，请在设置-隐私-广告中打开广告跟踪功能"); +// } +// }]; +// } +// +// #endif [[MobileTracking sharedInstance] enableLog:YES]; diff --git a/Demo/Demo/sdkconfig.xml b/Demo/Demo/sdkconfig.xml index 49858ee6423517ad9eadf24ad33d92f0910940c2..5e0dc730107d252f4f99400ed4cab1dee1a29714 100644 --- a/Demo/Demo/sdkconfig.xml +++ b/Demo/Demo/sdkconfig.xml @@ -600,6 +600,13 @@ true true + + + ATT + at + true + true + REDIRECTURL @@ -862,6 +869,27 @@ true true + + + systemVersion + e9 + true + true + + + + hwMachine + e10 + true + true + + + + deviceMemory + e11 + true + true + & diff --git a/MobileTracking/MobileTracking.xcodeproj/project.pbxproj b/MobileTracking/MobileTracking.xcodeproj/project.pbxproj index ea3fd618e763f7e49099bf1b4bcfdc0e8faecb77..13570731409841c4ccbbdc3dccd83c6b33bacbae 100755 --- a/MobileTracking/MobileTracking.xcodeproj/project.pbxproj +++ b/MobileTracking/MobileTracking.xcodeproj/project.pbxproj @@ -109,13 +109,13 @@ AFB3717A1F3854770092930F /* VAViewCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = AFB371681F3854770092930F /* VAViewCapture.m */; }; AFB3717B1F3854770092930F /* ViewabilityJSService.m in Sources */ = {isa = PBXBuildFile; fileRef = AFB3716A1F3854770092930F /* ViewabilityJSService.m */; }; AFB3717C1F3854770092930F /* ViewabilityJSService.m in Sources */ = {isa = PBXBuildFile; fileRef = AFB3716A1F3854770092930F /* ViewabilityJSService.m */; }; + C70B93102518904200001009 /* libMMASign.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C70B930F2518904200001009 /* libMMASign.xcframework */; }; + C70B93112518904200001009 /* libMMASign.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C70B930F2518904200001009 /* libMMASign.xcframework */; }; C733D3E524A9C73F002F137E /* MMA_IVTInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = C733D3E424A9C73F002F137E /* MMA_IVTInfoService.m */; }; C733D3E624A9C73F002F137E /* MMA_IVTInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = C733D3E424A9C73F002F137E /* MMA_IVTInfoService.m */; }; C765ABE023262B660066E906 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C765ABDF23262B660066E906 /* WebKit.framework */; }; C765ABE123262B710066E906 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C765ABDF23262B660066E906 /* WebKit.framework */; }; C765ABE223262C040066E906 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C765ABDF23262B660066E906 /* WebKit.framework */; }; - C7A479D824FF451F00EB56F3 /* libMMASign.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7A479D724FF451F00EB56F3 /* libMMASign.xcframework */; }; - C7A479D924FF451F00EB56F3 /* libMMASign.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7A479D724FF451F00EB56F3 /* libMMASign.xcframework */; }; C7E0DA0C24BEAE2B003D19F4 /* MMA_TrackingInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A79BC1E18D2DC2900FC62C1 /* MMA_TrackingInfoService.m */; }; /* End PBXBuildFile section */ @@ -242,13 +242,13 @@ AFB371681F3854770092930F /* VAViewCapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VAViewCapture.m; sourceTree = ""; }; AFB371691F3854770092930F /* ViewabilityJSService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewabilityJSService.h; sourceTree = ""; }; AFB3716A1F3854770092930F /* ViewabilityJSService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewabilityJSService.m; sourceTree = ""; }; + C70B930F2518904200001009 /* libMMASign.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = libMMASign.xcframework; sourceTree = ""; }; C733D3E324A9C73E002F137E /* MMA_IVTInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_IVTInfoService.h; sourceTree = ""; }; C733D3E424A9C73F002F137E /* MMA_IVTInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_IVTInfoService.m; sourceTree = ""; }; C74B78322375573A0031DE10 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/Photos.framework; sourceTree = DEVELOPER_DIR; }; C74B7835237557510031DE10 /* PhotosUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhotosUI.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/PhotosUI.framework; sourceTree = DEVELOPER_DIR; }; C765ABDF23262B660066E906 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; - C7A479D324FF434D00EB56F3 /* MMASign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMASign.h; sourceTree = ""; }; - C7A479D724FF451F00EB56F3 /* libMMASign.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = libMMASign.xcframework; sourceTree = ""; }; + C76DAE05250F725F00F312E7 /* MMASign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMASign.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -260,7 +260,7 @@ 2ABFE29818CF2B5F007BD457 /* CoreLocation.framework in Frameworks */, 2ABFE28218CF1778007BD457 /* UIKit.framework in Frameworks */, 2ABFE28018CF176D007BD457 /* AdSupport.framework in Frameworks */, - C7A479D824FF451F00EB56F3 /* libMMASign.xcframework in Frameworks */, + C70B93102518904200001009 /* libMMASign.xcframework in Frameworks */, 2A632A1C18CEB10B00BE2533 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -284,7 +284,7 @@ 2A81721118DAEB3A00E0EFEC /* CoreLocation.framework in Frameworks */, 2A81721218DAEB3A00E0EFEC /* UIKit.framework in Frameworks */, 2A81721318DAEB3A00E0EFEC /* AdSupport.framework in Frameworks */, - C7A479D924FF451F00EB56F3 /* libMMASign.xcframework in Frameworks */, + C70B93112518904200001009 /* libMMASign.xcframework in Frameworks */, 2A81721518DAEB3A00E0EFEC /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -375,8 +375,8 @@ 2ABFE1F118CED085007BD457 /* EncryptModule */ = { isa = PBXGroup; children = ( - C7A479D724FF451F00EB56F3 /* libMMASign.xcframework */, - C7A479D324FF434D00EB56F3 /* MMASign.h */, + C70B930F2518904200001009 /* libMMASign.xcframework */, + C76DAE05250F725F00F312E7 /* MMASign.h */, 2A632A3118CEB10B00BE2533 /* MobileTrackingTests */, ); path = EncryptModule; diff --git a/MobileTracking/MobileTracking/EncryptModule/MMASign.h b/MobileTracking/MobileTracking/EncryptModule/MMASign.h index 3b874da2b57d50498b21b08fc5ba22427713198b..0d09abc0c5f3e04f2a5536e9e91e522a1e2fc660 100644 --- a/MobileTracking/MobileTracking/EncryptModule/MMASign.h +++ b/MobileTracking/MobileTracking/EncryptModule/MMASign.h @@ -9,6 +9,6 @@ #import @interface MMASign : NSObject -+ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv; ++ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv andDeviceid:(NSString *)deviceid andBundleid:(NSString *)bundleid andModel:(NSString *)model; @end diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.a new file mode 100644 index 0000000000000000000000000000000000000000..53585af0147004a654282f605667e5b6b1449768 Binary files /dev/null and b/MobileTracking/MobileTracking/EncryptModule/libMMASign.a differ diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/Info.plist b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/Info.plist index 9041f6572c71983186a58df079dcc79151aa024f..d3faa397eff6a5392e3fbea670504a81e28dba89 100644 --- a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/Info.plist +++ b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/Info.plist @@ -8,49 +8,49 @@ HeadersPath Headers LibraryIdentifier - ios-x86_64_i386-simulator + ios-x86_64-maccatalyst LibraryPath - libMMASignSimulator.a + libMMASignMacCatalyst.a SupportedArchitectures x86_64 - i386 SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst HeadersPath Headers LibraryIdentifier - ios-x86_64-maccatalyst + ios-arm64_armv7 LibraryPath - libMMASignMacCatalyst.a + libMMASign.a SupportedArchitectures - x86_64 + arm64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - maccatalyst HeadersPath Headers LibraryIdentifier - ios-armv7_arm64 + ios-i386_x86_64-simulator LibraryPath - libMMASign.a + libMMASignSimulator.a SupportedArchitectures - armv7 - arm64 + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/Headers/MMASign.h b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/Headers/MMASign.h similarity index 70% rename from MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/Headers/MMASign.h rename to MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/Headers/MMASign.h index 3b874da2b57d50498b21b08fc5ba22427713198b..0d09abc0c5f3e04f2a5536e9e91e522a1e2fc660 100644 --- a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/Headers/MMASign.h +++ b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/Headers/MMASign.h @@ -9,6 +9,6 @@ #import @interface MMASign : NSObject -+ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv; ++ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv andDeviceid:(NSString *)deviceid andBundleid:(NSString *)bundleid andModel:(NSString *)model; @end diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/libMMASign.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/libMMASign.a new file mode 100644 index 0000000000000000000000000000000000000000..83277e476518614906baf5983611db2c152ed6a3 Binary files /dev/null and b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-arm64_armv7/libMMASign.a differ diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/libMMASign.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/libMMASign.a deleted file mode 100644 index 3257c9dd37df5d8808bb12cee8a6e18c6239615c..0000000000000000000000000000000000000000 Binary files a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-armv7_arm64/libMMASign.a and /dev/null differ diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/Headers/MMASign.h b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/Headers/MMASign.h similarity index 70% rename from MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/Headers/MMASign.h rename to MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/Headers/MMASign.h index 3b874da2b57d50498b21b08fc5ba22427713198b..0d09abc0c5f3e04f2a5536e9e91e522a1e2fc660 100644 --- a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/Headers/MMASign.h +++ b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/Headers/MMASign.h @@ -9,6 +9,6 @@ #import @interface MMASign : NSObject -+ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv; ++ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv andDeviceid:(NSString *)deviceid andBundleid:(NSString *)bundleid andModel:(NSString *)model; @end diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/libMMASignSimulator.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/libMMASignSimulator.a new file mode 100644 index 0000000000000000000000000000000000000000..94e7ff487257a536528032e2b6d7262d38b67eff Binary files /dev/null and b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-i386_x86_64-simulator/libMMASignSimulator.a differ diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/Headers/MMASign.h b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/Headers/MMASign.h index 3b874da2b57d50498b21b08fc5ba22427713198b..0d09abc0c5f3e04f2a5536e9e91e522a1e2fc660 100644 --- a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/Headers/MMASign.h +++ b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/Headers/MMASign.h @@ -9,6 +9,6 @@ #import @interface MMASign : NSObject -+ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv; ++ (NSString *)sign:(NSString *)urlString ts:(NSString *)ts sdkv:(NSString *)sdkv andDeviceid:(NSString *)deviceid andBundleid:(NSString *)bundleid andModel:(NSString *)model; @end diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/libMMASignMacCatalyst.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/libMMASignMacCatalyst.a index e6fe68e5f790266b0f340a11f0b834a5e2b147b7..66bd9a96ad8756bbcf27902b2445bf57365dd028 100644 Binary files a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/libMMASignMacCatalyst.a and b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64-maccatalyst/libMMASignMacCatalyst.a differ diff --git a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/libMMASignSimulator.a b/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/libMMASignSimulator.a deleted file mode 100644 index 3af148f31f4331ed3d94296f0b83ae194df43ad4..0000000000000000000000000000000000000000 Binary files a/MobileTracking/MobileTracking/EncryptModule/libMMASign.xcframework/ios-x86_64_i386-simulator/libMMASignSimulator.a and /dev/null differ diff --git a/MobileTracking/MobileTracking/MMA_Macro.h b/MobileTracking/MobileTracking/MMA_Macro.h index 87df39f5bd5902c71d8aa3871d958a2b04d0940a..896d8d917df37c369f5d846f85e915ca9e705a1e 100755 --- a/MobileTracking/MobileTracking/MMA_Macro.h +++ b/MobileTracking/MobileTracking/MMA_Macro.h @@ -9,7 +9,7 @@ #ifndef MobileTracking_Macro_h #define MobileTracking_Macro_h -#define MMA_SDK_VERSION @"V2.2.1" +#define MMA_SDK_VERSION @"V2.2.2" #define NOTIFICATION_VB @"viewability_notification" #define NOTIFICATION_EXPOSE @"expose_notification" @@ -62,6 +62,7 @@ #define TRACKING_KEY_ANAME @"ANAME" #define TRACKING_KEY_SDKVS @"SDKVS" #define TRACKING_KEY_SIGN @"SIGN" +#define TRACKING_KEY_ATT @"ATT" #define AD_PLACEMENT @"Adplacement" // impression 解析占位符 diff --git a/MobileTracking/MobileTracking/MobileTracking.h b/MobileTracking/MobileTracking/MobileTracking.h index ade9fe63397140009693a89e7d51f40b31eac9a2..80746dec80a51705292735b1bf89715c1bd6eb43 100755 --- a/MobileTracking/MobileTracking/MobileTracking.h +++ b/MobileTracking/MobileTracking/MobileTracking.h @@ -6,7 +6,7 @@ // Copyright (c) 2014年 Admaster. All rights reserved. // -//#define MMA_SDK_VERSION @"V2.2.1" +//#define MMA_SDK_VERSION @"V2.2.2" #import diff --git a/MobileTracking/MobileTracking/MobileTracking.m b/MobileTracking/MobileTracking/MobileTracking.m index 0afdc532100803ced6c21c6982885ff1ce9794c4..c8e33051806f84830309d24c4d07ff94593bb22b 100755 --- a/MobileTracking/MobileTracking/MobileTracking.m +++ b/MobileTracking/MobileTracking/MobileTracking.m @@ -1022,7 +1022,9 @@ { @try { NSString *trackURL = [self generateTrackingURL:url]; -// MMA_Task *task = [[MMA_Task alloc] init]; + if (!task) { + task = [[MMA_Task alloc] init]; + } task.url = trackURL; task.timePoint = [[[NSDate alloc] init] timeIntervalSince1970]; task.failedCount = 0; @@ -1182,6 +1184,9 @@ } else if ([argument.key isEqualToString:TRACKING_KEY_SDKVS]) { [trackURL appendFormat:@"%@%@%@%@", company.separator, queryArgsKey, company.equalizer, MMA_SDK_VERSION]; + }else if ([argument.key isEqualToString:TRACKING_KEY_ATT]) { + + [trackURL appendFormat:@"%@%@%@%@", company.separator, queryArgsKey, company.equalizer, self.trackingInfoService.att]; } } @@ -1229,7 +1234,7 @@ } @catch (NSException *exception) { - str = @"\"-\""; + str = @"-"; } @finally { } @@ -1243,7 +1248,7 @@ } - reWriteString = [reWriteString stringByAppendingFormat :@"\"%@\":%@", value, str?str:@"\"-\""]; + reWriteString = [reWriteString stringByAppendingFormat :@"\"%@\":\"%@\"", value, str?str:@"\"-\""]; @@ -1276,7 +1281,7 @@ } // 添加签名加密模块 - NSString *signString = [MMASign sign:trackURL ts:ts sdkv:MMA_SDK_VERSION]; + NSString *signString = [MMASign sign:trackURL ts:ts sdkv:MMA_SDK_VERSION andDeviceid:self.trackingInfoService.idfa andBundleid:self.trackingInfoService.appKey andModel:self.trackingInfoService.term]; [MMA_Log log:@"signString: %@" ,signString]; [trackURL appendFormat:@"%@%@%@%@", company.separator, company.signature.paramKey, company.equalizer, signString]; diff --git a/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.h b/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.h index 29e441ba40391d030fc0120d8fb0c7a1d555fb8b..73f862dcbfc3a9e30e983e2be773aa6982512d22 100644 --- a/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.h +++ b/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.h @@ -38,7 +38,14 @@ -(NSString *)language; /**国家编码*/ -(NSString *)countryCode; +/**系统版本号*/ +-(NSString *)systemVersion; +/**硬件名称*/ +-(NSString *)hwMachine; +/**设备内存*/ +- (NSString *)deviceMemory; + diff --git a/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.m b/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.m index 096908901cfdb38c9f8d14fd9b1662bb142349cd..ea5a14c65dc5fe1373cd8f93129c5efdba592da9 100644 --- a/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.m +++ b/MobileTracking/MobileTracking/Service/MMA_IVTInfoService.m @@ -298,7 +298,7 @@ [[NSUserDefaults standardUserDefaults] setInteger: self.lastTime forKey:SENSOR_LAST_TIME]; } -#pragma mark 新增参数8月28日 e1-e8 +#pragma mark 新增参数8月28日 e1-e11 //e1 -(NSString *)deviveName{ @try { @@ -323,14 +323,14 @@ sysctlbyname("hw.model", answer, &size, NULL, 0); NSString *results = [NSString stringWithUTF8String:answer]; free(answer); - return results; + return results?results:@"-"; } @catch (NSException *exception) { return @"-"; } } -//3 +//e3 - (NSString *)carrier{ @try { #if TARGET_IPHONE_SIMULATOR @@ -391,7 +391,7 @@ dispatch_semaphore_signal(semaphore); }); dispatch_time_t t = dispatch_time(DISPATCH_TIME_NOW, 0.5* NSEC_PER_SEC); dispatch_semaphore_wait(semaphore, t); - return [carr copy]; + return [carr copy]?[carr copy]:@"-"; #endif @@ -457,7 +457,7 @@ result = [NSString stringWithFormat:@"%f",[dataDate timeIntervalSince1970]]; } } - return result; + return result?result:@"-"; } @catch (NSException *exception) { return @"-"; } @@ -474,7 +474,7 @@ language = [locale objectForKey:NSLocaleLanguageCode]; } - return language; + return language?language:@"-"; } @catch (NSException *exception) { return @"-"; } @@ -485,9 +485,51 @@ @try { NSLocale *locale = [NSLocale currentLocale]; NSString *countryCode = [locale objectForKey:NSLocaleCountryCode]; - return countryCode; + return countryCode?countryCode:@"-"; } @catch (NSException *exception) { return @"-"; } } +//e9 +- (NSString *)systemVersion { + @try { + NSString * systemVersion = [[UIDevice currentDevice] systemVersion]; + return systemVersion?systemVersion:@"-"; + + } @catch (NSException *exception) { + return @"-"; + } + +} +//e10 +- (NSString *)hwMachine{ + @try { + + size_t size; + sysctlbyname("hw.machine", NULL, &size, NULL, 0); + char *answer = malloc(size); + sysctlbyname("hw.machine", answer, &size, NULL, 0); + NSString *results = [NSString stringWithUTF8String:answer]; + free(answer); + return results?results:@"-"; + + } @catch (NSException *exception) { + return @"-"; + } + +} +//e11 +- (NSString *)deviceMemory{ + @try { + + + NSString *deviceMemory = [NSString stringWithFormat:@"%llu",[NSProcessInfo processInfo].physicalMemory]; + + return deviceMemory?deviceMemory:@"-"; + + } @catch (NSException *exception) { + return @"-"; + } + +} @end diff --git a/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h index 51240d8f2d8e199abc7eec4020d2187ed46a297f..fde279ddd9c0f1458f0d013bedc9b088dbea9c5b 100755 --- a/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h +++ b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h @@ -29,4 +29,6 @@ @property (nonatomic, assign, readonly) NSInteger networkCondition; @property (nonatomic, strong, readonly) NSString *wifiSSID; @property (nonatomic, strong, readonly) NSString *wifiBSSID; + +@property (nonatomic, strong, readonly) NSString * att; @end diff --git a/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m index cd1e5256a96873eec9615b8bb9c7442cc0432e60..06e01ddae7092595b57b36e7be5e61313e08017f 100755 --- a/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m +++ b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m @@ -10,7 +10,7 @@ #import "MMA_SSNetworkInfo.h" #import -#if !TARGET_OS_MACCATALYST + #if __has_include() #import #endif @@ -57,21 +57,21 @@ { NSString *idfa = nil; -#if !TARGET_OS_MACCATALYST + if (@available(iOS 14, *)) { - - if ([ATTrackingManager trackingAuthorizationStatus] == ATTrackingManagerAuthorizationStatusAuthorized) { + #if __has_include() + if ([ATTrackingManager trackingAuthorizationStatus] == ATTrackingManagerAuthorizationStatusAuthorized||[ATTrackingManager trackingAuthorizationStatus]==ATTrackingManagerAuthorizationStatusNotDetermined) { idfa = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString]; } - +#endif } else { if ([[ASIdentifierManager sharedManager] isAdvertisingTrackingEnabled]) { idfa = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString]; } } -#endif + return idfa ? idfa : @""; } @@ -194,4 +194,40 @@ return @"00:00:00:00:00:00"; } } + +/* + * 暂时使用秒作为计算单位 + * + */ ++ (long long)timestamp { + return [[NSDate date] timeIntervalSince1970]; +} + +- (NSString *)att +{ + @try { + + + NSString *att = nil; + + + + if (@available(iOS 14, *)) { + #if __has_include() + + att = [NSString stringWithFormat:@"%lu",(unsigned long)[ATTrackingManager trackingAuthorizationStatus]]; + +#endif + } else { + + att = @""; + } + + + return att ? att : @""; + + } @catch (NSException *exception) { + + } +} @end diff --git a/MobileTracking/Viewability/UIView+MMA_Monitor.m b/MobileTracking/Viewability/UIView+MMA_Monitor.m index fdf001c521cfce52cd8a392f0b05e1dfd832ce52..f89cf5634c83555da91a09d7aa5e90ed8eee5897 100644 --- a/MobileTracking/Viewability/UIView+MMA_Monitor.m +++ b/MobileTracking/Viewability/UIView+MMA_Monitor.m @@ -125,7 +125,8 @@ /** return is super -> */ - (BOOL)mma_isSuper:(UIView *)view { - + @try { + NSArray *superviews = nil; if (!superviews) { superviews = [self mma_superviews]; @@ -139,7 +140,10 @@ return YES; - + + } @catch (NSException *exception) { + return YES; + } } - (NSArray *)mma_superviews { @@ -200,7 +204,11 @@ } - (NSString *)mma_bgcolorString { - return [self mma_stringFromColor:self.backgroundColor]; + @try { + return [self mma_stringFromColor:self.backgroundColor]; + } @catch (NSException *exception) { + + } } //颜色转string diff --git a/OutputRelease/MobileTracking.h b/OutputRelease/MobileTracking.h index ade9fe63397140009693a89e7d51f40b31eac9a2..80746dec80a51705292735b1bf89715c1bd6eb43 100755 --- a/OutputRelease/MobileTracking.h +++ b/OutputRelease/MobileTracking.h @@ -6,7 +6,7 @@ // Copyright (c) 2014年 Admaster. All rights reserved. // -//#define MMA_SDK_VERSION @"V2.2.1" +//#define MMA_SDK_VERSION @"V2.2.2" #import diff --git a/OutputRelease/libMobileTracking.a b/OutputRelease/libMobileTracking.a index aad8515b32da7d08c5b18e92e3fb5f7a027b67bf..c033937403a8364e00cb21dc1120bfae7f280ec5 100644 Binary files a/OutputRelease/libMobileTracking.a and b/OutputRelease/libMobileTracking.a differ diff --git a/OutputRelease/libMobileTracking.xcframework/Info.plist b/OutputRelease/libMobileTracking.xcframework/Info.plist index 5ec6aec5956badfcf888dc579a7a6d2108dfbf2e..a6442dbb91c7016eeb6f60f115d0f60bb16b3769 100644 --- a/OutputRelease/libMobileTracking.xcframework/Info.plist +++ b/OutputRelease/libMobileTracking.xcframework/Info.plist @@ -8,50 +8,50 @@ HeadersPath Headers LibraryIdentifier - ios-arm64_armv7_armv7s + ios-i386_x86_64-simulator LibraryPath - libMobileTracking.a + libMobileTrackingSimulator.a SupportedArchitectures - arm64 - armv7 - armv7s + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator HeadersPath Headers LibraryIdentifier - ios-i386_x86_64-simulator + ios-x86_64-maccatalyst LibraryPath - libMobileTrackingSimulator.a + libMobileTrackingMacCatalyst.a SupportedArchitectures - i386 x86_64 SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst HeadersPath Headers LibraryIdentifier - ios-x86_64-maccatalyst + ios-arm64_armv7_armv7s LibraryPath - libMobileTrackingMacCatalyst.a + libMobileTracking.a SupportedArchitectures - x86_64 + arm64 + armv7 + armv7s SupportedPlatform ios - SupportedPlatformVariant - maccatalyst CFBundlePackageType diff --git a/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/Headers/MobileTracking.h b/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/Headers/MobileTracking.h index ade9fe63397140009693a89e7d51f40b31eac9a2..80746dec80a51705292735b1bf89715c1bd6eb43 100755 --- a/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/Headers/MobileTracking.h +++ b/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/Headers/MobileTracking.h @@ -6,7 +6,7 @@ // Copyright (c) 2014年 Admaster. All rights reserved. // -//#define MMA_SDK_VERSION @"V2.2.1" +//#define MMA_SDK_VERSION @"V2.2.2" #import diff --git a/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/libMobileTracking.a b/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/libMobileTracking.a index e06e00962bb7a177f44bb32675e320e9c3b5594a..e033d5140be3a0495fe2285d1d8f40af4ae70b7f 100644 Binary files a/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/libMobileTracking.a and b/OutputRelease/libMobileTracking.xcframework/ios-arm64_armv7_armv7s/libMobileTracking.a differ diff --git a/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/Headers/MobileTracking.h b/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/Headers/MobileTracking.h index ade9fe63397140009693a89e7d51f40b31eac9a2..80746dec80a51705292735b1bf89715c1bd6eb43 100755 --- a/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/Headers/MobileTracking.h +++ b/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/Headers/MobileTracking.h @@ -6,7 +6,7 @@ // Copyright (c) 2014年 Admaster. All rights reserved. // -//#define MMA_SDK_VERSION @"V2.2.1" +//#define MMA_SDK_VERSION @"V2.2.2" #import diff --git a/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/libMobileTrackingSimulator.a b/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/libMobileTrackingSimulator.a index a317cd14f9696d0b5167db6eec59097adf778ecc..f47afa2b2500628b21c5a384d590274412c4a674 100644 Binary files a/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/libMobileTrackingSimulator.a and b/OutputRelease/libMobileTracking.xcframework/ios-i386_x86_64-simulator/libMobileTrackingSimulator.a differ diff --git a/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/Headers/MobileTracking.h b/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/Headers/MobileTracking.h index ade9fe63397140009693a89e7d51f40b31eac9a2..80746dec80a51705292735b1bf89715c1bd6eb43 100755 --- a/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/Headers/MobileTracking.h +++ b/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/Headers/MobileTracking.h @@ -6,7 +6,7 @@ // Copyright (c) 2014年 Admaster. All rights reserved. // -//#define MMA_SDK_VERSION @"V2.2.1" +//#define MMA_SDK_VERSION @"V2.2.2" #import diff --git a/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/libMobileTrackingMacCatalyst.a b/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/libMobileTrackingMacCatalyst.a index a050e430acebd9220a05681da3c82cd708dc12e6..afb8d9a9e420ae62328eef7c4ceb23b9b00516f9 100644 Binary files a/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/libMobileTrackingMacCatalyst.a and b/OutputRelease/libMobileTracking.xcframework/ios-x86_64-maccatalyst/libMobileTrackingMacCatalyst.a differ diff --git a/OutputRelease/sdkconfig.xml b/OutputRelease/sdkconfig.xml index 49858ee6423517ad9eadf24ad33d92f0910940c2..5e0dc730107d252f4f99400ed4cab1dee1a29714 100644 --- a/OutputRelease/sdkconfig.xml +++ b/OutputRelease/sdkconfig.xml @@ -600,6 +600,13 @@ true true + + + ATT + at + true + true + REDIRECTURL @@ -862,6 +869,27 @@ true true + + + systemVersion + e9 + true + true + + + + hwMachine + e10 + true + true + + + + deviceMemory + e11 + true + true + &