Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
GMAILab
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
GMAILab
Commits
cc58ea4f
Commit
cc58ea4f
authored
Jun 11, 2020
by
朱璇
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zx/faceTest' into 'master'
Zx/face test See merge request
!4
parents
1c632d62
6625c532
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
GMBasicInfoCardView.m
...lasses/ToFace/ToFaceDoctorList/View/GMBasicInfoCardView.m
+2
-2
GMDoctorVideoTelephoneLogin.m
...Face/VideoTelephone/manager/GMDoctorVideoTelephoneLogin.m
+4
-4
GMUserVideoTelephoneLogin.m
...ToFace/VideoTelephone/manager/GMUserVideoTelephoneLogin.m
+1
-1
GMWaitingGrabListViewController.m
...ingTable/ViewController/GMWaitingGrabListViewController.m
+0
-2
No files found.
GMAILab/Classes/ToFace/ToFaceDoctorList/View/GMBasicInfoCardView.m
View file @
cc58ea4f
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
}
}
// 埋点
// 埋点
if
(
!
self
.
isDispatch
)
{
if
(
!
self
.
isDispatch
)
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.LaunchButtion.Click"
status
:
@"success"
extraParam
:
@{
@"counsellor_id"
:
self
.
counsellorId
,
@"referer"
:
SafeString
(
self
.
referer
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.LaunchButtion.Click"
status
:
@"success"
extraParam
:
@{
@"counsellor_id"
:
SafeString
(
self
.
counsellorId
)
,
@"referer"
:
SafeString
(
self
.
referer
)}];
}
}
[
self
payMoney
];
[
self
payMoney
];
}
}
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
-
(
void
)
consultation_traceWithStatus
:
(
NSString
*
)
status
{
-
(
void
)
consultation_traceWithStatus
:
(
NSString
*
)
status
{
// 埋点
// 埋点
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.CreateOrder"
status
:
status
extraParam
:
@{
@"counsellor_id"
:
SafeString
(
self
.
counsellorId
),
@"order_no"
:
SafeString
(
self
.
orderNo
),
@"referer"
:
SafeString
(
self
.
referer
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.CreateOrder"
status
:
status
extraParam
:
@{
@"order_no"
:
SafeString
(
self
.
orderNo
)}];
}
}
#pragma mark - 需要付款,先付款、后面诊
#pragma mark - 需要付款,先付款、后面诊
...
...
GMAILab/Classes/ToFace/VideoTelephone/manager/GMDoctorVideoTelephoneLogin.m
View file @
cc58ea4f
...
@@ -200,9 +200,9 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
...
@@ -200,9 +200,9 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
[
GMVideoTelephoneRequestTool
telephoneMessageEventType
:
GMEventType_juJue
consultationRecordId
:
model
.
consultationRecordId
finishBlock
:^
(
BOOL
success
,
NSDictionary
*
message
)
{
[
GMVideoTelephoneRequestTool
telephoneMessageEventType
:
GMEventType_juJue
consultationRecordId
:
model
.
consultationRecordId
finishBlock
:^
(
BOOL
success
,
NSDictionary
*
message
)
{
if
(
success
)
{
if
(
success
)
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.Reject
.Click
"
status
:
@"success"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
model
.
consultationRecordId
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.Reject"
status
:
@"success"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
model
.
consultationRecordId
)}];
}
else
{
}
else
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.Reject
.Click
"
status
:
@"failed"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
model
.
consultationRecordId
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.One2One.Reject"
status
:
@"failed"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
model
.
consultationRecordId
)}];
}
}
}];
}];
...
@@ -249,12 +249,12 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
...
@@ -249,12 +249,12 @@ static GMDoctorVideoTelephoneLogin *loginManager = nil;
if
(
_neteaseModel
&&
[
_neteaseModel
.
toAccountId
isNonEmpty
]
&&
[
_neteaseModel
.
channelId
isNonEmpty
])
{
if
(
_neteaseModel
&&
[
_neteaseModel
.
toAccountId
isNonEmpty
]
&&
[
_neteaseModel
.
channelId
isNonEmpty
])
{
[[
GMNimChannelManager
shareInstance
]
doJoinAndInviteJoinChannelWithChannelId
:
_neteaseModel
.
channelId
accountId
:
_neteaseModel
.
toAccountId
customInfo
:
_neteaseModel
.
inviteExt
resultBlock
:^
(
BOOL
isSuccess
)
{
[[
GMNimChannelManager
shareInstance
]
doJoinAndInviteJoinChannelWithChannelId
:
_neteaseModel
.
channelId
accountId
:
_neteaseModel
.
toAccountId
customInfo
:
_neteaseModel
.
inviteExt
resultBlock
:^
(
BOOL
isSuccess
)
{
if
(
!
isSuccess
)
{
if
(
!
isSuccess
)
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.NeteaseIM.ReadySend"
status
:
@"failed"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
TTManager
.
consultationRecordId
),
@"channel_id"
:
SafeString
(
_channelId
),
@"user_id"
:
SafeString
(
_neteaseModel
.
toAccountId
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.NeteaseIM.ReadySend"
status
:
@"failed"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
TTManager
.
consultationRecordId
),
@"channel_id"
:
SafeString
(
_
neteaseModel
.
channelId
),
@"user_id"
:
SafeString
(
_neteaseModel
.
toAccountId
)}];
#ifdef DEBUG
#ifdef DEBUG
[[
GMBaseTool
getCurrentViewController
]
toast
:
@"doJoinAndInviteJoinChannelWithChannelId失败"
];
[[
GMBaseTool
getCurrentViewController
]
toast
:
@"doJoinAndInviteJoinChannelWithChannelId失败"
];
#endif
#endif
}
else
{
}
else
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.NeteaseIM.ReadySend"
status
:
@"success"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
TTManager
.
consultationRecordId
),
@"channel_id"
:
SafeString
(
_channelId
),
@"user_id"
:
SafeString
(
_neteaseModel
.
toAccountId
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.NeteaseIM.ReadySend"
status
:
@"success"
extraParam
:
@{
@"consultation_record_id"
:
SafeString
(
TTManager
.
consultationRecordId
),
@"channel_id"
:
SafeString
(
_
neteaseModel
.
channelId
),
@"user_id"
:
SafeString
(
_neteaseModel
.
toAccountId
)}];
}
}
}];
}];
}
}
...
...
GMAILab/Classes/ToFace/VideoTelephone/manager/GMUserVideoTelephoneLogin.m
View file @
cc58ea4f
...
@@ -162,7 +162,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
...
@@ -162,7 +162,7 @@ static GMUserVideoTelephoneLogin *loginManager = nil;
BOOL
swapWH
=
UIInterfaceOrientationIsPortrait
(
UIApplication
.
sharedApplication
.
statusBarOrientation
);
BOOL
swapWH
=
UIInterfaceOrientationIsPortrait
(
UIApplication
.
sharedApplication
.
statusBarOrientation
);
[
rtcEngine
setVideoProfile
:
TTTRtc_VideoProfile_720P
swapWidthAndHeight
:
swapWH
];
[
rtcEngine
setVideoProfile
:
TTTRtc_VideoProfile_720P
swapWidthAndHeight
:
swapWH
];
[
rtcEngine
joinChannelByKey
:
nil
channelName
:
_channelId
uid
:
_uid
joinSuccess
:
nil
];
[
rtcEngine
joinChannelByKey
:
nil
channelName
:
_channelId
uid
:
_uid
joinSuccess
:
nil
];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Santi.Join"
status
:
@"success"
extraParam
:
@{
@"order_no"
:
SafeString
(
_messageDict
[
@"order_no"
]),
@"consultation_record_id"
:
SafeString
(
_messageDict
[
@"consultation_record_id"
]
),
@"channel_id"
:
SafeString
(
_channelId
)}];
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Santi.Join"
status
:
@"success"
extraParam
:
@{
@"order_no"
:
SafeString
(
_messageDict
[
@"order_no"
]),
@"consultation_record_id"
:
SafeString
(
model
.
consultationRecordId
),
@"channel_id"
:
SafeString
(
_channelId
)}];
}
}
...
...
GMAILab/Classes/ToFace/WorkingTable/ViewController/GMWaitingGrabListViewController.m
View file @
cc58ea4f
...
@@ -94,13 +94,11 @@
...
@@ -94,13 +94,11 @@
__weak
typeof
(
self
)
weakSelf
=
self
;
__weak
typeof
(
self
)
weakSelf
=
self
;
[
self
.
viewModel
fetchWaitingListData
:
^
(
APIStatusCode
apiStatus
,
NSString
*
message
)
{
[
self
.
viewModel
fetchWaitingListData
:
^
(
APIStatusCode
apiStatus
,
NSString
*
message
)
{
if
(
APIStatusCodeFailed
==
apiStatus
)
{
// 失败
if
(
APIStatusCodeFailed
==
apiStatus
)
{
// 失败
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.PollDispatch"
status
:
@"failed"
extraParam
:
@{
@"consultation_record_id"
:
@""
}];
[
weakSelf
showEmptyView
:
GMEmptyViewTypeException
];
[
weakSelf
showEmptyView
:
GMEmptyViewTypeException
];
if
([
message
isNonEmpty
])
{
if
([
message
isNonEmpty
])
{
[
weakSelf
toast
:
message
];
[
weakSelf
toast
:
message
];
}
}
}
else
{
}
else
{
[
GMVideoPhobos
consultation_traceWithActionStep
:
@"Consultation.Dispatch.PollDispatch"
status
:
@"success"
extraParam
:
@{
@"consultation_record_id"
:
@""
}];
if
(
apiStatus
==
APIStatusCodeEmpty
)
{
// 空
if
(
apiStatus
==
APIStatusCodeEmpty
)
{
// 空
[
weakSelf
showEmptyView
:
GMEmptyViewTypeEmpty
];
[
weakSelf
showEmptyView
:
GMEmptyViewTypeEmpty
];
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment