feat: 测量协议3.0字段修改

Example/ExampleTests/GrowingIO_ExampleTests.m

@@ -19,7 +19,7 @@ @implementation GrowingIO_ExampleTests
 
 // beforeEach 的作用参考KIF，简单概括就是构造测试Case的必要条件
 - (void)beforeEach {
-    [[viewTester usingLabel:@"chng请求"] tap];
+    [[viewTester usingLabel:@"VIEW_CHANGE请求"] tap];
 }
 
 // afterEach 的作用参考KIF，简单概括就是恢复app状态到初始状态，使得本case不对下次测试造成影响
@@ -50,14 +50,14 @@ - (void)testExample {
 }
 
 //- (void)testExample {
-//    //构造chng事件
+//    //构造VIEW_CHANGE事件
 //    [[viewTester usingLabel:@"UserName"] enterText:@"GrowingIOUser\n"];
 //    [[viewTester usingLabel:@"PassWord"] waitToBecomeFirstResponder];
 //    [[viewTester usingLabel:@"PassWord"] waitForView];
 //    [[viewTester usingLabel:@"PassWord"] enterText:@"GrowingIO" expectedResult:@"GrowingIO"];
 //
 //    //MockEventQueue 缓存事件并提供了几个高效的接口
-//    NSUInteger chngEventCount = [[MockEventQueue eventsFor:@"chng"] count];
+//    NSUInteger chngEventCount = [[MockEventQueue eventsFor:@"VIEW_CHANGE"] count];
 //
 //    NSUInteger acvEventCount = [[MockEventQueue eventsFor:@"app_activate"] count];
 //

Example/ExampleTests/Helper/ManualTrackHelper.m

@@ -28,11 +28,11 @@ +(Boolean *)CheckContainsKey:(NSDictionary *)dicts:(NSString *)ckchar{
 +(NSDictionary *)CstmEventCheck:(NSDictionary *)cstmevent
 {
     NSDictionary *cstmchres;
-    //NSArray * cstmprome=@[@"u",@"s",@"t",@"tm",@"ptm",@"d",@"n",@"num",@"gesid",@"esid",@"var",@"cs1"];
+    //NSArray * cstmprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"pageShowTimestamp",@"domain",@"eventName",@"num",@"globalSequenceId",@"eventSequenceId",@"var",@"userId"];
     //重构代码后，废弃ptm字段 2018-07-23
-    //NSArray * cstmprome=@[@"u",@"s",@"t",@"tm",@"d",@"n",@"num",@"gesid",@"esid",@"var",@"cs1"];
+    //NSArray * cstmprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"eventName",@"num",@"globalSequenceId",@"eventSequenceId",@"var",@"userId"];
     //SDK重构2.5.0,调整测量协议 2018-08-09
-    NSArray * cstmprome=@[@"u",@"s",@"t",@"tm",@"p",@"d",@"n",@"num",@"var",@"cs1",@"gesid",@"esid"];
+    NSArray * cstmprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"pageName",@"domain",@"eventName",@"num",@"var",@"userId",@"globalSequenceId",@"eventSequenceId"];
     //对比测量协议结构
     if (cstmevent.count>0)
     {
@@ -46,9 +46,9 @@ +(NSDictionary *)CstmEventCheck:(NSDictionary *)cstmevent
 +(NSDictionary *)PplEventCheck:(NSDictionary *)pplevent
 {
     NSDictionary *pplchres;
-    //NSArray * pplprome=@[@"u",@"s",@"t",@"tm",@"d",@"gesid",@"esid",@"var",@"cs1"];
+    //NSArray * pplprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"globalSequenceId",@"eventSequenceId",@"var",@"userId"];
      //SDK重构2.5.0,调整测量协议 2018-08-09
-    NSArray * pplprome=@[@"u",@"s",@"t",@"tm",@"d",@"var",@"cs1",@"gesid",@"esid"];
+    NSArray * pplprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"var",@"userId",@"globalSequenceId",@"eventSequenceId"];
     //对比测量协议结构
     if (pplevent.count>0)
     {
@@ -62,7 +62,7 @@ +(NSDictionary *)PplEventCheck:(NSDictionary *)pplevent
 +(NSDictionary *)PvarEventCheck:(NSDictionary *)pvarevent
 {
     NSDictionary *pvarchres;
-    NSArray * pvarlprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"var",@"cs1",@"gesid",@"esid"];
+    NSArray * pvarlprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"var",@"userId",@"globalSequenceId",@"eventSequenceId"];
     //对比测量协议结构
     if (pvarevent.count>0)
     {
@@ -77,7 +77,7 @@ +(NSDictionary *)PvarEventCheck:(NSDictionary *)pvarevent
 +(NSDictionary *)EvarEventCheck:(NSDictionary *)evarevent
 {
     NSDictionary *evarchres;
-    NSArray * evarlprome=@[@"u",@"s",@"t",@"tm",@"d",@"var",@"cs1",@"esid",@"gesid"];
+    NSArray * evarlprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"var",@"userId",@"eventSequenceId",@"globalSequenceId"];
     //对比测量协议结构
     if (evarevent.count>0)
     {
@@ -91,7 +91,7 @@ +(NSDictionary *)EvarEventCheck:(NSDictionary *)evarevent
 +(NSDictionary *)VstrEventCheck:(NSDictionary *)vstrevent
 {
     NSDictionary *vstrchres;
-    NSArray * vstrprome=@[@"u",@"s",@"t",@"tm",@"d",@"var",@"cs1"];
+    NSArray * vstrprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"var",@"userId"];
     //对比测量协议结构
     if (vstrevent.count>0)
     {

Example/ExampleTests/Helper/NoburPoMeaProCheck.h

@@ -25,7 +25,7 @@
 //clck事件对比，测量协议字段完整且每个字段不为空
 +(NSDictionary *)ClckEventCheck:(NSDictionary *)clckevent;
 
-//chng事件对比，测量协议字段完整且每个字段不为空
+//VIEW_CHANGE事件对比，测量协议字段完整且每个字段不为空
 +(NSDictionary *)ChngEventCheck:(NSDictionary *)chngevent;
 
 //imp事件对比，测量协议字段完整且每个字段不为空

Example/ExampleTests/Helper/NoburPoMeaProCheck.m

@@ -88,11 +88,11 @@ +(NSDictionary *)VstEventCheck:(NSDictionary *)vstevent
 {
     NSDictionary *vstchres;
     //测试中发现测量协议字段过多，产品删除了b, p, ch,dt
-    //NSArray * vstprome=@[@"u",@"s",@"t",@"tm",@"av",@"b",@"d",@"p",@"r",@"ch",@"sh",@"sw",@"db",@"dm",@"ph",@"os",@"osv",@"ca",@"cv",@"sn",@"v",@"l",@"lat",@"lng",@"gesid",@"esid",@"tz",@"utm",@"cb",@"iv",@"dt",@"ui",@"cs1"];
-//    NSArray * vstprome=@[@"u",@"s",@"t",@"tm",@"av",@"d",@"r",@"sh",@"sw",@"db",@"dm",@"ph",@"os",@"osv",@"ca",@"cv",@"sn",@"v",@"l",@"lat",@"lng",@"gesid",@"esid",@"tz",@"utm",@"cb",@"iv",@"ui",@"cs1"];
+    //NSArray * vstprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"av",@"b",@"domain",@"pageName",@"r",@"ch",@"screenHeight",@"screenWidth",@"deviceBrand",@"deviceModel",@"deviceType",@"operatingSystem",@"operatingSystemVersion",@"ca",@"appVersion",@"appName",@"textValue",@"language",@"latitude",@"longitude",@"globalSequenceId",@"eventSequenceId",@"tz",@"utm",@"cb",@"iv",@"dt",@"ui",@"userId"];
+//    NSArray * vstprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"av",@"domain",@"r",@"screenHeight",@"screenWidth",@"deviceBrand",@"deviceModel",@"deviceType",@"operatingSystem",@"operatingSystemVersion",@"ca",@"appVersion",@"appName",@"textValue",@"language",@"latitude",@"longitude",@"globalSequenceId",@"eventSequenceId",@"tz",@"utm",@"cb",@"iv",@"ui",@"userId"];
 
     //SDK重构2.5.0,调整测量协议 2-18-08-09
-    NSArray *vstprome=@[@"u",@"s",@"t",@"tm",@"av",@"d",@"sh",@"sw",@"db",@"dm",@"ph",@"os",@"osv",@"cv",@"sn",@"v",@"l",@"lat",@"lng",@"iv",@"ui",@"cs1",@"gesid",@"esid",@"fv"];
+    NSArray *vstprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"av",@"domain",@"screenHeight",@"screenWidth",@"deviceBrand",@"deviceModel",@"deviceType",@"operatingSystem",@"operatingSystemVersion",@"appVersion",@"appName",@"textValue",@"language",@"latitude",@"longitude",@"iv",@"ui",@"userId",@"globalSequenceId",@"eventSequenceId",@"fv"];
     //对比测量协议结构
     if (vstevent.count>0)
     {
@@ -106,9 +106,9 @@ +(NSDictionary *)VstEventCheck:(NSDictionary *)vstevent
 +(NSDictionary *)ClckEventCheck:(NSDictionary *)clckevent
 {
     NSDictionary *clckchres;
-   // NSArray * clckprome=@[@"u",@"s",@"t",@"tm",@"ppt",@"pctm",@"ptm",@"d",@"p",@"r",@"tm",@"v",@"gesid",@"esid",@"x",@"idx",@"cs1"];
+   // NSArray * clckprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"ppt",@"pctm",@"pageShowTimestamp",@"domain",@"pageName",@"r",@"timestamp",@"textValue",@"globalSequenceId",@"eventSequenceId",@"xpath",@"index",@"userId"];
     //SDK重构2.5.0,调整测量协议 2-18-08-09
-    NSArray * clckprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"v",@"x",@"idx",@"cs1",@"gesid",@"esid"];
+    NSArray * clckprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"textValue",@"xpath",@"index",@"userId",@"globalSequenceId",@"eventSequenceId"];
     //对比测量协议结构
     if (clckevent.count>0)
     {
@@ -117,13 +117,13 @@ +(NSDictionary *)ClckEventCheck:(NSDictionary *)clckevent
     }
     return clckchres;
 }
-//chng事件对比，测量协议字段完整且每个字段不为空
+//VIEW_CHANGE事件对比，测量协议字段完整且每个字段不为空
 +(NSDictionary *)ChngEventCheck:(NSDictionary *)chngevent
 {
     NSDictionary *chngchres;
-    //NSArray * chngprome=@[@"u",@"s",@"t",@"tm",@"ppt",@"pctm",@"ptm",@"d",@"p",@"gesid",@"esid",@"n",@"x",@"v",@"tm",@"cs1"];
+    //NSArray * chngprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"ppt",@"pctm",@"pageShowTimestamp",@"domain",@"pageName",@"globalSequenceId",@"eventSequenceId",@"eventName",@"xpath",@"textValue",@"timestamp",@"userId"];
      //SDK重构2.5.0,调整测量协议 2-18-08-09
-    NSArray * chngprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"n",@"x",@"v",@"tm",@"cs1",@"gesid",@"esid"];
+    NSArray * chngprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"eventName",@"xpath",@"textValue",@"timestamp",@"userId",@"globalSequenceId",@"eventSequenceId"];
     //对比测量协议结构
     if (chngevent.count>0)
     {
@@ -137,11 +137,11 @@ +(NSDictionary *)ChngEventCheck:(NSDictionary *)chngevent
 +(NSDictionary *)ImpEventCheck:(NSDictionary *)impevent
 {
     NSDictionary *impchres;
-    //NSArray * impprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"gesid",@"esid",@"ppt",@"pctm",@"ptm",@"tm",@"n",@"v",@"x",@"idx",@"cs1"];
+    //NSArray * impprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"globalSequenceId",@"eventSequenceId",@"ppt",@"pctm",@"pageShowTimestamp",@"timestamp",@"eventName",@"textValue",@"xpath",@"index",@"userId"];
     //修改测量协议，去掉gesid,esid两项，2018-05-30
-    //NSArray * impprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"ppt",@"pctm",@"ptm",@"tm",@"n",@"v",@"x",@"idx",@"cs1"];
+    //NSArray * impprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"ppt",@"pctm",@"pageShowTimestamp",@"timestamp",@"eventName",@"textValue",@"xpath",@"index",@"userId"];
      //SDK重构2.5.0,调整测量协议 2018-08-09
-    NSArray * impprome=@[@"u",@"s",@"t",@"tm",@"d",@"p",@"tm",@"n",@"v",@"x",@"idx",@"cs1"];
+    NSArray * impprome=@[@"userId",@"sessionId",@"eventType",@"timestamp",@"domain",@"pageName",@"timestamp",@"eventName",@"textValue",@"xpath",@"index",@"userId"];
     //对比测量协议结构
     if (impevent.count>0)
     {

Example/ExampleTests/ManualTrackTest/AppVarEventsTest.m

@@ -29,7 +29,7 @@
 //    if (apvarEventArray.count>=1)
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        XCTAssertTrue([ManualTrackHelper CheckContainsKey:apvarchr :@"var"]);
 //        XCTAssertEqualObjects(apvarchr[@"var"][@"cs2"], @"GIO");
 //        XCTAssertEqualObjects(apvarchr[@"var"][@"cs3"], @"QA");
@@ -88,7 +88,7 @@
 //    if (apvarEventArray.count>=1)
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        NSLog(@"AppVar事件，setAppVariable，var为Dict为空测试通过-----passed");
 //    }
 //    else
@@ -135,7 +135,7 @@
 //    if (apvarEventArray.count>=1)
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        XCTAssertTrue([ManualTrackHelper CheckContainsKey:apvarchr :@"var"]);
 //        XCTAssertEqualObjects(apvarchr[@"var"][@"cs4"], @"Addr BeiJing");
 //        NSLog(@"AppVar事件,setAppVariable:andStringValue设置变量测试通过-----passed");
@@ -165,7 +165,7 @@
 //    if (apvarEventArray.count>=1)
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        XCTAssertTrue([ManualTrackHelper CheckContainsKey:apvarchr :@"var"]);
 //        XCTAssertEqualObjects(apvarchr[@"var"][@"cs4"], @"Addr HeNan");
 //        NSLog(@"AppVar事件,setAppVariable:andStringValue更新变量测试通过-----passed");
@@ -314,7 +314,7 @@
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
 //        //NSLog(@"*****AppVar事件：%@",apvarchr);
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        XCTAssertTrue([ManualTrackHelper CheckContainsKey:apvarchr :@"var"]);
 //        XCTAssertEqual([apvarchr[@"var"][@"cs2"] intValue], 422);
 //        NSLog(@"AppVar事件，setAppVariable:andNumberValue设置变量测试通过-----passed");
@@ -345,7 +345,7 @@
 //    {
 //        NSDictionary *apvarchr=[apvarEventArray objectAtIndex:apvarEventArray.count-1];
 //        //NSLog(@"*****AppVar事件：%@",apvarchr);
-//        XCTAssertEqualObjects(apvarchr[@"t"], @"page");
+//        XCTAssertEqualObjects(apvarchr[@"eventType"], @"page");
 //        XCTAssertTrue([ManualTrackHelper CheckContainsKey:apvarchr :@"var"]);
 //        NSString *floatchr=@"39.82";
 //        XCTAssertEqual([apvarchr[@"var"][@"cs2"] floatValue], [floatchr floatValue]);