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
f4bca655
Commit
f4bca655
authored
4 years ago
by
朱璇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix @莹莹 【组件化IOS】1v1和派单连线接通后,用户侧挂断,先提示‘面诊结束’toast,需要再点击1次,才会出现挂断弹窗
parent
96a10fa7
master
ajp/7.29.0_web
lwq
lym/test
revert-ecfaba77
zx/faceTest
1.0.1
1 merge request
!6
bugfix @莹莹 【组件化IOS】1v1和派单连线接通后,用户侧挂断,先提示‘面诊结束’toast,需要再点击1次,才会出现挂断弹窗
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
IDEWorkspaceChecks.plist
...project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8
-0
GMDoctorVideoTelephoneWindow.m
...Face/VideoTelephone/window/GMDoctorVideoTelephoneWindow.m
+7
-1
GMUserVideoTelephoneWindow.m
...ToFace/VideoTelephone/window/GMUserVideoTelephoneWindow.m
+8
-2
No files found.
Example/GMAILab.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
0 → 100644
View file @
f4bca655
<
?xml
v
e
rsion="
1
.
0
"
e
n
c
o
d
ing="UT
F
-
8
"?
>
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
d
i
c
t
>
<
k
e
y
>
IDEDidComputeMac32BitWarning
<
/k
e
y
>
<
tru
e
/
>
<
/
d
i
c
t
>
<
/plist
>
This diff is collapsed.
Click to expand it.
GMAILab/Classes/ToFace/VideoTelephone/window/GMDoctorVideoTelephoneWindow.m
View file @
f4bca655
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
GMTTTUser
*
_user
;
//加入进来的医生模型
GMTTTUser
*
_user
;
//加入进来的医生模型
GMLinkPromptView
*
_linePrompView
;
GMLinkPromptView
*
_linePrompView
;
GMUserFillMessageView
*
_userMessagLabel
;
//用户信息
GMUserFillMessageView
*
_userMessagLabel
;
//用户信息
UIViewController
*
_presentAlert
;
}
}
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
...
@@ -216,6 +217,7 @@
...
@@ -216,6 +217,7 @@
if
([[
GMBaseTool
getCurrentViewController
]
isKindOfClass
:[
UIAlertController
class
]])
{
if
([[
GMBaseTool
getCurrentViewController
]
isKindOfClass
:[
UIAlertController
class
]])
{
[[
GMBaseTool
getCurrentViewController
]
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[[
GMBaseTool
getCurrentViewController
]
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[
_presentAlert
.
view
removeFromSuperview
];
}
}
...
@@ -240,15 +242,19 @@
...
@@ -240,15 +242,19 @@
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
if
(
_TTManager
.
totalTime
<
180
)
{
if
(
_TTManager
.
totalTime
<
180
)
{
_presentAlert
=
[[
UIViewController
alloc
]
init
];
[
self
addSubview
:
_presentAlert
.
view
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"本次视频面诊时间貌似有点短,确定不再聊会儿?"
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"本次视频面诊时间貌似有点短,确定不再聊会儿?"
preferredStyle
:
UIAlertControllerStyleAlert
];
[
alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
[
alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
[
_presentAlert
.
view
removeFromSuperview
];
}]];
}]];
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
[
_presentAlert
.
view
removeFromSuperview
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
}];
}];
[
alert
addAction
:
sureAction
];
[
alert
addAction
:
sureAction
];
[
[
GMBaseTool
getCurrentViewController
]
presentViewController
:
alert
animated
:
YES
completion
:
NULL
];
[
_presentAlert
presentViewController
:
alert
animated
:
YES
completion
:
NULL
];
}
else
{
}
else
{
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
...
...
This diff is collapsed.
Click to expand it.
GMAILab/Classes/ToFace/VideoTelephone/window/GMUserVideoTelephoneWindow.m
View file @
f4bca655
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
GMTTTUser
*
doctorUser
;
//加入进来的医生模型
GMTTTUser
*
doctorUser
;
//加入进来的医生模型
GMLinkPromptView
*
_linePrompView
;
GMLinkPromptView
*
_linePrompView
;
GMTelephoneAudioPlay
*
_audioPlay
;
GMTelephoneAudioPlay
*
_audioPlay
;
UIViewController
*
_presentAlert
;
}
}
@property
(
nonatomic
,
strong
)
GMRtcManager
*
TTManager
;
@property
(
nonatomic
,
strong
)
GMRtcManager
*
TTManager
;
@property
(
nonatomic
,
strong
)
GMUserTelephoneFunctionView
*
functionView
;
@property
(
nonatomic
,
strong
)
GMUserTelephoneFunctionView
*
functionView
;
...
@@ -271,7 +272,6 @@
...
@@ -271,7 +272,6 @@
[
self
phobosName
:
@"hangup"
extent
:
nil
];
[
self
phobosName
:
@"hangup"
extent
:
nil
];
if
(
_TTManager
.
telephoneStatus
==
TelephoneVideoStatus_video
)
{
if
(
_TTManager
.
telephoneStatus
==
TelephoneVideoStatus_video
)
{
//视频中
//视频中
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMVideoPhobos
video_monitoringWithActionStep
:
@"关闭通话页"
consultId
:
_TTManager
.
consultationRecordId
traceId
:
nil
];
[
GMVideoPhobos
video_monitoringWithActionStep
:
@"关闭通话页"
consultId
:
_TTManager
.
consultationRecordId
traceId
:
nil
];
[
self
closeRoom
:
YES
];
[
self
closeRoom
:
YES
];
}
else
{
}
else
{
...
@@ -317,17 +317,22 @@
...
@@ -317,17 +317,22 @@
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
if
(
_TTManager
.
totalTime
<
180
)
{
if
(
_TTManager
.
totalTime
<
180
)
{
_presentAlert
=
[[
UIViewController
alloc
]
init
];
[
self
addSubview
:
_presentAlert
.
view
];
NSString
*
title
=
_TTManager
.
vidoeTelephoneModel
.
counsellorInfo
.
counsellorType
==
2
?
@"面诊师"
:
@"医生"
;
NSString
*
title
=
_TTManager
.
vidoeTelephoneModel
.
counsellorInfo
.
counsellorType
==
2
?
@"面诊师"
:
@"医生"
;
NSString
*
name
=
[
NSString
stringWithFormat
:
@"%@擅长很多项目,可以多咨询呦"
,
title
];
NSString
*
name
=
[
NSString
stringWithFormat
:
@"%@擅长很多项目,可以多咨询呦"
,
title
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
name
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
name
preferredStyle
:
UIAlertControllerStyleAlert
];
[
alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
[
alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
[
_presentAlert
.
view
removeFromSuperview
];
}]];
}]];
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
[
_presentAlert
.
view
removeFromSuperview
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
}];
}];
[
alert
addAction
:
sureAction
];
[
alert
addAction
:
sureAction
];
[[
GMBaseTool
getCurrentViewController
]
presentViewController
:
alert
animated
:
YES
completion
:
NULL
];
[
_presentAlert
presentViewController
:
alert
animated
:
YES
completion
:
NULL
];
// [[GMBaseTool getCurrentViewController] presentViewController:alert animated:YES completion:NULL];
}
else
{
}
else
{
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
...
@@ -357,6 +362,7 @@
...
@@ -357,6 +362,7 @@
if
([[
GMBaseTool
getCurrentViewController
]
isKindOfClass
:[
UIAlertController
class
]])
{
if
([[
GMBaseTool
getCurrentViewController
]
isKindOfClass
:[
UIAlertController
class
]])
{
[[
GMBaseTool
getCurrentViewController
]
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[[
GMBaseTool
getCurrentViewController
]
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[
_presentAlert
.
view
removeFromSuperview
];
}
}
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
...
...
This diff is collapsed.
Click to expand it.
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