Merge branch 'zx/faceTest' into 'master'

Zx/face test

See merge request !5

GMAILab/Classes/ToFace/VideoTelephone/manager/GMDoctorVideoTelephoneLogin.m

@@ -115,7 +115,7 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
 
 #pragma mark - 初始化直播间
 - (void)doctorLoginVideoRoomModel:(GMVideoTelephoneModel *)model {
-    _uid = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];;
+    _uid = [[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"] longLongValue];
     _channelId = model.channelId;
     _pushURL = model.streamUrl;
     _neteaseModel = model.neteaseIm;
@@ -162,7 +162,7 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
     _telephoneView.model = model;
     _telephoneView.delegate = self;
     [[UIApplication sharedApplication].keyWindow addSubview:_telephoneView];
-
+    [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.One2One.EvokeRecordPageSuceess" status:@"success" extraParam:@{@"consultation_record_id": SafeString(model.consultationRecordId)}];
 }
 
 #pragma mark - 点击接受或是挂断
@@ -238,9 +238,6 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
     _window = [[GMDoctorVideoTelephoneWindow alloc]  initWithFrame:CGRectMake(0, 0, MAINSCREEN_WIDTH, MAINSCREEN_HEIGHT)];
     _window.delgate = self;
     [[UIApplication sharedApplication].keyWindow addSubview:_window];
-
-    [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.One2One.EvokeRecordPageSuceess" status:@"success" extraParam:@{@"consultation_record_id": SafeString(_videoModel.consultationRecordId)}];
-
 }
 
 #pragma mark - TTTRtcEngineDelegate初始化成功

GMAILab/Classes/ToFace/VideoTelephone/manager/GMUserVideoTelephoneLogin.m

@@ -125,8 +125,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
 
 #pragma mark - 初始化直播间
 - (void)userLoginVideoRoomModel:(GMVideoTelephoneModel *)model  {
-    
-    _uid = (NSInteger)[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"];
+    _uid = [[[GMRouter sharedInstance] pushScheme:@"gengmei://gm_userId"] longLongValue];
     _channelId = model.channelId;
     _pushURL = model.streamUrl;
     _neteaseModel = model.neteaseIm;
@@ -223,7 +222,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
             _joinChannelRetryCount--;
         });
     } else {
-        [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.Santi.OnJoinError" status:@"failed" extraParam:@{@"order_no": SafeString(_messageDict[@"order_no"]), @"consultation_record_id": SafeString(_messageDict[@"consultation_record_id"]), @"channel_id": SafeString(_channelId), @"error_code": @(errorCode)}];
+        [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.Santi.OnJoinError" status:@"failed" extraParam:@{@"order_no": SafeString(_messageDict[@"order_no"]), @"consultation_record_id": SafeString(TTManager.consultationRecordId), @"channel_id": SafeString(_channelId), @"error_code": @(errorCode)}];
         [self uploadFailedRecordWithErrorInfo:errorInfo];
     }
 }

GMAILab/Classes/ToFace/Waiting/GMVideoWaitingView.m

@@ -217,7 +217,7 @@
             [dict setValue:@(weakSelf.consultationType) forKey:@"consultation_type"];
             weakSelf.successView.info = dict;
             if (!isNotify) {
-                [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.Dispatch.PollDispatch" status:@"success" extraParam:@{@"consultation_record_id": SafeString(dict[@"consultation_record_id"])}];
+                [GMVideoPhobos consultation_traceWithActionStep:@"Consultation.Dispatch.PollDispatched" status:@"success" extraParam:@{@"consultation_record_id": SafeString(dict[@"consultation_record_id"])}];
             }
             [GMVideoPhobos video_monitoringWithActionStep:@"用户客户端收到匹配成功回执" consultId:weakSelf.successView.info[@"consultation_record_id"] traceId:nil];
         }