Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
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
杨凯
YDL-Component-Medical
Commits
1d990f36
Commit
1d990f36
authored
May 03, 2020
by
何天远
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.隐藏掉声网拨打界面右上角 切换axb文案
2。隐藏掉 超时拨打,弹出axb弹窗 3。修改组建版本号
parent
c4c6a249
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
32 deletions
+33
-32
config.gradle
config.gradle
+1
-1
AudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
+32
-31
No files found.
config.gradle
View file @
1d990f36
...
...
@@ -42,7 +42,7 @@ ext {
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
//第三步 若干
"m-confide"
:
"0.0.48.3
2
"
,
"m-confide"
:
"0.0.48.3
3
"
,
"m-consultant"
:
"0.0.59.15"
,
"m-fm"
:
"0.0.29.3"
,
"m-user"
:
"0.0.60.3"
,
...
...
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
View file @
1d990f36
...
...
@@ -452,8 +452,8 @@ class AudioHomeActivity :
}
private
fun
setClickEvent
()
{
//切换线路
tv_change_route
.
setOnClickListener
{
showChooseDialog
(
1
)
}
//切换线路
隐藏掉切换线路弹窗
//
tv_change_route.setOnClickListener { showChooseDialog(1) }
//挂断
iv_hang_up
.
setOnClickListener
{
if
(
Utils
.
isFastClick
())
{
...
...
@@ -585,7 +585,7 @@ class AudioHomeActivity :
//通话结束或挂断时,上传日志文件
uploadLog
()
showChooseDialog
(
2
)
//
showChooseDialog(2)
}
}
...
...
@@ -684,25 +684,26 @@ class AudioHomeActivity :
/**
* 线路选择弹窗
* 隐藏切换axb弹窗,李云要求的
*/
private
fun
showChooseDialog
(
type
:
Int
)
{
val
dialog
=
AxbConfirmDialog
(
mContext
,
type
,
object
:
AxbConfirmDialog
.
OnClickEnsureListener
{
override
fun
onClickEnsure
()
{
switchAXB
()
}
override
fun
onClose
()
{
// 如果声网未连接成功,切换axb的弹框是自动弹出的,当关闭弹框的时候,执行用户挂断操作
// 如果声网连接成功,点击右上角按钮弹出切换axb弹框,但是关闭时用户不执行挂断操作
if
(!
isConnectSuccess
)
{
userCloseCalling
()
}
}
})
dialog
.
show
()
}
//
private fun showChooseDialog(type: Int) {
//
//
val dialog =
//
AxbConfirmDialog(mContext, type, object : AxbConfirmDialog.OnClickEnsureListener {
//
override fun onClickEnsure() {
//
switchAXB()
//
}
//
//
override fun onClose() {
//
// 如果声网未连接成功,切换axb的弹框是自动弹出的,当关闭弹框的时候,执行用户挂断操作
//
// 如果声网连接成功,点击右上角按钮弹出切换axb弹框,但是关闭时用户不执行挂断操作
//
if (!isConnectSuccess) {
//
userCloseCalling()
//
}
//
}
//
})
//
dialog.show()
//
}
/**
* 切换成axb路线请求
...
...
@@ -775,16 +776,16 @@ class AudioHomeActivity :
tv_change_doctor
.
text
=
"对方暂无应答,正在为您切换线路重播"
tv_change_doctor
.
visibility
=
View
.
VISIBLE
}
//切换线路按钮可见
tv_change_route
.
isEnabled
=
true
tv_change_route
.
setTextColor
(
ContextCompat
.
getColor
(
this
,
R
.
color
.
platform_white
))
tv_change_route
.
setCompoundDrawablesWithIntrinsicBounds
(
null
,
null
,
ContextCompat
.
getDrawable
(
this
,
R
.
drawable
.
audioim_img_choose_arrow
),
null
)
//切换线路按钮可见
,隐藏掉,临时发布版本,李云说的
//
tv_change_route.isEnabled = true
//
tv_change_route.setTextColor(ContextCompat.getColor(this, R.color.platform_white))
//
tv_change_route.setCompoundDrawablesWithIntrinsicBounds(
//
null,
//
null,
//
ContextCompat.getDrawable(this, R.drawable.audioim_img_choose_arrow),
//
null
//
)
}
...
...
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