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
3078e812
Commit
3078e812
authored
May 27, 2020
by
朱璇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix @陈雪 [ios-结束视频弹窗]医生点击结束视频弹窗在结束视频后仍然显示
parent
f16b49e9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
16 deletions
+21
-16
GMDoctorVideoTelephoneWindow.m
...Face/VideoTelephone/window/GMDoctorVideoTelephoneWindow.m
+11
-8
GMUserVideoTelephoneWindow.m
...ToFace/VideoTelephone/window/GMUserVideoTelephoneWindow.m
+10
-8
videoTelephone.mp3
GMAILab/Classes/ToFace/source/videoTelephone.mp3
+0
-0
telephoneDoctor.aiff
telephoneDoctor.aiff
+0
-0
videoTelephone.aiff
videoTelephone.aiff
+0
-0
No files found.
GMAILab/Classes/ToFace/VideoTelephone/window/GMDoctorVideoTelephoneWindow.m
View file @
3078e812
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
GMTTTUser
*
_user
;
//加入进来的医生模型
GMTTTUser
*
_user
;
//加入进来的医生模型
GMLinkPromptView
*
_linePrompView
;
GMLinkPromptView
*
_linePrompView
;
GMUserFillMessageView
*
_userMessagLabel
;
//用户信息
GMUserFillMessageView
*
_userMessagLabel
;
//用户信息
UIAlertController
*
_alert
;
// 时间太短提示弹窗
}
}
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
...
@@ -213,6 +214,12 @@
...
@@ -213,6 +214,12 @@
-
(
void
)
exitRoom
:
(
BOOL
)
status
{
-
(
void
)
exitRoom
:
(
BOOL
)
status
{
[
_functionView
endTime
];
[
_functionView
endTime
];
[
_TTManager
closeExcitRoom
];
[
_TTManager
closeExcitRoom
];
if
(
_alert
)
{
[
_alert
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
self
.
transform
=
CGAffineTransformTranslate
(
self
.
transform
,
0
,
MAINSCREEN_HEIGHT
);
self
.
transform
=
CGAffineTransformTranslate
(
self
.
transform
,
0
,
MAINSCREEN_HEIGHT
);
}
completion
:^
(
BOOL
finished
)
{
}
completion
:^
(
BOOL
finished
)
{
...
@@ -234,19 +241,15 @@
...
@@ -234,19 +241,15 @@
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
if
(
_TTManager
.
totalTime
<
180
)
{
if
(
_TTManager
.
totalTime
<
180
)
{
UIViewController
*
alertVC
=
[[
UIViewController
alloc
]
init
];
_alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"本次视频面诊时间貌似有点短,确定不再聊会儿?"
preferredStyle
:
UIAlertControllerStyleAlert
];
[
self
addSubview
:
alertVC
.
view
];
[
_alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"本次视频面诊时间貌似有点短,确定不再聊会儿?"
preferredStyle
:
UIAlertControllerStyleAlert
];
[
alert
addAction
:[
UIAlertAction
actionWithTitle
:
@"再聊一会"
style
:
UIAlertActionStyleCancel
handler
:
^
(
UIAlertAction
*
_Nonnull
action
)
{
alertVC
.
view
=
nil
;
}]];
}]];
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
alertVC
.
view
=
nil
;
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
}];
}];
[
alert
addAction
:
sureAction
];
[
_
alert
addAction
:
sureAction
];
[
alertVC
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
];
...
...
GMAILab/Classes/ToFace/VideoTelephone/window/GMUserVideoTelephoneWindow.m
View file @
3078e812
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
GMTTTUser
*
doctorUser
;
//加入进来的医生模型
GMTTTUser
*
doctorUser
;
//加入进来的医生模型
GMLinkPromptView
*
_linePrompView
;
GMLinkPromptView
*
_linePrompView
;
GMTelephoneAudioPlay
*
_audioPlay
;
GMTelephoneAudioPlay
*
_audioPlay
;
UIAlertController
*
_alert
;
// 时间太短提示弹窗
}
}
@property
(
nonatomic
,
strong
)
GMRtcManager
*
TTManager
;
@property
(
nonatomic
,
strong
)
GMRtcManager
*
TTManager
;
@property
(
nonatomic
,
strong
)
GMUserTelephoneFunctionView
*
functionView
;
@property
(
nonatomic
,
strong
)
GMUserTelephoneFunctionView
*
functionView
;
...
@@ -317,21 +318,17 @@
...
@@ -317,21 +318,17 @@
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
-
(
void
)
closeRoom
:
(
BOOL
)
status
{
if
(
_TTManager
.
totalTime
<
180
)
{
if
(
_TTManager
.
totalTime
<
180
)
{
UIViewController
*
alertVC
=
[[
UIViewController
alloc
]
init
];
[
self
addSubview
:
alertVC
.
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
];
_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
)
{
alertVC
.
view
=
nil
;
}]];
}]];
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
UIAlertAction
*
sureAction
=
[
UIAlertAction
actionWithTitle
:
@"结束面诊"
style
:
UIAlertActionStyleDefault
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
alertVC
.
view
=
nil
;
[
GMHudModule
showWarning
:
@"通话结束"
];
[
GMHudModule
showWarning
:
@"通话结束"
];
[
self
exitRoom
:
status
];
[
self
exitRoom
:
status
];
}];
}];
[
alert
addAction
:
sureAction
];
[
_
alert
addAction
:
sureAction
];
[
alertVC
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
];
...
@@ -358,6 +355,11 @@
...
@@ -358,6 +355,11 @@
-
(
void
)
exitRoom
:
(
BOOL
)
status
{
-
(
void
)
exitRoom
:
(
BOOL
)
status
{
[
_TTManager
closeExcitRoom
];
[
_TTManager
closeExcitRoom
];
[
_functionView
endTime
];
[
_functionView
endTime
];
if
(
_alert
)
{
[
_alert
dismissViewControllerAnimated
:
YES
completion
:
nil
];
}
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
[
UIView
animateWithDuration
:
0
.
4
animations
:
^
{
self
.
transform
=
CGAffineTransformTranslate
(
self
.
transform
,
0
,
MAINSCREEN_HEIGHT
);
self
.
transform
=
CGAffineTransformTranslate
(
self
.
transform
,
0
,
MAINSCREEN_HEIGHT
);
}
completion
:^
(
BOOL
finished
)
{
}
completion
:^
(
BOOL
finished
)
{
...
...
GMAILab/Classes/ToFace/source/videoTelephone.mp3
deleted
100644 → 0
View file @
f16b49e9
File deleted
GMAILab/Classes/ToFace/source/
telephoneDoctor.aiff
→
telephoneDoctor.aiff
View file @
3078e812
File moved
GMAILab/Classes/ToFace/source/
videoTelephone.aiff
→
videoTelephone.aiff
View file @
3078e812
File moved
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