diff --git a/.DS_Store b/.DS_Store index d5928b0b7b78d25f316c775130292591d5d02ee0..7f6faba681beb174e70be157e75bfe481717540f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Demo/.DS_Store b/Demo/.DS_Store index 98472648735447d3d00b2d6a3cc9ef0a77f27d9b..0b1a7a0ec9c87ff5e2e4f43b550d470b78ea2878 100755 Binary files a/Demo/.DS_Store and b/Demo/.DS_Store differ diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 56f2e32576bea5ab902f29eeceb9683d43da72fa..b292ed71ee98866498226cda6a1987cedfa3a463 100755 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2A0C4E1E18D6D18700200F18 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A0C4E1D18D6D18700200F18 /* Foundation.framework */; }; - 2A0C4E2018D6D18700200F18 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A0C4E1F18D6D18700200F18 /* CoreGraphics.framework */; }; - 2A0C4E2218D6D18700200F18 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A0C4E2118D6D18700200F18 /* UIKit.framework */; }; 2A0C4E2818D6D18700200F18 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2A0C4E2618D6D18700200F18 /* InfoPlist.strings */; }; 2A0C4E2A18D6D18700200F18 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C4E2918D6D18700200F18 /* main.m */; }; 2A0C4E2E18D6D18700200F18 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C4E2D18D6D18700200F18 /* AppDelegate.m */; }; @@ -21,9 +18,9 @@ 2A0C4E4918D6D18700200F18 /* DemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0C4E4818D6D18700200F18 /* DemoTests.m */; }; AF0F01A51FF4A0430095BE0C /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AF0F01A41FF4A0430095BE0C /* ViewController.m */; }; AF16D1981F026C4000A2B28B /* ScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AF16D1971F026C4000A2B28B /* ScrollViewController.m */; }; - AF353EDA1CFC24E400969035 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF353ED91CFC24E400969035 /* CoreLocation.framework */; }; AF353EDF1CFC24FB00969035 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF353EDE1CFC24FB00969035 /* AdSupport.framework */; }; - AF353EE11CFC251C00969035 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF353EE01CFC251C00969035 /* SystemConfiguration.framework */; }; + AF4B464B218AB16400BE2F3F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF353EE01CFC251C00969035 /* SystemConfiguration.framework */; }; + AF4B464C218AB18300BE2F3F /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF353ED91CFC24E400969035 /* CoreLocation.framework */; }; AF6EA2E51EF655AD000DF811 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF6EA2E41EF655AD000DF811 /* Images.xcassets */; }; AF78E1521EFA247B0025B677 /* sdkconfig.xml in Resources */ = {isa = PBXBuildFile; fileRef = AF78E1511EFA247B0025B677 /* sdkconfig.xml */; }; AF7D89611EF655F50069A7DC /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AF7D89601EF655F50069A7DC /* Launch Screen.storyboard */; }; @@ -91,6 +88,7 @@ AF0F01A41FF4A0430095BE0C /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; AF16D1961F026C4000A2B28B /* ScrollViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollViewController.h; sourceTree = ""; }; AF16D1971F026C4000A2B28B /* ScrollViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollViewController.m; sourceTree = ""; }; + AF2DFF4021955F0300B10C3F /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; }; AF353ED91CFC24E400969035 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; AF353EDE1CFC24FB00969035 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; AF353EE01CFC251C00969035 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; @@ -105,13 +103,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + AF4B464C218AB18300BE2F3F /* CoreLocation.framework in Frameworks */, + AF4B464B218AB16400BE2F3F /* SystemConfiguration.framework in Frameworks */, AFBC6A3A1EF9578D0030508A /* libMobileTrackingSimulator.a in Frameworks */, - AF353EE11CFC251C00969035 /* SystemConfiguration.framework in Frameworks */, AF353EDF1CFC24FB00969035 /* AdSupport.framework in Frameworks */, - AF353EDA1CFC24E400969035 /* CoreLocation.framework in Frameworks */, - 2A0C4E2018D6D18700200F18 /* CoreGraphics.framework in Frameworks */, - 2A0C4E2218D6D18700200F18 /* UIKit.framework in Frameworks */, - 2A0C4E1E18D6D18700200F18 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -151,6 +146,7 @@ 2A0C4E1C18D6D18700200F18 /* Frameworks */ = { isa = PBXGroup; children = ( + AF2DFF4021955F0300B10C3F /* libxml2.tbd */, AF353EE01CFC251C00969035 /* SystemConfiguration.framework */, AF353EDE1CFC24FB00969035 /* AdSupport.framework */, AF353ED91CFC24E400969035 /* CoreLocation.framework */, @@ -269,7 +265,7 @@ ORGANIZATIONNAME = Admaster; TargetAttributes = { 2A0C4E1918D6D18700200F18 = { - DevelopmentTeam = 4E89P63KS8; + DevelopmentTeam = 44PQ7EUSW9; }; 2A0C4E3A18D6D18700200F18 = { DevelopmentTeam = 4E89P63KS8; @@ -507,9 +503,9 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - DEVELOPMENT_TEAM = 4E89P63KS8; + CODE_SIGN_IDENTITY = "iPhone Developer: Jian Wu (G946Z272GF)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jian Wu (G946Z272GF)"; + DEVELOPMENT_TEAM = 44PQ7EUSW9; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch"; HEADER_SEARCH_PATHS = ( @@ -530,7 +526,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.test.abcde; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "97e98d37-8685-4f3a-96ce-cd9d04f6286a"; - PROVISIONING_PROFILE_SPECIFIER = "com_*"; + PROVISIONING_PROFILE_SPECIFIER = Develop; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 arm64"; WRAPPER_EXTENSION = app; @@ -542,9 +538,9 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - DEVELOPMENT_TEAM = 4E89P63KS8; + CODE_SIGN_IDENTITY = "iPhone Developer: Jian Wu (G946Z272GF)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jian Wu (G946Z272GF)"; + DEVELOPMENT_TEAM = 44PQ7EUSW9; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch"; HEADER_SEARCH_PATHS = ( @@ -565,7 +561,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.test.abcde; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "97e98d37-8685-4f3a-96ce-cd9d04f6286a"; - PROVISIONING_PROFILE_SPECIFIER = "com_*"; + PROVISIONING_PROFILE_SPECIFIER = Develop; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "armv7 arm64"; WRAPPER_EXTENSION = app; diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000000000000000000000000000000000..18d981003d68d0546c4804ac2ff47dd97c6e7921 --- /dev/null +++ b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..95f4f0c238515e566c9e3a530445817348132edc Binary files /dev/null and b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/huangli.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/master.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/master.xcuserdatad/UserInterfaceState.xcuserstate index 790d483f37f3abc815c402ceee71f83e196afb4a..051c23cac07de457244d4add19c01482bdc8bd79 100644 Binary files a/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/master.xcuserdatad/UserInterfaceState.xcuserstate and b/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/master.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000000000000000000000000000000000000..fe2b45415124ec4c223006e19defd56850da95d9 --- /dev/null +++ b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000000000000000000000000000000000000..235a60061c61bef07964a93e29f1376d2f85d0ca --- /dev/null +++ b/Demo/Demo.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + Demo.xcscheme + + orderHint + 0 + + + + diff --git a/Demo/Demo.xcodeproj/xcuserdata/master.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcodeproj/xcuserdata/master.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index dbf94c07417c6f1869c1a7540e60a7a297889fcd..da120ee6e1e03d6219ec60f889395041fcfcc7a1 100644 --- a/Demo/Demo.xcodeproj/xcuserdata/master.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Demo/Demo.xcodeproj/xcuserdata/master.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -26,7 +26,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../MobileTracking/MobileTracking/Service/LocationService.m" - timestampString = "542532025.296418" + timestampString = "560745229.424101" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "52" @@ -42,7 +42,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../MobileTracking/MobileTracking/Service/LocationService.m" - timestampString = "542532039.6736211" + timestampString = "560745229.424327" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "75" @@ -58,7 +58,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../MobileTracking/MobileTracking/Service/LocationService.m" - timestampString = "542532041.047084" + timestampString = "560745229.424376" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "92" @@ -67,53 +67,5 @@ landmarkType = "7"> - - - - - - - - - - - - diff --git a/Demo/Demo/ScrollViewController.m b/Demo/Demo/ScrollViewController.m index ebfdd274772f758dbf4d41275e0853503609da71..d3847e27ea305ebf49f0e4ebc61ca2143d81aedd 100644 --- a/Demo/Demo/ScrollViewController.m +++ b/Demo/Demo/ScrollViewController.m @@ -45,7 +45,6 @@ //开始监测 [[MobileTracking sharedInstance] viewVideo:url ad:_adView videoPlayType:2]; //http://v.admaster.com.cn/i/a90981,b1899467,c2,i0,m202,8a2,8b2,h,2p,2w15,2x1101,va1,2u2,2v50,2j%5B%7B2m%3A1%2C2k%3A720.0x384.0%2C2s%3A1%2C2n%3A0%2C2d%3A234.0x543.0%2C2l%3A1%2C2t%3A1515489681571%2C2o%3A720.0x384.0%7D%2C%7B2m%3A1%2C2k%3A720.0x384.0%2C2s%3A1%2C2n%3A0%2C2d%3A234.0x543.0%2C2l%3A1%2C2t%3A1515489683670%2C2o%3A720.0x384.0%7D%5D,2f1,1g2,2h1,2gb74e7f1b98c6c3bd7cc63c8accf1fd4a - //5秒后停止监测 // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0*NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // NSLog(@"url stop concurrent:"); diff --git a/Demo/Demo/sdkconfig.xml b/Demo/Demo/sdkconfig.xml index 80e36a3e26cd0c2e1844882af1b5f9a51b6bfb13..290a7a126ef3105952195d26c9c449516ebcc681 100644 --- a/Demo/Demo/sdkconfig.xml +++ b/Demo/Demo/sdkconfig.xml @@ -445,7 +445,7 @@ raw raw - raw + md5 raw @@ -486,6 +486,12 @@ IMEI + m2 + true + true + + + RAWIMEI m3 true true diff --git "a/Demo/Demo/sdkconfig\347\232\204\345\211\257\346\234\254.xml" "b/Demo/Demo/sdkconfig\347\232\204\345\211\257\346\234\254.xml" new file mode 100644 index 0000000000000000000000000000000000000000..3ad4f871a3ae020628decd71688567f8c3c55cd8 --- /dev/null +++ "b/Demo/Demo/sdkconfig\347\232\204\345\211\257\346\234\254.xml" @@ -0,0 +1,393 @@ + + + + + + + 0 + 10 + + 30 + + + + admaster + + + admaster.com.cn + + + Z83476Hel + sign + + + false + + 259200 + + + + + + + IMEI + 0c + true + + + MAC + n + true + + + AndroidID + 0d + true + + + IDFA + z + true + + + OpenUDID + o + true + + + ODIN + 0g + true + + + DUID + 0e + true + + + IP + f + true + + + TS + t + true + + + OS + 0a + true + + + OSV + q + true + + + TERM + r + true + + + WIFI + w + true + + + SCWH + 0f + true + + + AKEY + x + true + + + ANAME + y + true + + + SIGN + 0b + true + + + SDKV + 0l + true + + + MAC_RAW + 0w + true + + + AndroidID_RAW + 0w + true + + + IDFV + 0w + true + + + ISROOT + 0w + true + + + + APMAC + 0w + true + + + APNAME + 0w + true + + + MCC + 0w + true + + + MNC + 0w + true + + + IMSI + 0w + true + + + PHONENAME + 0w + true + + + Android_MAC + 0w + true + + + FORES + 0w + true + + + LIGHT + 0w + true + + + ISOFFLINE + 0v + true + + + + , + + + + false + + + + admaster_ConversionMaster + + + fw4.me + + + Z83476Hel + sign + + + false + + 259200 + + md5 + md5 + md5 + raw + + + + + + + + OS + 0a + true + + + TS + t + true + + + MAC + n + true + + + IDFA + z + true + + + IDFAMD5 + Oj + true + + + IMEI + 0c + true + + + ANDROIDID + 0d + true + + + WIFI + w + true + + + AKEY + x + true + + + ANAME + y + true + + + + SCWH + 0f + true + + + OPENUDID + o + true + + + ODIN + 0g + true + + + TERM + r + true + + + OSVS + q + true + + + LBS + l + true + + + SDKVS + 0l + true + + + MAC_RAW + 0w + true + + + AndroidID_RAW + 0w + true + + + IDFV + 0w + true + + + ISROOT + 0w + true + + + APMAC + 0w + true + + + APNAME + 0w + true + + + MCC + 0w + true + + + MNC + 0w + true + + + IMSI + 0w + true + + + PHONENAME + 0w + true + + + Android_MAC + 0w + true + + + FORES + 0w + true + + + LIGHT + 0w + true + + + ISOFFLINE + 0v + true + + + + , + + + + false + + + + diff --git a/MobileTracking/.DS_Store b/MobileTracking/.DS_Store index 3e5cbbb0a7ee82e18d6f115d77c4e51831fa8098..7a2cf323f03f3cedbf6fdcbe293fb49ef1b1ac85 100755 Binary files a/MobileTracking/.DS_Store and b/MobileTracking/.DS_Store differ diff --git a/MobileTracking/JSViewAbility/VADeviceMessage.m b/MobileTracking/JSViewAbility/VADeviceMessage.m index 588ac1c45b36e35abd049c048d9f6006f19adf36..a8d0d0a07b286ef392b1a07f2171e7160d19bc8e 100644 --- a/MobileTracking/JSViewAbility/VADeviceMessage.m +++ b/MobileTracking/JSViewAbility/VADeviceMessage.m @@ -11,8 +11,8 @@ #import "VADeviceMessage.h" #import "MMA_Macro.h" -#import "TrackingInfoService.h" -#import "GTMNSString+URLArguments.h" +#import "MMA_TrackingInfoService.h" +#import "MMA_GTMNSString+URLArguments.h" #import "MMA_Helper.h" static NSDictionary *_device; @@ -30,7 +30,7 @@ static NSString *_locationInfo; + (NSDictionary *)deviceMessage:(BOOL)trackLocation { NSMutableDictionary *deviceMessage = [NSMutableDictionary dictionary]; - TrackingInfoService *service = [TrackingInfoService sharedInstance]; + MMA_TrackingInfoService *service = [MMA_TrackingInfoService sharedInstance]; if(!_device || !_device.count) { NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; diff --git a/MobileTracking/MobileTracking.xcodeproj/project.pbxproj b/MobileTracking/MobileTracking.xcodeproj/project.pbxproj index 21b9ed61945c1754f19f305241b9b5ff62a80fcc..427b92860649099942ffe77eb82b611a2810499d 100755 --- a/MobileTracking/MobileTracking.xcodeproj/project.pbxproj +++ b/MobileTracking/MobileTracking.xcodeproj/project.pbxproj @@ -29,22 +29,22 @@ 2A632A3018CEB10B00BE2533 /* libMobileTrackingDevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A632A1818CEB10B00BE2533 /* libMobileTrackingDevice.a */; }; 2A632A3618CEB10B00BE2533 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2A632A3418CEB10B00BE2533 /* InfoPlist.strings */; }; 2A632A3818CEB10B00BE2533 /* MobileTrackingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A632A3718CEB10B00BE2533 /* MobileTrackingTests.m */; }; - 2A79BC1F18D2DC2900FC62C1 /* TrackingInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A79BC1E18D2DC2900FC62C1 /* TrackingInfoService.m */; }; - 2A8171BE18DA91C700E0EFEC /* SSNetworkInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A8171BD18DA91C700E0EFEC /* SSNetworkInfo.m */; }; + 2A79BC1F18D2DC2900FC62C1 /* MMA_TrackingInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A79BC1E18D2DC2900FC62C1 /* MMA_TrackingInfoService.m */; }; + 2A8171BE18DA91C700E0EFEC /* MMA_SSNetworkInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A8171BD18DA91C700E0EFEC /* MMA_SSNetworkInfo.m */; }; 2A81720118DAEB3A00E0EFEC /* MobileTracking.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A632A2218CEB10B00BE2533 /* MobileTracking.m */; }; - 2A81720218DAEB3A00E0EFEC /* TrackingInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A79BC1E18D2DC2900FC62C1 /* TrackingInfoService.m */; }; - 2A81720318DAEB3A00E0EFEC /* GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE23A18CF0427007BD457 /* GDataXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 2A81720218DAEB3A00E0EFEC /* MMA_TrackingInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A79BC1E18D2DC2900FC62C1 /* MMA_TrackingInfoService.m */; }; + 2A81720318DAEB3A00E0EFEC /* MMA_GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE23A18CF0427007BD457 /* MMA_GDataXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2A81720418DAEB3A00E0EFEC /* MMA_XMLReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE28E18CF25A1007BD457 /* MMA_XMLReader.m */; }; 2A81720518DAEB3A00E0EFEC /* MMA_Helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2EE18D1B1A2007BD457 /* MMA_Helper.m */; }; 2A81720618DAEB3A00E0EFEC /* MMA_Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A618D06E79007BD457 /* MMA_Task.m */; }; 2A81720718DAEB3A00E0EFEC /* MMA_Log.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A318D0581A007BD457 /* MMA_Log.m */; }; - 2A81720818DAEB3A00E0EFEC /* SSNetworkInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A8171BD18DA91C700E0EFEC /* SSNetworkInfo.m */; }; + 2A81720818DAEB3A00E0EFEC /* MMA_SSNetworkInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A8171BD18DA91C700E0EFEC /* MMA_SSNetworkInfo.m */; }; 2A81720918DAEB3A00E0EFEC /* MMA_Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FB18CED086007BD457 /* MMA_Reachability.m */; }; 2A81720A18DAEB3A00E0EFEC /* MMA_OpenUDID.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1F718CED085007BD457 /* MMA_OpenUDID.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2A81720B18DAEB3A00E0EFEC /* MMA_SDKConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE28B18CF1EA5007BD457 /* MMA_SDKConfig.m */; }; 2A81720C18DAEB3A00E0EFEC /* MMA_TaskQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2B018D07126007BD457 /* MMA_TaskQueue.m */; }; - 2A81720D18DAEB3A00E0EFEC /* GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A018D02ED2007BD457 /* GTMNSString+URLArguments.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 2A81720F18DAEB3A00E0EFEC /* RequestQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FE18CED086007BD457 /* RequestQueue.m */; }; + 2A81720D18DAEB3A00E0EFEC /* MMA_GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A018D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 2A81720F18DAEB3A00E0EFEC /* MMA_RequestQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FE18CED086007BD457 /* MMA_RequestQueue.m */; }; 2A81721118DAEB3A00E0EFEC /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE29718CF2B5F007BD457 /* CoreLocation.framework */; }; 2A81721218DAEB3A00E0EFEC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE28118CF1778007BD457 /* UIKit.framework */; }; 2A81721318DAEB3A00E0EFEC /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE27F18CF176D007BD457 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -52,14 +52,14 @@ 2A81721718DAEB3A00E0EFEC /* MobileTracking.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 2A632A2018CEB10B00BE2533 /* MobileTracking.h */; }; 2ABFE22318CED086007BD457 /* MMA_OpenUDID.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1F718CED085007BD457 /* MMA_OpenUDID.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2ABFE22418CED086007BD457 /* MMA_Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FB18CED086007BD457 /* MMA_Reachability.m */; }; - 2ABFE22518CED086007BD457 /* RequestQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FE18CED086007BD457 /* RequestQueue.m */; }; - 2ABFE23B18CF0427007BD457 /* GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE23A18CF0427007BD457 /* GDataXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 2ABFE22518CED086007BD457 /* MMA_RequestQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE1FE18CED086007BD457 /* MMA_RequestQueue.m */; }; + 2ABFE23B18CF0427007BD457 /* MMA_GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE23A18CF0427007BD457 /* MMA_GDataXMLNode.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2ABFE28018CF176D007BD457 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE27F18CF176D007BD457 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 2ABFE28218CF1778007BD457 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE28118CF1778007BD457 /* UIKit.framework */; }; 2ABFE28C18CF1EA5007BD457 /* MMA_SDKConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE28B18CF1EA5007BD457 /* MMA_SDKConfig.m */; }; 2ABFE28F18CF25A1007BD457 /* MMA_XMLReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE28E18CF25A1007BD457 /* MMA_XMLReader.m */; }; 2ABFE29818CF2B5F007BD457 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2ABFE29718CF2B5F007BD457 /* CoreLocation.framework */; }; - 2ABFE2A118D02ED2007BD457 /* GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A018D02ED2007BD457 /* GTMNSString+URLArguments.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 2ABFE2A118D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A018D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2ABFE2A418D0581A007BD457 /* MMA_Log.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A318D0581A007BD457 /* MMA_Log.m */; }; 2ABFE2A718D06E79007BD457 /* MMA_Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2A618D06E79007BD457 /* MMA_Task.m */; }; 2ABFE2B118D07126007BD457 /* MMA_TaskQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFE2B018D07126007BD457 /* MMA_TaskQueue.m */; }; @@ -86,8 +86,8 @@ AF1AAEA91EF61EF300E9C276 /* VAViewTools.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1AAE8F1EF61EF300E9C276 /* VAViewTools.m */; }; AF1AAEAA1EF61EF300E9C276 /* ViewabilityService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1AAE911EF61EF300E9C276 /* ViewabilityService.m */; }; AF1AAEAB1EF61EF300E9C276 /* ViewabilityService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1AAE911EF61EF300E9C276 /* ViewabilityService.m */; }; - AF59E97320510DDF00994BCF /* LocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF59E97220510DDF00994BCF /* LocationService.m */; }; - AF59E977205116C400994BCF /* LocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF59E97220510DDF00994BCF /* LocationService.m */; }; + AF59E97320510DDF00994BCF /* MMA_LocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF59E97220510DDF00994BCF /* MMA_LocationService.m */; }; + AF59E977205116C400994BCF /* MMA_LocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = AF59E97220510DDF00994BCF /* MMA_LocationService.m */; }; AF89EC731EFA0CB400A2AF21 /* Viewability_iOS.md in Sources */ = {isa = PBXBuildFile; fileRef = AF89EC721EFA0CB400A2AF21 /* Viewability_iOS.md */; }; AF89EC741EFA0CB400A2AF21 /* Viewability_iOS.md in Sources */ = {isa = PBXBuildFile; fileRef = AF89EC721EFA0CB400A2AF21 /* Viewability_iOS.md */; }; AFB3716B1F3854770092930F /* VACacheWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = AFB3715A1F3854770092930F /* VACacheWebView.m */; }; @@ -157,21 +157,21 @@ 2A632A3318CEB10B00BE2533 /* MobileTrackingTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MobileTrackingTests-Info.plist"; sourceTree = ""; }; 2A632A3518CEB10B00BE2533 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 2A632A3718CEB10B00BE2533 /* MobileTrackingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MobileTrackingTests.m; sourceTree = ""; }; - 2A79BC1D18D2DC2900FC62C1 /* TrackingInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackingInfoService.h; sourceTree = ""; }; - 2A79BC1E18D2DC2900FC62C1 /* TrackingInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TrackingInfoService.m; sourceTree = ""; }; - 2A8171BC18DA91C700E0EFEC /* SSNetworkInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSNetworkInfo.h; sourceTree = ""; }; - 2A8171BD18DA91C700E0EFEC /* SSNetworkInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSNetworkInfo.m; sourceTree = ""; }; - 2A8171BF18DA979E00E0EFEC /* SystemServicesConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemServicesConstants.h; sourceTree = ""; }; + 2A79BC1D18D2DC2900FC62C1 /* MMA_TrackingInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_TrackingInfoService.h; sourceTree = ""; }; + 2A79BC1E18D2DC2900FC62C1 /* MMA_TrackingInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_TrackingInfoService.m; sourceTree = ""; }; + 2A8171BC18DA91C700E0EFEC /* MMA_SSNetworkInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_SSNetworkInfo.h; sourceTree = ""; }; + 2A8171BD18DA91C700E0EFEC /* MMA_SSNetworkInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_SSNetworkInfo.m; sourceTree = ""; }; + 2A8171BF18DA979E00E0EFEC /* MMA_SystemServicesConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_SystemServicesConstants.h; sourceTree = ""; }; 2A81721B18DAEB3A00E0EFEC /* libMobileTrackingSimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMobileTrackingSimulator.a; sourceTree = BUILT_PRODUCTS_DIR; }; 2ABFE1F618CED085007BD457 /* MMA_OpenUDID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_OpenUDID.h; sourceTree = ""; }; 2ABFE1F718CED085007BD457 /* MMA_OpenUDID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_OpenUDID.m; sourceTree = ""; }; 2ABFE1F818CED085007BD457 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = ""; }; 2ABFE1FA18CED086007BD457 /* MMA_Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_Reachability.h; sourceTree = ""; }; 2ABFE1FB18CED086007BD457 /* MMA_Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_Reachability.m; sourceTree = ""; }; - 2ABFE1FD18CED086007BD457 /* RequestQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RequestQueue.h; sourceTree = ""; }; - 2ABFE1FE18CED086007BD457 /* RequestQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RequestQueue.m; sourceTree = ""; }; - 2ABFE23918CF0427007BD457 /* GDataXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDataXMLNode.h; sourceTree = ""; }; - 2ABFE23A18CF0427007BD457 /* GDataXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GDataXMLNode.m; sourceTree = ""; }; + 2ABFE1FD18CED086007BD457 /* MMA_RequestQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_RequestQueue.h; sourceTree = ""; }; + 2ABFE1FE18CED086007BD457 /* MMA_RequestQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_RequestQueue.m; sourceTree = ""; }; + 2ABFE23918CF0427007BD457 /* MMA_GDataXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_GDataXMLNode.h; sourceTree = ""; }; + 2ABFE23A18CF0427007BD457 /* MMA_GDataXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_GDataXMLNode.m; sourceTree = ""; }; 2ABFE27F18CF176D007BD457 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; 2ABFE28118CF1778007BD457 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 2ABFE28A18CF1EA5007BD457 /* MMA_SDKConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_SDKConfig.h; sourceTree = ""; }; @@ -180,8 +180,8 @@ 2ABFE28E18CF25A1007BD457 /* MMA_XMLReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_XMLReader.m; sourceTree = ""; }; 2ABFE29718CF2B5F007BD457 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 2ABFE29D18CFFA57007BD457 /* MMA_Macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_Macro.h; sourceTree = ""; }; - 2ABFE29F18D02ED2007BD457 /* GTMNSString+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+URLArguments.h"; sourceTree = ""; }; - 2ABFE2A018D02ED2007BD457 /* GTMNSString+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+URLArguments.m"; sourceTree = ""; }; + 2ABFE29F18D02ED2007BD457 /* MMA_GTMNSString+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MMA_GTMNSString+URLArguments.h"; sourceTree = ""; }; + 2ABFE2A018D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MMA_GTMNSString+URLArguments.m"; sourceTree = ""; }; 2ABFE2A218D0581A007BD457 /* MMA_Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_Log.h; sourceTree = ""; }; 2ABFE2A318D0581A007BD457 /* MMA_Log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMA_Log.m; sourceTree = ""; }; 2ABFE2A518D06E79007BD457 /* MMA_Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMA_Task.h; sourceTree = ""; }; @@ -213,8 +213,8 @@ AF1AAE8F1EF61EF300E9C276 /* VAViewTools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VAViewTools.m; sourceTree = ""; }; AF1AAE901EF61EF300E9C276 /* ViewabilityService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewabilityService.h; sourceTree = ""; }; AF1AAE911EF61EF300E9C276 /* ViewabilityService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewabilityService.m; sourceTree = ""; }; - AF59E97120510DDF00994BCF /* LocationService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocationService.h; sourceTree = ""; }; - AF59E97220510DDF00994BCF /* LocationService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocationService.m; sourceTree = ""; }; + AF59E97120510DDF00994BCF /* MMA_LocationService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMA_LocationService.h; sourceTree = ""; }; + AF59E97220510DDF00994BCF /* MMA_LocationService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMA_LocationService.m; sourceTree = ""; }; AF89EC721EFA0CB400A2AF21 /* Viewability_iOS.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Viewability_iOS.md; sourceTree = ""; }; AFB371591F3854770092930F /* VACacheWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VACacheWebView.h; sourceTree = ""; }; AFB3715A1F3854770092930F /* VACacheWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VACacheWebView.m; sourceTree = ""; }; @@ -397,8 +397,8 @@ 2ABFE1FC18CED086007BD457 /* RequestQueue */ = { isa = PBXGroup; children = ( - 2ABFE1FD18CED086007BD457 /* RequestQueue.h */, - 2ABFE1FE18CED086007BD457 /* RequestQueue.m */, + 2ABFE1FD18CED086007BD457 /* MMA_RequestQueue.h */, + 2ABFE1FE18CED086007BD457 /* MMA_RequestQueue.m */, ); path = RequestQueue; sourceTree = ""; @@ -406,8 +406,8 @@ 2ABFE23818CF0427007BD457 /* GDataXMLNode */ = { isa = PBXGroup; children = ( - 2ABFE23918CF0427007BD457 /* GDataXMLNode.h */, - 2ABFE23A18CF0427007BD457 /* GDataXMLNode.m */, + 2ABFE23918CF0427007BD457 /* MMA_GDataXMLNode.h */, + 2ABFE23A18CF0427007BD457 /* MMA_GDataXMLNode.m */, ); path = GDataXMLNode; sourceTree = ""; @@ -415,9 +415,9 @@ 2ABFE24C18CF1756007BD457 /* SystemService */ = { isa = PBXGroup; children = ( - 2A8171BF18DA979E00E0EFEC /* SystemServicesConstants.h */, - 2A8171BC18DA91C700E0EFEC /* SSNetworkInfo.h */, - 2A8171BD18DA91C700E0EFEC /* SSNetworkInfo.m */, + 2A8171BF18DA979E00E0EFEC /* MMA_SystemServicesConstants.h */, + 2A8171BC18DA91C700E0EFEC /* MMA_SSNetworkInfo.h */, + 2A8171BD18DA91C700E0EFEC /* MMA_SSNetworkInfo.m */, ); path = SystemService; sourceTree = ""; @@ -458,10 +458,10 @@ 2ABFE29918CFF9EF007BD457 /* Service */ = { isa = PBXGroup; children = ( - 2A79BC1D18D2DC2900FC62C1 /* TrackingInfoService.h */, - 2A79BC1E18D2DC2900FC62C1 /* TrackingInfoService.m */, - AF59E97120510DDF00994BCF /* LocationService.h */, - AF59E97220510DDF00994BCF /* LocationService.m */, + 2A79BC1D18D2DC2900FC62C1 /* MMA_TrackingInfoService.h */, + 2A79BC1E18D2DC2900FC62C1 /* MMA_TrackingInfoService.m */, + AF59E97120510DDF00994BCF /* MMA_LocationService.h */, + AF59E97220510DDF00994BCF /* MMA_LocationService.m */, ); path = Service; sourceTree = ""; @@ -469,8 +469,8 @@ 2ABFE29E18D02ED2007BD457 /* GTMNSString */ = { isa = PBXGroup; children = ( - 2ABFE29F18D02ED2007BD457 /* GTMNSString+URLArguments.h */, - 2ABFE2A018D02ED2007BD457 /* GTMNSString+URLArguments.m */, + 2ABFE29F18D02ED2007BD457 /* MMA_GTMNSString+URLArguments.h */, + 2ABFE2A018D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m */, ); path = GTMNSString; sourceTree = ""; @@ -651,8 +651,8 @@ AF1AAEA01EF61EF300E9C276 /* VAMonitorTimeline.m in Sources */, AFB371791F3854770092930F /* VAViewCapture.m in Sources */, AFB371771F3854770092930F /* VAJSViewabilityData.m in Sources */, - 2A79BC1F18D2DC2900FC62C1 /* TrackingInfoService.m in Sources */, - 2ABFE23B18CF0427007BD457 /* GDataXMLNode.m in Sources */, + 2A79BC1F18D2DC2900FC62C1 /* MMA_TrackingInfoService.m in Sources */, + 2ABFE23B18CF0427007BD457 /* MMA_GDataXMLNode.m in Sources */, AF1AAE9E1EF61EF300E9C276 /* VAMonitorFrame.m in Sources */, AF1AAE981EF61EF300E9C276 /* VAMaros.m in Sources */, AF1AAEA81EF61EF300E9C276 /* VAViewTools.m in Sources */, @@ -666,7 +666,7 @@ 2ABFE2A718D06E79007BD457 /* MMA_Task.m in Sources */, AF1AAEAA1EF61EF300E9C276 /* ViewabilityService.m in Sources */, 2ABFE2A418D0581A007BD457 /* MMA_Log.m in Sources */, - 2A8171BE18DA91C700E0EFEC /* SSNetworkInfo.m in Sources */, + 2A8171BE18DA91C700E0EFEC /* MMA_SSNetworkInfo.m in Sources */, 2ABFE22418CED086007BD457 /* MMA_Reachability.m in Sources */, 2ABFE22318CED086007BD457 /* MMA_OpenUDID.m in Sources */, AF1AAE961EF61EF300E9C276 /* UIView+Monitor.m in Sources */, @@ -674,14 +674,14 @@ 2ABFE2B118D07126007BD457 /* MMA_TaskQueue.m in Sources */, AFB371731F3854770092930F /* VAJavascriptParse.m in Sources */, AFB371711F3854770092930F /* VAJavascriptBridge.m in Sources */, - 2ABFE2A118D02ED2007BD457 /* GTMNSString+URLArguments.m in Sources */, + 2ABFE2A118D02ED2007BD457 /* MMA_GTMNSString+URLArguments.m in Sources */, AF1AAE921EF61EF300E9C276 /* AdHeper.m in Sources */, AF1AAE9C1EF61EF300E9C276 /* VAMonitorConfig.m in Sources */, AFB3717B1F3854770092930F /* ViewabilityJSService.m in Sources */, AF1AAEA61EF61EF300E9C276 /* VAViewMonitor.m in Sources */, - 2ABFE22518CED086007BD457 /* RequestQueue.m in Sources */, + 2ABFE22518CED086007BD457 /* MMA_RequestQueue.m in Sources */, AFB3716B1F3854770092930F /* VACacheWebView.m in Sources */, - AF59E97320510DDF00994BCF /* LocationService.m in Sources */, + AF59E97320510DDF00994BCF /* MMA_LocationService.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -702,8 +702,8 @@ AF1AAEA11EF61EF300E9C276 /* VAMonitorTimeline.m in Sources */, AFB3717A1F3854770092930F /* VAViewCapture.m in Sources */, AFB371781F3854770092930F /* VAJSViewabilityData.m in Sources */, - 2A81720218DAEB3A00E0EFEC /* TrackingInfoService.m in Sources */, - 2A81720318DAEB3A00E0EFEC /* GDataXMLNode.m in Sources */, + 2A81720218DAEB3A00E0EFEC /* MMA_TrackingInfoService.m in Sources */, + 2A81720318DAEB3A00E0EFEC /* MMA_GDataXMLNode.m in Sources */, AF1AAE9F1EF61EF300E9C276 /* VAMonitorFrame.m in Sources */, AF1AAE991EF61EF300E9C276 /* VAMaros.m in Sources */, AF1AAEA91EF61EF300E9C276 /* VAViewTools.m in Sources */, @@ -717,21 +717,21 @@ 2A81720618DAEB3A00E0EFEC /* MMA_Task.m in Sources */, AF1AAEAB1EF61EF300E9C276 /* ViewabilityService.m in Sources */, 2A81720718DAEB3A00E0EFEC /* MMA_Log.m in Sources */, - 2A81720818DAEB3A00E0EFEC /* SSNetworkInfo.m in Sources */, + 2A81720818DAEB3A00E0EFEC /* MMA_SSNetworkInfo.m in Sources */, 2A81720918DAEB3A00E0EFEC /* MMA_Reachability.m in Sources */, - AF59E977205116C400994BCF /* LocationService.m in Sources */, + AF59E977205116C400994BCF /* MMA_LocationService.m in Sources */, 2A81720A18DAEB3A00E0EFEC /* MMA_OpenUDID.m in Sources */, AF1AAE971EF61EF300E9C276 /* UIView+Monitor.m in Sources */, 2A81720B18DAEB3A00E0EFEC /* MMA_SDKConfig.m in Sources */, 2A81720C18DAEB3A00E0EFEC /* MMA_TaskQueue.m in Sources */, AFB371741F3854770092930F /* VAJavascriptParse.m in Sources */, AFB371721F3854770092930F /* VAJavascriptBridge.m in Sources */, - 2A81720D18DAEB3A00E0EFEC /* GTMNSString+URLArguments.m in Sources */, + 2A81720D18DAEB3A00E0EFEC /* MMA_GTMNSString+URLArguments.m in Sources */, AF1AAE931EF61EF300E9C276 /* AdHeper.m in Sources */, AF1AAE9D1EF61EF300E9C276 /* VAMonitorConfig.m in Sources */, AFB3717C1F3854770092930F /* ViewabilityJSService.m in Sources */, AF1AAEA71EF61EF300E9C276 /* VAViewMonitor.m in Sources */, - 2A81720F18DAEB3A00E0EFEC /* RequestQueue.m in Sources */, + 2A81720F18DAEB3A00E0EFEC /* MMA_RequestQueue.m in Sources */, AFB3716C1F3854770092930F /* VACacheWebView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/MobileTracking/MobileTracking.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist b/MobileTracking/MobileTracking.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000000000000000000000000000000000000..db4f5c0f87c08b4395c2c0bb05dda4b6b74a7085 --- /dev/null +++ b/MobileTracking/MobileTracking.xcodeproj/xcuserdata/huangli.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,24 @@ + + + + + SchemeUserState + + MobileTracking.xcscheme + + orderHint + 3 + + MobileTrackingDevice.xcscheme + + orderHint + 1 + + MobileTrackingSimulator.xcscheme + + orderHint + 2 + + + + diff --git a/MobileTracking/MobileTracking/Config/MMA_XMLReader.m b/MobileTracking/MobileTracking/Config/MMA_XMLReader.m index 3dc6fb388278ae2d974393ffb0eef89ef2f6601b..7c7513ae9737d72546eed8e4b659e7bec2cebe8b 100755 --- a/MobileTracking/MobileTracking/Config/MMA_XMLReader.m +++ b/MobileTracking/MobileTracking/Config/MMA_XMLReader.m @@ -7,12 +7,12 @@ // #import "MMA_XMLReader.h" -#import "GDataXMLNode.h" +#import "MMA_GDataXMLNode.h" @interface MMA_XMLReader() -+ (void)initOfflineCache:(MMA_SDKConfig *)sdkConfig rootElement:(GDataXMLElement *)rootElement; -+ (void)initCompanies:(MMA_SDKConfig *)sdkConfig rootElement:(GDataXMLElement *)rootElement; ++ (void)initOfflineCache:(MMA_SDKConfig *)sdkConfig rootElement:(MMA_GDataXMLElement *)rootElement; ++ (void)initCompanies:(MMA_SDKConfig *)sdkConfig rootElement:(MMA_GDataXMLElement *)rootElement; @end @@ -23,10 +23,10 @@ MMA_SDKConfig *sdkConfig = [[MMA_SDKConfig alloc] init]; - GDataXMLDocument *doc = [[GDataXMLDocument alloc]initWithXMLString:xmlString options:0 error:nil]; + MMA_GDataXMLDocument *doc = [[MMA_GDataXMLDocument alloc]initWithXMLString:xmlString options:0 error:nil]; [doc setCharacterEncoding:@"utf-8"]; - GDataXMLElement *rootElement = [doc rootElement] ; + MMA_GDataXMLElement *rootElement = [doc rootElement] ; [self initOfflineCache:sdkConfig rootElement:rootElement]; [self initCompanies:sdkConfig rootElement:rootElement]; @@ -39,10 +39,10 @@ MMA_SDKConfig *sdkConfig = [[MMA_SDKConfig alloc] init]; - GDataXMLDocument *doc = [[GDataXMLDocument alloc] initWithData:data options:0 error:nil]; + MMA_GDataXMLDocument *doc = [[MMA_GDataXMLDocument alloc] initWithData:data options:0 error:nil]; [doc setCharacterEncoding:@"utf-8"]; - GDataXMLElement *rootElement = [doc rootElement]; + MMA_GDataXMLElement *rootElement = [doc rootElement]; [self initOfflineCache:sdkConfig rootElement:rootElement]; [self initViewability:sdkConfig rootElement:rootElement]; @@ -52,26 +52,26 @@ return sdkConfig; } -+ (NSInteger)stringToIntergetFromElement:(GDataXMLElement *)element name:(NSString *)name ++ (NSInteger)stringToIntergetFromElement:(MMA_GDataXMLElement *)element name:(NSString *)name { NSString *string = [[[element elementsForName:name] firstObject] stringValue] ; NSCharacterSet *characterSet = [NSCharacterSet whitespaceAndNewlineCharacterSet]; return [[string stringByTrimmingCharactersInSet:characterSet] integerValue]; } -+(NSString *)StringTrimFromElement:(GDataXMLElement*)element name:(NSString*)name{ ++(NSString *)StringTrimFromElement:(MMA_GDataXMLElement*)element name:(NSString*)name{ NSString *string = [[[element elementsForName:name] firstObject] stringValue] ; return [string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; } -+ (void)initOfflineCache:(MMA_SDKConfig *)sdkConfig rootElement:(GDataXMLElement *)rootElement ++ (void)initOfflineCache:(MMA_SDKConfig *)sdkConfig rootElement:(MMA_GDataXMLElement *)rootElement { NSArray *array = [rootElement elementsForName:@"offlineCache"]; if (array == nil || [array count] == 0) { return; } - GDataXMLElement *element = [array firstObject]; + MMA_GDataXMLElement *element = [array firstObject]; MMA_OfflineCache *offlineCache = [[MMA_OfflineCache alloc] init]; offlineCache.length = [self stringToIntergetFromElement:element name:@"length"]; @@ -81,13 +81,13 @@ sdkConfig.offlineCache = offlineCache; } -+ (void)initViewability:(MMA_SDKConfig *)sdkConfig rootElement:(GDataXMLElement *)rootElement { ++ (void)initViewability:(MMA_SDKConfig *)sdkConfig rootElement:(MMA_GDataXMLElement *)rootElement { NSArray *array = [rootElement elementsForName:@"viewability"]; if (array == nil || [array count] == 0) { return; } - GDataXMLElement *element = [array firstObject]; + MMA_GDataXMLElement *element = [array firstObject]; MMA_Viewability *viewability = [[MMA_Viewability alloc] init]; viewability.intervalTime = [self stringToIntergetFromElement:element name:@"intervalTime"]; @@ -103,12 +103,12 @@ } -+ (void)initCompanies:(MMA_SDKConfig *)sdkConfig rootElement:(GDataXMLElement *)rootElement ++ (void)initCompanies:(MMA_SDKConfig *)sdkConfig rootElement:(MMA_GDataXMLElement *)rootElement { sdkConfig.companies = [NSMutableDictionary dictionary]; NSArray *companys = [rootElement nodesForXPath:@"//companies/company" error:nil]; - for (GDataXMLElement *element in companys) { + for (MMA_GDataXMLElement *element in companys) { MMA_Company *company = [[MMA_Company alloc] init]; @@ -118,7 +118,7 @@ company.domain = [NSMutableArray array]; NSArray *urls = [element nodesForXPath:@"domain/url" error:nil]; - for (GDataXMLElement *url in urls) { + for (MMA_GDataXMLElement *url in urls) { [company.domain addObject:[url stringValue]]; } @@ -141,17 +141,17 @@ company.MMASwitch = [[MMA_Switch alloc] init]; company.MMASwitch.isTrackLocation = [[[[element nodesForXPath:@"switch/isTrackLocation" error:nil] firstObject] stringValue] boolValue]; - GDataXMLElement *offlineCacheExpiration = [[element elementsForName:@"switch"] firstObject]; + MMA_GDataXMLElement *offlineCacheExpiration = [[element elementsForName:@"switch"] firstObject]; company.MMASwitch.offlineCacheExpiration = [self stringToIntergetFromElement:offlineCacheExpiration name:@"offlineCacheExpiration"]; - GDataXMLElement *viewabilityTrackPolicy = [[element elementsForName:@"switch"] firstObject]; + MMA_GDataXMLElement *viewabilityTrackPolicy = [[element elementsForName:@"switch"] firstObject]; company.MMASwitch.viewabilityTrackPolicy = [self stringToIntergetFromElement:viewabilityTrackPolicy name:@"viewabilityTrackPolicy"]; - GDataXMLElement *encryptElement = [[element nodesForXPath:@"switch/encrypt" error:nil] firstObject]; + MMA_GDataXMLElement *encryptElement = [[element nodesForXPath:@"switch/encrypt" error:nil] firstObject]; company.MMASwitch.encrypt = [NSMutableDictionary dictionary]; - for(GDataXMLElement *el in [encryptElement children]){ + for(MMA_GDataXMLElement *el in [encryptElement children]){ [company.MMASwitch.encrypt setValue:[el stringValue] forKey:[el name]]; } @@ -159,7 +159,7 @@ company.config.arguments = [NSMutableDictionary dictionary]; NSArray *arguments = [element nodesForXPath:@"config/arguments/argument" error:nil]; - for(GDataXMLElement *el in arguments){ + for(MMA_GDataXMLElement *el in arguments){ MMA_Argument *argument = [[MMA_Argument alloc] init]; argument.key = [self StringTrimFromElement:el name:@"key"]; argument.value = [self StringTrimFromElement:el name:@"value"]; @@ -170,7 +170,7 @@ company.config.events = [NSMutableDictionary dictionary]; NSArray *events = [element nodesForXPath:@"config/events/event" error:nil]; - for(GDataXMLElement *el in events){ + for(MMA_GDataXMLElement *el in events){ MMA_Event *event = [[MMA_Event alloc] init]; event.key = [self StringTrimFromElement:el name:@"key" ]; event.value = [self StringTrimFromElement:el name:@"value" ]; @@ -179,10 +179,10 @@ } - // GDataXMLElement *impressionplaceElement = [[element nodesForXPath:@"config/Adplacement/argument" error:nil] firstObject]; + // MMA_GDataXMLElement *impressionplaceElement = [[element nodesForXPath:@"config/Adplacement/argument" error:nil] firstObject]; NSArray *impressionplaceElement = [element nodesForXPath:@"config/Adplacement/argument" error:nil]; company.config.Adplacement = [NSMutableDictionary dictionary]; - for(GDataXMLElement *el in impressionplaceElement){ + for(MMA_GDataXMLElement *el in impressionplaceElement){ MMA_Argument *argument = [[MMA_Argument alloc] init]; argument.key = [self StringTrimFromElement:el name:@"key" ]; argument.value = [self StringTrimFromElement:el name:@"value" ]; @@ -192,7 +192,7 @@ company.config.viewabilityarguments = [NSMutableDictionary dictionary]; NSArray *viewabilityarguments = [element nodesForXPath:@"config/viewabilityarguments/argument" error:nil]; - for(GDataXMLElement *el in viewabilityarguments){ + for(MMA_GDataXMLElement *el in viewabilityarguments){ MMA_Argument *argument = [[MMA_Argument alloc] init]; argument.key = [self StringTrimFromElement:el name:@"key"]; argument.value = [self StringTrimFromElement:el name:@"value"]; diff --git a/MobileTracking/MobileTracking/MMA_Macro.h b/MobileTracking/MobileTracking/MMA_Macro.h index fb8dab7dd4b9f284d61f6e47bf1e3ada809e3136..e9be624ec427d0551866a3047a82e54204b682f0 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.0.1" +#define MMA_SDK_VERSION @"V2.0.3" #define NOTIFICATION_VB @"viewability_notification" #define NOTIFICATION_EXPOSE @"expose_notification" diff --git a/MobileTracking/MobileTracking/MobileTracking.h b/MobileTracking/MobileTracking/MobileTracking.h index ab5337942715537c104756b4f77c765a30ca0b32..53006d5c90b1e8b67aac810f46ad957863551bc5 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.0.1" +//#define MMA_SDK_VERSION @"V2.0.3" #import diff --git a/MobileTracking/MobileTracking/MobileTracking.m b/MobileTracking/MobileTracking/MobileTracking.m index eb3e0a644cda511130bdbe095aa53a090ebdd37a..bfce6089f66f5595c786af48c21a0caaf4c1ddae 100755 --- a/MobileTracking/MobileTracking/MobileTracking.m +++ b/MobileTracking/MobileTracking/MobileTracking.m @@ -16,11 +16,11 @@ #import "MMA_TaskQueue.h" #import "MMA_Helper.h" -#import "LocationService.h" -#import "TrackingInfoService.h" +#import "MMA_LocationService.h" +#import "MMA_TrackingInfoService.h" #import "MMASign.h" -#import "RequestQueue.h" -#import "GTMNSString+URLArguments.h" +#import "MMA_RequestQueue.h" +#import "MMA_GTMNSString+URLArguments.h" #import "ViewabilityService.h" #import "VAMonitor.h" #import "VAMonitorConfig.h" @@ -33,7 +33,7 @@ @property (nonatomic, strong) NSString *sdkConfigURL; @property (nonatomic, strong) MMA_TaskQueue *sendQueue; @property (nonatomic, strong) MMA_TaskQueue *failedQueue; -@property (nonatomic, strong) TrackingInfoService *trackingInfoService; +@property (nonatomic, strong) MMA_TrackingInfoService *trackingInfoService; @property (nonatomic, strong) NSTimer *failedQueueTimer; @property (nonatomic, strong) NSTimer *sendQueueTimer; @property (nonatomic, assign) BOOL isTrackLocation; @@ -84,7 +84,7 @@ { if (self = [super init]) { - _trackingInfoService = [TrackingInfoService sharedInstance]; + _trackingInfoService = [MMA_TrackingInfoService sharedInstance]; _impressionDictionary = [NSMutableDictionary dictionary]; _isTrackLocation = false; @@ -214,7 +214,7 @@ [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_SUCCEED object:nil]; } }; - [[RequestQueue mainQueue] addOperation:operation]; + [[MMA_RequestQueue mainQueue] addOperation:operation]; } } @catch (NSException *exception) { @@ -247,7 +247,7 @@ } }; - [[RequestQueue mainQueue] addOperation:operation]; + [[MMA_RequestQueue mainQueue] addOperation:operation]; } } } @@ -347,7 +347,7 @@ [self.sdkConfig.companies enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) { MMA_Company *company = (MMA_Company *)obj; if (company.MMASwitch.isTrackLocation) { - [LocationService sharedInstance]; + [MMA_LocationService sharedInstance]; self.isTrackLocation = true; } }]; @@ -689,7 +689,7 @@ /** * 发送正常的url 监测使用去噪impressionID曝光url,拼接AD_VB (2f),AD_VB_RESULT(vx) */ - [self filterURL:[self handleImpressURL:result.url impression:impressID redirectURL:result.redirectURL additionKey:YES]]; + [self filterURL:[self handleImpressURL:result.url impression:impressID redirectURL:result.redirectURL additionKey:useViewabilityService]]; [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_EXPOSE object:nil]; /** diff --git a/MobileTracking/MobileTracking/Service/LocationService.h b/MobileTracking/MobileTracking/Service/MMA_LocationService.h similarity index 72% rename from MobileTracking/MobileTracking/Service/LocationService.h rename to MobileTracking/MobileTracking/Service/MMA_LocationService.h index c50f5d11ae75354023a56b201192e5352d141db7..7d855735cce478a3f9dc36cb5fe0aa78e6111170 100644 --- a/MobileTracking/MobileTracking/Service/LocationService.h +++ b/MobileTracking/MobileTracking/Service/MMA_LocationService.h @@ -1,5 +1,5 @@ // -// LocationService.h +// MMA_LocationService.h // MobileTracking // // Created by master on 2018/3/8. @@ -8,9 +8,9 @@ #import #import -@interface LocationService : NSObject +@interface MMA_LocationService : NSObject -+ (LocationService *)sharedInstance; ++ (MMA_LocationService *)sharedInstance; - (void)start; - (void)stop; diff --git a/MobileTracking/MobileTracking/Service/LocationService.m b/MobileTracking/MobileTracking/Service/MMA_LocationService.m similarity index 94% rename from MobileTracking/MobileTracking/Service/LocationService.m rename to MobileTracking/MobileTracking/Service/MMA_LocationService.m index 01f7243b52b50717295de3d7ff5ea39c779bd24f..0a0b8c3de191267706bb7a8d9e24d4bf04f4d0ce 100644 --- a/MobileTracking/MobileTracking/Service/LocationService.m +++ b/MobileTracking/MobileTracking/Service/MMA_LocationService.m @@ -1,15 +1,15 @@ // -// LocationService.m +// MMA_LocationService.m // MobileTrackingDevice // // Created by master on 2018/3/8. // Copyright © 2018年 Admaster. All rights reserved. // -#import "LocationService.h" +#import "MMA_LocationService.h" #import "MMA_Macro.h" -@interface LocationService() +@interface MMA_LocationService() @property (nonatomic, strong) CLLocationManager *locationManager; @property (nonatomic, strong) CLLocation *currentLocation; @@ -18,9 +18,9 @@ @end #define LOGGG(FORMAT, ...) //printf("----------%s\n", [[NSString stringWithFormat:FORMAT, ##__VA_ARGS__] UTF8String]); -@implementation LocationService -+ (LocationService *)sharedInstance { - static LocationService *_sharedInstance = nil; +@implementation MMA_LocationService ++ (MMA_LocationService *)sharedInstance { + static MMA_LocationService *_sharedInstance = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ _sharedInstance = [[self alloc] init]; diff --git a/MobileTracking/MobileTracking/Service/TrackingInfoService.h b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h similarity index 89% rename from MobileTracking/MobileTracking/Service/TrackingInfoService.h rename to MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h index 918f09b08c9a99aa9f65145208b919c7b4dadbef..6f2be84ae4ebc296808b080d9f358519e4ecf2e5 100755 --- a/MobileTracking/MobileTracking/Service/TrackingInfoService.h +++ b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.h @@ -1,5 +1,5 @@ // -// TrackingInfoService.h +// MMA_TrackingInfoService.h // MobileTracking // // Created by Wenqi on 14-3-14. @@ -10,9 +10,9 @@ #import #import -@interface TrackingInfoService : NSObject +@interface MMA_TrackingInfoService : NSObject -+ (TrackingInfoService *)sharedInstance; ++ (MMA_TrackingInfoService *)sharedInstance; @property (nonatomic, strong, readonly) NSString *macAddress; @property (nonatomic, strong, readonly) NSString *ipAddress; diff --git a/MobileTracking/MobileTracking/Service/TrackingInfoService.m b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m similarity index 90% rename from MobileTracking/MobileTracking/Service/TrackingInfoService.m rename to MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m index f7f3bd14a7f90b59ea71209aed2d662f24e1af29..3d2797e7e6bd9c9378d725ab98d2992e21e43bcf 100755 --- a/MobileTracking/MobileTracking/Service/TrackingInfoService.m +++ b/MobileTracking/MobileTracking/Service/MMA_TrackingInfoService.m @@ -1,24 +1,24 @@ // -// TrackingInfoService.m +// MMA_TrackingInfoService.m // MobileTracking // // Created by Wenqi on 14-3-14. // Copyright (c) 2014年 Admaster. All rights reserved. // -#import "TrackingInfoService.h" -#import "SSNetworkInfo.h" +#import "MMA_TrackingInfoService.h" +#import "MMA_SSNetworkInfo.h" #import "MMA_OpenUDID.h" #import -#import "LocationService.h" +#import "MMA_LocationService.h" #import "MMA_Reachability.h" #import "MMA_Macro.h" #import -@implementation TrackingInfoService +@implementation MMA_TrackingInfoService -+ (TrackingInfoService *)sharedInstance { - static TrackingInfoService *_sharedInstance = nil; ++ (MMA_TrackingInfoService *)sharedInstance { + static MMA_TrackingInfoService *_sharedInstance = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ _sharedInstance = [[self alloc] init]; @@ -28,13 +28,13 @@ - (NSString *)macAddress { - NSString *macAddress = [SSNetworkInfo currentMACAddress]; + NSString *macAddress = [MMA_SSNetworkInfo currentMACAddress]; return macAddress ? macAddress : @""; } - (NSString *)ipAddress { - return [SSNetworkInfo currentIPAddress]; + return [MMA_SSNetworkInfo currentIPAddress]; } - (NSString *)systemVerstion @@ -77,7 +77,7 @@ - (NSString *)location { - CLLocation *currentLocation = [[LocationService sharedInstance] getCurrentLocation]; + CLLocation *currentLocation = [[MMA_LocationService sharedInstance] getCurrentLocation]; if(currentLocation==nil) { return @""; } diff --git a/MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.h b/MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.h similarity index 79% rename from MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.h rename to MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.h index 2cc891668d5e93e02a3cd60a11335d8ba80dd056..f7f8b7b6a00847e35d5c89168c85d5796d5c0989 100755 --- a/MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.h +++ b/MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.h @@ -63,7 +63,7 @@ // when no namespace dictionary is supplied for XPath, the default namespace // for the evaluated tree is registered with the prefix _def_ns -_EXTERN const char* kGDataXMLXPathDefaultNamespacePrefix _INITIALIZE_AS("_def_ns"); +_EXTERN const char* kMMAGDataXMLXPathDefaultNamespacePrefix _INITIALIZE_AS("_def_ns"); // Nomenclature for method names: // @@ -74,27 +74,27 @@ _EXTERN const char* kGDataXMLXPathDefaultNamespacePrefix _INITIALIZE_AS("_def_ns // + (id)nodeConsumingXMLNode:(xmlNodePtr)theXMLNode; @class NSArray, NSDictionary, NSError, NSString, NSURL; -@class GDataXMLElement, GDataXMLDocument; +@class MMA_GDataXMLElement, MMA_GDataXMLDocument; enum { - GDataXMLInvalidKind = 0, - GDataXMLDocumentKind, - GDataXMLElementKind, - GDataXMLAttributeKind, - GDataXMLNamespaceKind, - GDataXMLProcessingInstructionKind, - GDataXMLCommentKind, - GDataXMLTextKind, - GDataXMLDTDKind, - GDataXMLEntityDeclarationKind, - GDataXMLAttributeDeclarationKind, - GDataXMLElementDeclarationKind, - GDataXMLNotationDeclarationKind + MMA_GDataXMLInvalidKind = 0, + MMA_GDataXMLDocumentKind, + MMA_GDataXMLElementKind, + MMA_GDataXMLAttributeKind, + MMA_GDataXMLNamespaceKind, + MMA_GDataXMLProcessingInstructionKind, + MMA_GDataXMLCommentKind, + MMA_GDataXMLTextKind, + MMA_GDataXMLDTDKind, + MMA_GDataXMLEntityDeclarationKind, + MMA_GDataXMLAttributeDeclarationKind, + MMA_GDataXMLElementDeclarationKind, + MMA_GDataXMLNotationDeclarationKind }; -typedef NSUInteger GDataXMLNodeKind; +typedef NSUInteger MMA_GDataXMLNodeKind; -@interface GDataXMLNode : NSObject { +@interface MMA_GDataXMLNode : NSObject { @protected // NSXMLNodes can have a namespace URI or prefix even if not part // of a tree; xmlNodes cannot. When we create nodes apart from @@ -117,9 +117,9 @@ typedef NSUInteger GDataXMLNodeKind; NSArray *cachedAttributes_; } -+ (GDataXMLElement *)elementWithName:(NSString *)name; -+ (GDataXMLElement *)elementWithName:(NSString *)name stringValue:(NSString *)value; -+ (GDataXMLElement *)elementWithName:(NSString *)name URI:(NSString *)value; ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name; ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name stringValue:(NSString *)value; ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name URI:(NSString *)value; + (id)attributeWithName:(NSString *)name stringValue:(NSString *)value; + (id)attributeWithName:(NSString *)name URI:(NSString *)attributeURI stringValue:(NSString *)value; @@ -133,14 +133,14 @@ typedef NSUInteger GDataXMLNodeKind; - (NSUInteger)childCount; - (NSArray *)children; -- (GDataXMLNode *)childAtIndex:(unsigned)index; +- (MMA_GDataXMLNode *)childAtIndex:(unsigned)index; - (NSString *)localName; - (NSString *)name; - (NSString *)prefix; - (NSString *)URI; -- (GDataXMLNodeKind)kind; +- (MMA_GDataXMLNodeKind)kind; - (NSString *)XMLString; @@ -165,31 +165,31 @@ typedef NSUInteger GDataXMLNodeKind; @end -@interface GDataXMLElement : GDataXMLNode +@interface MMA_GDataXMLElement : MMA_GDataXMLNode - (id)initWithXMLString:(NSString *)str error:(NSError **)error; - (NSArray *)namespaces; - (void)setNamespaces:(NSArray *)namespaces; -- (void)addNamespace:(GDataXMLNode *)aNamespace; +- (void)addNamespace:(MMA_GDataXMLNode *)aNamespace; // addChild adds a copy of the child node to the element -- (void)addChild:(GDataXMLNode *)child; -- (void)removeChild:(GDataXMLNode *)child; +- (void)addChild:(MMA_GDataXMLNode *)child; +- (void)removeChild:(MMA_GDataXMLNode *)child; - (NSArray *)elementsForName:(NSString *)name; - (NSArray *)elementsForLocalName:(NSString *)localName URI:(NSString *)URI; - (NSArray *)attributes; -- (GDataXMLNode *)attributeForName:(NSString *)name; -- (GDataXMLNode *)attributeForLocalName:(NSString *)name URI:(NSString *)attributeURI; -- (void)addAttribute:(GDataXMLNode *)attribute; +- (MMA_GDataXMLNode *)attributeForName:(NSString *)name; +- (MMA_GDataXMLNode *)attributeForLocalName:(NSString *)name URI:(NSString *)attributeURI; +- (void)addAttribute:(MMA_GDataXMLNode *)attribute; - (NSString *)resolvePrefixForNamespaceURI:(NSString *)namespaceURI; @end -@interface GDataXMLDocument : NSObject { +@interface MMA_GDataXMLDocument : NSObject { @protected xmlDoc* xmlDoc_; // strong; always free'd in dealloc } @@ -198,9 +198,9 @@ typedef NSUInteger GDataXMLNodeKind; - (id)initWithData:(NSData *)data options:(unsigned int)mask error:(NSError **)error; // initWithRootElement uses a copy of the argument as the new document's root -- (id)initWithRootElement:(GDataXMLElement *)element; +- (id)initWithRootElement:(MMA_GDataXMLElement *)element; -- (GDataXMLElement *)rootElement; +- (MMA_GDataXMLElement *)rootElement; - (NSData *)XMLData; diff --git a/MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.m b/MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.m similarity index 90% rename from MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.m rename to MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.m index 97559fcc3f0b4ce618b31efed4237f3e68ba73e1..54d288f25f0445b134ad56a8021b6b7c6d8a55a1 100755 --- a/MobileTracking/MobileTracking/Vendor/GDataXMLNode/GDataXMLNode.m +++ b/MobileTracking/MobileTracking/Vendor/GDataXMLNode/MMA_GDataXMLNode.m @@ -14,10 +14,10 @@ */ #define GDATAXMLNODE_DEFINE_GLOBALS 1 -#import "GDataXMLNode.h" +#import "MMA_GDataXMLNode.h" @class NSArray, NSDictionary, NSError, NSString, NSURL; -@class GDataXMLElement, GDataXMLDocument; +@class MMA_GDataXMLElement, MMA_GDataXMLDocument; static const int kGDataXMLParseOptions = (XML_PARSE_NOCDATA | XML_PARSE_NOBLANKS); @@ -33,7 +33,7 @@ static CFHashCode StringCacheKeyHashCallBack(const void *str); // being nil. We'll use this utility instead. // Static copy of AreEqualOrBothNil from GDataObject.m, so that using -// GDataXMLNode does not require pulling in all of GData. +// MMA_GDataXMLNode does not require pulling in all of GData. static BOOL AreEqualOrBothNilPrivate(id obj1, id obj2) { if (obj1 == obj2) { return YES; @@ -62,7 +62,7 @@ static xmlChar* GDataGetXMLString(NSString *str) { static NSString *GDataFakeQNameForURIAndName(NSString *theURI, NSString *name) { - NSString *localName = [GDataXMLNode localNameForName:name]; + NSString *localName = [MMA_GDataXMLNode localNameForName:name]; NSString *fakeQName = [NSString stringWithFormat:@"{%@}:%@", theURI, localName]; return fakeQName; @@ -107,7 +107,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return qnameCopy; } -@interface GDataXMLNode (PrivateMethods) +@interface MMA_GDataXMLNode (PrivateMethods) // consuming a node implies it will later be freed when the instance is // dealloc'd; borrowing it implies that ownership and disposal remain the @@ -124,7 +124,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { - (xmlNodePtr)XMLNodeCopy; // search for an underlying attribute -- (GDataXMLNode *)attributeForXMLNode:(xmlAttrPtr)theXMLNode; +- (MMA_GDataXMLNode *)attributeForXMLNode:(xmlAttrPtr)theXMLNode; // return an NSString for an xmlChar*, using our strings cache in the // document @@ -136,13 +136,13 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { @end -@interface GDataXMLElement (PrivateMethods) +@interface MMA_GDataXMLElement (PrivateMethods) + (void)fixUpNamespacesForNode:(xmlNodePtr)nodeToFix graftingToTreeNode:(xmlNodePtr)graftPointNode; @end -@implementation GDataXMLNode +@implementation MMA_GDataXMLNode + (void)load { xmlInitParser(); @@ -158,7 +158,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { // the namespace prefix and replace it with a proper ns // pointer. -+ (GDataXMLElement *)elementWithName:(NSString *)name { ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name { xmlNodePtr theNewNode = xmlNewNode(NULL, // namespace GDataGetXMLString(name)); @@ -169,7 +169,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return nil; } -+ (GDataXMLElement *)elementWithName:(NSString *)name stringValue:(NSString *)value { ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name stringValue:(NSString *)value { xmlNodePtr theNewNode = xmlNewNode(NULL, // namespace GDataGetXMLString(name)); @@ -191,7 +191,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return nil; } -+ (GDataXMLElement *)elementWithName:(NSString *)name URI:(NSString *)theURI { ++ (MMA_GDataXMLElement *)elementWithName:(NSString *)name URI:(NSString *)theURI { // since we don't know a prefix yet, shove in the whole URI; we'll look for // a proper namespace ptr later when addChild calls fixUpNamespacesForNode @@ -272,9 +272,9 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { Class theClass; if (theXMLNode->type == XML_ELEMENT_NODE) { - theClass = [GDataXMLElement class]; + theClass = [MMA_GDataXMLElement class]; } else { - theClass = [GDataXMLNode class]; + theClass = [MMA_GDataXMLNode class]; } return [[[theClass alloc] initConsumingXMLNode:theXMLNode] autorelease]; } @@ -291,9 +291,9 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { + (id)nodeBorrowingXMLNode:(xmlNodePtr)theXMLNode { Class theClass; if (theXMLNode->type == XML_ELEMENT_NODE) { - theClass = [GDataXMLElement class]; + theClass = [MMA_GDataXMLElement class]; } else { - theClass = [GDataXMLNode class]; + theClass = [MMA_GDataXMLNode class]; } return [[[theClass alloc] initBorrowingXMLNode:theXMLNode] autorelease]; @@ -328,7 +328,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { - (NSString *)stringFromXMLString:(const xmlChar *)chars { #if DEBUG - NSCAssert(chars != NULL, @"GDataXMLNode sees an unexpected empty string"); + NSCAssert(chars != NULL, @"MMA_GDataXMLNode sees an unexpected empty string"); #endif if (chars == NULL) return nil; @@ -625,7 +625,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { xmlNodePtr currChild = xmlNode_->children; while (currChild != NULL) { - GDataXMLNode *node = [GDataXMLNode nodeBorrowingXMLNode:currChild]; + MMA_GDataXMLNode *node = [MMA_GDataXMLNode nodeBorrowingXMLNode:currChild]; if (array == nil) { array = [NSMutableArray arrayWithObject:node]; @@ -641,7 +641,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return array; } -- (GDataXMLNode *)childAtIndex:(unsigned)index { +- (MMA_GDataXMLNode *)childAtIndex:(unsigned)index { NSArray *children = [self children]; @@ -652,34 +652,34 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return nil; } -- (GDataXMLNodeKind)kind { +- (MMA_GDataXMLNodeKind)kind { if (xmlNode_ != NULL) { xmlElementType nodeType = xmlNode_->type; switch (nodeType) { - case XML_ELEMENT_NODE: return GDataXMLElementKind; - case XML_ATTRIBUTE_NODE: return GDataXMLAttributeKind; - case XML_TEXT_NODE: return GDataXMLTextKind; - case XML_CDATA_SECTION_NODE: return GDataXMLTextKind; - case XML_ENTITY_REF_NODE: return GDataXMLEntityDeclarationKind; - case XML_ENTITY_NODE: return GDataXMLEntityDeclarationKind; - case XML_PI_NODE: return GDataXMLProcessingInstructionKind; - case XML_COMMENT_NODE: return GDataXMLCommentKind; - case XML_DOCUMENT_NODE: return GDataXMLDocumentKind; - case XML_DOCUMENT_TYPE_NODE: return GDataXMLDocumentKind; - case XML_DOCUMENT_FRAG_NODE: return GDataXMLDocumentKind; - case XML_NOTATION_NODE: return GDataXMLNotationDeclarationKind; - case XML_HTML_DOCUMENT_NODE: return GDataXMLDocumentKind; - case XML_DTD_NODE: return GDataXMLDTDKind; - case XML_ELEMENT_DECL: return GDataXMLElementDeclarationKind; - case XML_ATTRIBUTE_DECL: return GDataXMLAttributeDeclarationKind; - case XML_ENTITY_DECL: return GDataXMLEntityDeclarationKind; - case XML_NAMESPACE_DECL: return GDataXMLNamespaceKind; - case XML_XINCLUDE_START: return GDataXMLProcessingInstructionKind; - case XML_XINCLUDE_END: return GDataXMLProcessingInstructionKind; - case XML_DOCB_DOCUMENT_NODE: return GDataXMLDocumentKind; + case XML_ELEMENT_NODE: return MMA_GDataXMLElementKind; + case XML_ATTRIBUTE_NODE: return MMA_GDataXMLAttributeKind; + case XML_TEXT_NODE: return MMA_GDataXMLTextKind; + case XML_CDATA_SECTION_NODE: return MMA_GDataXMLTextKind; + case XML_ENTITY_REF_NODE: return MMA_GDataXMLEntityDeclarationKind; + case XML_ENTITY_NODE: return MMA_GDataXMLEntityDeclarationKind; + case XML_PI_NODE: return MMA_GDataXMLProcessingInstructionKind; + case XML_COMMENT_NODE: return MMA_GDataXMLCommentKind; + case XML_DOCUMENT_NODE: return MMA_GDataXMLDocumentKind; + case XML_DOCUMENT_TYPE_NODE: return MMA_GDataXMLDocumentKind; + case XML_DOCUMENT_FRAG_NODE: return MMA_GDataXMLDocumentKind; + case XML_NOTATION_NODE: return MMA_GDataXMLNotationDeclarationKind; + case XML_HTML_DOCUMENT_NODE: return MMA_GDataXMLDocumentKind; + case XML_DTD_NODE: return MMA_GDataXMLDTDKind; + case XML_ELEMENT_DECL: return MMA_GDataXMLElementDeclarationKind; + case XML_ATTRIBUTE_DECL: return MMA_GDataXMLAttributeDeclarationKind; + case XML_ENTITY_DECL: return MMA_GDataXMLEntityDeclarationKind; + case XML_NAMESPACE_DECL: return MMA_GDataXMLNamespaceKind; + case XML_XINCLUDE_START: return MMA_GDataXMLProcessingInstructionKind; + case XML_XINCLUDE_END: return MMA_GDataXMLProcessingInstructionKind; + case XML_DOCB_DOCUMENT_NODE: return MMA_GDataXMLDocumentKind; } } - return GDataXMLInvalidKind; + return MMA_GDataXMLInvalidKind; } - (NSArray *)nodesForXPath:(NSString *)xpath error:(NSError **)error { @@ -697,9 +697,9 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { NSDictionary *errorInfo = nil; // xmlXPathNewContext requires a doc for its context, but if our elements - // are created from GDataXMLElement's initWithXMLString there may not be + // are created from MMA_GDataXMLElement's initWithXMLString there may not be // a document. (We may later decide that we want to stuff the doc used - // there into a GDataXMLDocument and retain it, but we don't do that now.) + // there into a MMA_GDataXMLDocument and retain it, but we don't do that now.) // // We'll temporarily make a document to use for the xpath context. @@ -737,7 +737,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { int result = xmlXPathRegisterNs(xpathCtx, prefixChars, uriChars); if (result != 0) { #if DEBUG - NSCAssert1(result == 0, @"GDataXMLNode XPath namespace %@ issue", + NSCAssert1(result == 0, @"MMA_GDataXMLNode XPath namespace %@ issue", prefix); #endif } @@ -762,13 +762,13 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { // _def_ns const xmlChar* prefix = nsPtr->prefix; if (prefix == NULL) { - prefix = (xmlChar*) kGDataXMLXPathDefaultNamespacePrefix; + prefix = (xmlChar*) kMMAGDataXMLXPathDefaultNamespacePrefix; } int result = xmlXPathRegisterNs(xpathCtx, prefix, nsPtr->href); if (result != 0) { #if DEBUG - NSCAssert1(result == 0, @"GDataXMLNode XPath namespace %s issue", + NSCAssert1(result == 0, @"MMA_GDataXMLNode XPath namespace %s issue", prefix); #endif } @@ -792,7 +792,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { xmlNodePtr currNode = nodeSet->nodeTab[index]; - GDataXMLNode *node = [GDataXMLNode nodeBorrowingXMLNode:currNode]; + MMA_GDataXMLNode *node = [MMA_GDataXMLNode nodeBorrowingXMLNode:currNode]; if (node) { [array addObject:node]; } @@ -849,9 +849,9 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return nil; } -- (BOOL)isEqual:(GDataXMLNode *)other { +- (BOOL)isEqual:(MMA_GDataXMLNode *)other { if (self == other) return YES; - if (![other isKindOfClass:[GDataXMLNode class]]) return NO; + if (![other isKindOfClass:[MMA_GDataXMLNode class]]) return NO; return [self XMLNode] == [other XMLNode] || ([self kind] == [other kind] @@ -861,7 +861,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } - (NSUInteger)hash { - return (NSUInteger) (void *) [GDataXMLNode class]; + return (NSUInteger) (void *) [MMA_GDataXMLNode class]; } - (NSMethodSignature *)methodSignatureForSelector:(SEL)selector { @@ -899,7 +899,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { -@implementation GDataXMLElement +@implementation MMA_GDataXMLElement - (id)initWithXMLString:(NSString *)str error:(NSError **)error { self = [super init]; @@ -950,7 +950,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { // add this prefix/URI to the list, unless it's the implicit xml prefix if (!xmlStrEqual(currNS->prefix, (const xmlChar *) "xml")) { - GDataXMLNode *node = [GDataXMLNode nodeBorrowingXMLNode:(xmlNodePtr) currNS]; + MMA_GDataXMLNode *node = [MMA_GDataXMLNode nodeBorrowingXMLNode:(xmlNodePtr) currNS]; if (array == nil) { array = [NSMutableArray arrayWithObject:node]; @@ -979,7 +979,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { // add a namespace for each object in the array NSEnumerator *enumerator = [namespaces objectEnumerator]; - GDataXMLNode *namespaceNode; + MMA_GDataXMLNode *namespaceNode; while ((namespaceNode = [enumerator nextObject]) != nil) { xmlNsPtr ns = (xmlNsPtr) [namespaceNode XMLNode]; @@ -995,7 +995,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } } -- (void)addNamespace:(GDataXMLNode *)aNamespace { +- (void)addNamespace:(MMA_GDataXMLNode *)aNamespace { if (xmlNode_ != NULL) { @@ -1013,8 +1013,8 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } } -- (void)addChild:(GDataXMLNode *)child { - if ([child kind] == GDataXMLAttributeKind) { +- (void)addChild:(MMA_GDataXMLNode *)child { + if ([child kind] == MMA_GDataXMLAttributeKind) { [self addAttribute:child]; return; } @@ -1042,7 +1042,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } } -- (void)removeChild:(GDataXMLNode *)child { +- (void)removeChild:(MMA_GDataXMLNode *)child { // this is safe for attributes too if (xmlNode_ != NULL) { @@ -1092,7 +1092,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { // walk our list of cached child nodes NSArray *children = [self children]; - for (GDataXMLNode *child in children) { + for (MMA_GDataXMLNode *child in children) { xmlNodePtr currNode = [child XMLNode]; @@ -1136,7 +1136,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { NSArray *children = [self children]; - for (GDataXMLNode *child in children) { + for (MMA_GDataXMLNode *child in children) { xmlNodePtr currChildPtr = [child XMLNode]; @@ -1204,7 +1204,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { xmlAttrPtr prop = xmlNode_->properties; while (prop != NULL) { - GDataXMLNode *node = [GDataXMLNode nodeBorrowingXMLNode:(xmlNodePtr) prop]; + MMA_GDataXMLNode *node = [MMA_GDataXMLNode nodeBorrowingXMLNode:(xmlNodePtr) prop]; if (array == nil) { array = [NSMutableArray arrayWithObject:node]; } else { @@ -1219,7 +1219,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return array; } -- (void)addAttribute:(GDataXMLNode *)attribute { +- (void)addAttribute:(MMA_GDataXMLNode *)attribute { if (xmlNode_ != NULL) { @@ -1272,12 +1272,12 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } } -- (GDataXMLNode *)attributeForXMLNode:(xmlAttrPtr)theXMLNode { - // search the cached attributes list for the GDataXMLNode with +- (MMA_GDataXMLNode *)attributeForXMLNode:(xmlAttrPtr)theXMLNode { + // search the cached attributes list for the MMA_GDataXMLNode with // the underlying xmlAttrPtr NSArray *attributes = [self attributes]; - for (GDataXMLNode *attr in attributes) { + for (MMA_GDataXMLNode *attr in attributes) { if (theXMLNode == (xmlAttrPtr) [attr XMLNode]) { return attr; @@ -1287,7 +1287,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return nil; } -- (GDataXMLNode *)attributeForName:(NSString *)name { +- (MMA_GDataXMLNode *)attributeForName:(NSString *)name { if (xmlNode_ != NULL) { @@ -1313,14 +1313,14 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } if (attrPtr) { - GDataXMLNode *attr = [self attributeForXMLNode:attrPtr]; + MMA_GDataXMLNode *attr = [self attributeForXMLNode:attrPtr]; return attr; } } return nil; } -- (GDataXMLNode *)attributeForLocalName:(NSString *)localName +- (MMA_GDataXMLNode *)attributeForLocalName:(NSString *)localName URI:(NSString *)attributeURI { if (xmlNode_ != NULL) { @@ -1340,7 +1340,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { } if (attrPtr) { - GDataXMLNode *attr = [self attributeForXMLNode:attrPtr]; + MMA_GDataXMLNode *attr = [self attributeForXMLNode:attrPtr]; return attr; } } @@ -1596,16 +1596,16 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { @end -@interface GDataXMLDocument (PrivateMethods) +@interface MMA_GDataXMLDocument (PrivateMethods) - (void)addStringsCacheToDoc; @end -@implementation GDataXMLDocument +@implementation MMA_GDataXMLDocument - (id)initWithXMLString:(NSString *)str options:(unsigned int)mask error:(NSError **)error { NSData *data = [str dataUsingEncoding:NSUTF8StringEncoding]; - GDataXMLDocument *doc = [self initWithData:data options:mask error:error]; + MMA_GDataXMLDocument *doc = [self initWithData:data options:mask error:error]; return doc; } @@ -1639,7 +1639,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { return self; } -- (id)initWithRootElement:(GDataXMLElement *)element { +- (id)initWithRootElement:(MMA_GDataXMLElement *)element { self = [super init]; if (self) { @@ -1659,7 +1659,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { #if DEBUG NSCAssert(xmlDoc_ != NULL && xmlDoc_->_private == NULL, - @"GDataXMLDocument cache creation problem"); + @"MMA_GDataXMLDocument cache creation problem"); #endif // add a strings cache as private data for the document @@ -1706,13 +1706,13 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { #pragma mark - -- (GDataXMLElement *)rootElement { - GDataXMLElement *element = nil; +- (MMA_GDataXMLElement *)rootElement { + MMA_GDataXMLElement *element = nil; if (xmlDoc_ != NULL) { xmlNodePtr rootNode = xmlDocGetRootElement(xmlDoc_); if (rootNode) { - element = [GDataXMLElement nodeBorrowingXMLNode:rootNode]; + element = [MMA_GDataXMLElement nodeBorrowingXMLNode:rootNode]; } } return element; @@ -1774,7 +1774,7 @@ static xmlChar *SplitQNameReverse(const xmlChar *qname, xmlChar **prefix) { namespaces:(NSDictionary *)namespaces error:(NSError **)error { if (xmlDoc_ != NULL) { - GDataXMLNode *docNode = [GDataXMLElement nodeBorrowingXMLNode:(xmlNodePtr)xmlDoc_]; + MMA_GDataXMLNode *docNode = [MMA_GDataXMLElement nodeBorrowingXMLNode:(xmlNodePtr)xmlDoc_]; NSArray *array = [docNode nodesForXPath:xpath namespaces:namespaces error:error]; diff --git a/MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.h b/MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.h similarity index 97% rename from MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.h rename to MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.h index d4c7e09a29e05082ed7290d71b9e2528faabacc6..458942072a970c7d0fb29178afe60035e60b8768 100755 --- a/MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.h +++ b/MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.h @@ -1,5 +1,5 @@ // -// GTMNSString+URLArguments.h +// MMA_GTMNSString+URLArguments.h // // Copyright 2006-2008 Google Inc. // diff --git a/MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.m b/MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.m similarity index 95% rename from MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.m rename to MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.m index 5cbcd248de5e2e4be27a2eb271f720f963f6e0bb..d9d21bb2609a4455822bdf64e0640c3aed60a95c 100755 --- a/MobileTracking/MobileTracking/Vendor/GTMNSString/GTMNSString+URLArguments.m +++ b/MobileTracking/MobileTracking/Vendor/GTMNSString/MMA_GTMNSString+URLArguments.m @@ -1,5 +1,5 @@ // -// GTMNSString+URLArguments.m +// MMA_GTMNSString+URLArguments.m // // Copyright 2006-2008 Google Inc. // @@ -16,7 +16,7 @@ // the License. // -#import "GTMNSString+URLArguments.h" +#import "MMA_GTMNSString+URLArguments.h" #define GTMNSMakeCollectable(cf) ((id)(cf)) #define GTMCFAutorelease(cf) ([GTMNSMakeCollectable(cf) autorelease]) diff --git a/MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.h b/MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.h similarity index 88% rename from MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.h rename to MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.h index f43a825aa21fe41c9e200bf4ce180cd07bd29485..bd3a60b888b9fe5242137288ba3ffaa976f972d4 100755 --- a/MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.h +++ b/MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.h @@ -1,5 +1,5 @@ // -// RequestQueue.h +// MMA_RequestQueue.h // // Version 1.5.2 // @@ -9,7 +9,7 @@ // Distributed under the permissive zlib License // Get the latest version from here: // -// https://github.com/nicklockwood/RequestQueue +// https://github.com/nicklockwood/MMA_RequestQueue // // This software is provided 'as-is', without any express or implied // warranty. In no event will the authors be held liable for any damages @@ -31,7 +31,7 @@ // -extern NSString *const HTTPResponseErrorDomain; +extern NSString *const MMAHTTPResponseErrorDomain; typedef void (^RQCompletionHandler)(NSURLResponse *response, NSData *data, NSError *error); @@ -41,10 +41,10 @@ typedef void (^RQAuthenticationChallengeHandler)(NSURLAuthenticationChallenge *c typedef enum { - RequestQueueModeFirstInFirstOut = 0, - RequestQueueModeLastInFirstOut + MMA_RequestQueueModeFirstInFirstOut = 0, + MMA_RequestQueueModeLastInFirstOut } -RequestQueueMode; +MMA_RequestQueueMode; @interface RQOperation : NSOperation @@ -64,13 +64,13 @@ RequestQueueMode; @end -@interface RequestQueue : NSObject +@interface MMA_RequestQueue : NSObject @property (nonatomic) NSUInteger maxConcurrentRequestCount; @property (nonatomic, getter = isSuspended) BOOL suspended; @property (nonatomic, readonly) NSUInteger requestCount; @property (nonatomic, copy, readonly) NSArray *requests; -@property (nonatomic) RequestQueueMode queueMode; +@property (nonatomic) MMA_RequestQueueMode queueMode; @property (nonatomic) BOOL allowDuplicateRequests; + (instancetype)mainQueue; diff --git a/MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.m b/MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.m similarity index 93% rename from MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.m rename to MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.m index 722a920fa52e9f3fdbffef6d31a9120ebbf52754..2ef3a15d00bfa9284028fbcf24fa15b4158fbef9 100755 --- a/MobileTracking/MobileTracking/Vendor/RequestQueue/RequestQueue.m +++ b/MobileTracking/MobileTracking/Vendor/RequestQueue/MMA_RequestQueue.m @@ -1,5 +1,5 @@ // -// RequestQueue.h +// MMA_RequestQueue.h // // Version 1.5.2 // @@ -9,7 +9,7 @@ // Distributed under the permissive zlib License // Get the latest version from here: // -// https://github.com/nicklockwood/RequestQueue +// https://github.com/nicklockwood/MMA_RequestQueue // // This software is provided 'as-is', without any express or implied // warranty. In no event will the authors be held liable for any damages @@ -30,7 +30,7 @@ // 3. This notice may not be removed or altered from any source distribution. // -#import "RequestQueue.h" +#import "MMA_RequestQueue.h" #import @@ -39,7 +39,7 @@ #endif -NSString *const HTTPResponseErrorDomain = @"HTTPResponseErrorDomain"; +NSString *const MMAHTTPResponseErrorDomain = @"MMAHTTPResponseErrorDomain"; @interface RQOperation () @@ -237,9 +237,9 @@ NSString *const HTTPResponseErrorDomain = @"HTTPResponseErrorDomain"; NSInteger statusCode = [(NSHTTPURLResponse *)_responseReceived statusCode]; if (statusCode / 100 >= 4&& !_isRedirect) { - NSString *message = [NSString stringWithFormat:NSLocalizedString(@"The server returned a %i error", @"RequestQueue HTTPResponse error message format"), statusCode]; + NSString *message = [NSString stringWithFormat:NSLocalizedString(@"The server returned a %i error", @"MMA_RequestQueue HTTPResponse error message format"), statusCode]; NSDictionary *infoDict = @{NSLocalizedDescriptionKey: message}; - error = [NSError errorWithDomain:HTTPResponseErrorDomain + error = [NSError errorWithDomain:MMAHTTPResponseErrorDomain code:statusCode userInfo:infoDict]; } @@ -251,21 +251,21 @@ NSString *const HTTPResponseErrorDomain = @"HTTPResponseErrorDomain"; @end -@interface RequestQueue () +@interface MMA_RequestQueue () @property (strong, nonatomic) NSMutableArray *operations; @end -@implementation RequestQueue +@implementation MMA_RequestQueue + (instancetype)mainQueue { - static RequestQueue *mainQueue = nil; + static MMA_RequestQueue *mainQueue = nil; if (mainQueue == nil) { - mainQueue = [[RequestQueue alloc] init]; + mainQueue = [[MMA_RequestQueue alloc] init]; } return mainQueue; } @@ -274,7 +274,7 @@ NSString *const HTTPResponseErrorDomain = @"HTTPResponseErrorDomain"; { if ((self = [super init])) { - _queueMode = RequestQueueModeFirstInFirstOut; + _queueMode = MMA_RequestQueueModeFirstInFirstOut; _operations = [[NSMutableArray alloc] init]; _maxConcurrentRequestCount = 2; _allowDuplicateRequests = NO; @@ -326,7 +326,7 @@ NSString *const HTTPResponseErrorDomain = @"HTTPResponseErrorDomain"; } NSUInteger index = 0; - if (_queueMode == RequestQueueModeFirstInFirstOut) + if (_queueMode == MMA_RequestQueueModeFirstInFirstOut) { index = [_operations count]; } diff --git a/MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.h b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.h similarity index 72% rename from MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.h rename to MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.h index 0ffdbf285f23b2720e2ffe707e6a23be5ff9984e..e0b4015e2f7fbdf7849a6a0e63cb377d57e7f48a 100755 --- a/MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.h +++ b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.h @@ -1,14 +1,14 @@ // -// SSNetworkInfo.h +// MMA_SSNetworkInfo.h // SystemServicesDemo // // Created by Shmoopi LLC on 9/18/12. // Copyright (c) 2012 Shmoopi LLC. All rights reserved. // -#import "SystemServicesConstants.h" +#import "MMA_SystemServicesConstants.h" -@interface SSNetworkInfo : NSObject +@interface MMA_SSNetworkInfo : NSObject // Network Information diff --git a/MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.m b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.m similarity index 93% rename from MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.m rename to MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.m index 81a98bf8689109390777433b3e91cec59403330d..a07580c26486532e5a1ef8b5afcd01bd6676d100 100755 --- a/MobileTracking/MobileTracking/Vendor/SystemService/SSNetworkInfo.m +++ b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SSNetworkInfo.m @@ -1,14 +1,14 @@ // -// SSNetworkInfo.m +// MMA_SSNetworkInfo.m // SystemServicesDemo // // Created by Shmoopi LLC on 9/18/12. // Copyright (c) 2012 Shmoopi LLC. All rights reserved. // -#import "SSNetworkInfo.h" +#import "MMA_SSNetworkInfo.h" -@implementation SSNetworkInfo +@implementation MMA_SSNetworkInfo // Get Current IP Address + (NSString *)currentIPAddress { diff --git a/MobileTracking/MobileTracking/Vendor/SystemService/SystemServicesConstants.h b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SystemServicesConstants.h similarity index 95% rename from MobileTracking/MobileTracking/Vendor/SystemService/SystemServicesConstants.h rename to MobileTracking/MobileTracking/Vendor/SystemService/MMA_SystemServicesConstants.h index 878c8167e6dcde820874662971dcb388fd92d460..a18bf23cedc8ddd133ade933722bbdb887d0c4d2 100755 --- a/MobileTracking/MobileTracking/Vendor/SystemService/SystemServicesConstants.h +++ b/MobileTracking/MobileTracking/Vendor/SystemService/MMA_SystemServicesConstants.h @@ -1,13 +1,13 @@ // -// SystemServicesConstants.h +// MMA_SystemServicesConstants.h // SystemServicesDemo // // Created by Shmoopi LLC on 9/15/12. // Copyright (c) 2012 Shmoopi LLC. All rights reserved. // -#ifndef SystemServicesDemo_SystemServicesConstants_h -#define SystemServicesDemo_SystemServicesConstants_h +#ifndef SystemServicesDemo_MMA_SystemServicesConstants_h +#define SystemServicesDemo_MMA_SystemServicesConstants_h // System Frameworks #import @@ -43,7 +43,7 @@ //#import "SSAccessoryInfo.h" //#import "SSCarrierInfo.h" //#import "SSBatteryInfo.h" -//#import "SSNetworkInfo.h" +//#import "MMA_SSNetworkInfo.h" //#import "SSProcessInfo.h" //#import "SSDiskInfo.h" //#import "SSMemoryInfo.h" diff --git a/MobileTracking/build.sh b/MobileTracking/build.sh index ec9ebdcb922685ef186bc578cc1477a6634a47d3..be1acb3555fb5cc1ffc2e30f55f1d7ea751fe706 100755 --- a/MobileTracking/build.sh +++ b/MobileTracking/build.sh @@ -11,10 +11,10 @@ iphonesimulator_path=${UNIVERSAL_OUTPUTFOLDER}/${CONFIGURATION}-iphonesimulator ${$targetName:?"mush set targetName"} xcodebuild -target $targetName clean # clean project -xcodebuild -target $targetName -sdk iphoneos11.0 # build iphoneos +xcodebuild -target $targetName -sdk iphoneos12.0 # build iphoneos #build iphonesimulator -xcodebuild -target $targetName -configuration ${CONFIGURATION} -sdk iphonesimulator11.0 -arch x86_64 -arch i386 +xcodebuild -target $targetName -configuration ${CONFIGURATION} -sdk iphonesimulator12.0 -arch x86_64 -arch i386 if [ ! -d "$universal_path" ]; then #判断文件是否存在 不存在创建 中括号两边要空格 mkdir "$universal_path" diff --git a/OutputRelease/.DS_Store b/OutputRelease/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..9d3c3eeef045c3a76b66f415ecc7ebea34d48a6a 100644 Binary files a/OutputRelease/.DS_Store and b/OutputRelease/.DS_Store differ diff --git a/OutputRelease/MobileTracking.h b/OutputRelease/MobileTracking.h index ab5337942715537c104756b4f77c765a30ca0b32..384b68d9d1fc054ca530deaaaba1a0c7a0733efc 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.0.1" +//#define MMA_SDK_VERSION @"V2.0.2" #import diff --git a/OutputRelease/libMobileTracking.a b/OutputRelease/libMobileTracking.a index f157eb7d360f15c38c24497535c15fd6bc2ac7fa..6c8da27cd2fc758f81d1eeb9dc4402f5045146dd 100644 Binary files a/OutputRelease/libMobileTracking.a and b/OutputRelease/libMobileTracking.a differ diff --git a/OutputRelease/sdkconfig.xml b/OutputRelease/sdkconfig.xml index 80e36a3e26cd0c2e1844882af1b5f9a51b6bfb13..290a7a126ef3105952195d26c9c449516ebcc681 100644 --- a/OutputRelease/sdkconfig.xml +++ b/OutputRelease/sdkconfig.xml @@ -445,7 +445,7 @@ raw raw - raw + md5 raw @@ -486,6 +486,12 @@ IMEI + m2 + true + true + + + RAWIMEI m3 true true diff --git a/README.md b/README.md index a1f08d536ef4f8e2a9243ab42b955e109bc29878..216daf2d417d19b8fec9ca19e0c2f81c53f9a67e 100755 --- a/README.md +++ b/README.md @@ -4,6 +4,17 @@ 1. 将SDK发布文件中，release目录下的**MobileTracking.h** 、**libMobileTracking.a**、**sdkconfig.xml** 三个文件拷贝到项目工程中，将 **sdkconfig.xml** 上传到 web 服务器，使其可以通过 web 方式访问，假设其地址为 **http://xxxxxx.com/sdkconfig.xml**（其后会用到）。 2. 在项目工程 App 的 Target Build Settings 中的 **Other Linker Flags** 选项里添加 **-lxml2** **-all_load** 或 **-lxml2** **-force_load** 静态库的绝对路径 +3. 添加SDK需要的Framework +在需要添加SDK的项目的 Xcode 开发环境中选择 TARGETS-->Build Phases-->Link Binary With Libraries--> + 添加以下framework框架: +``` + CoreLocation.framework + libxml2.2.tbd + AdSupport.framework + CoreTelephony.framework + SystemConfiguration.framework + +``` + ### 步骤2:配置文件sdkconfig.xml的使用方法 在使用的文件中引用 **#import "MobileTracking.h"**.