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
476be0fd
Commit
476be0fd
authored
Jun 28, 2022
by
万齐军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理重复收到通话拒绝
parent
31c71584
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
33 deletions
+22
-33
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
MainActivity.kt
app/src/main/java/com/ydl/component/MainActivity.kt
+1
-2
activity_main.xml
app/src/main/res/layout/activity_main.xml
+3
-2
AudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
+16
-8
YDLavManager.kt
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
+1
-21
No files found.
app/src/main/AndroidManifest.xml
View file @
476be0fd
...
...
@@ -12,6 +12,7 @@
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.CHANGE_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<uses-permission
android:name=
"android.permission.USE_BIOMETRIC"
/>
<application
android:name=
".base.ComponentTestApp"
...
...
app/src/main/java/com/ydl/component/MainActivity.kt
View file @
476be0fd
...
...
@@ -34,7 +34,6 @@ import com.yidianling.muse.event.MeditationFloatEvent
import
com.yidianling.muse.helper.MediaPlayerManager
import
com.yidianling.muse.service.MeditationWindowService
import
com.yidianling.tests.home.NewTestHomeActivity
import
com.yidianling.user.StatusUtils
import
com.yidianling.user.api.service.IUserService
import
com.yidianling.user.ui.collect.CollectSexAndBirthActivity
import
com.yidianling.user.ui.login.OneKeyLoginHelp
...
...
@@ -96,7 +95,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
bindService
()
bindMeditationService
()
reLoadData
()
//
reLoadData()
requestPermission
()
bt_mdt
.
setOnClickListener
{
val
intent
=
Intent
(
this
,
MDTLoginActivity
::
class
.
java
)
...
...
app/src/main/res/layout/activity_main.xml
View file @
476be0fd
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
@@ -231,6 +230,7 @@
<com.ydl.ydlcommon.mvp.lce.view.YDLStateView
android:id=
"@+id/lce_state_view"
android:layout_width=
"match_parent"
android:layout_height=
"30dp"
/>
android:layout_height=
"30dp"
android:visibility=
"gone"
/>
</LinearLayout>
\ No newline at end of file
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
View file @
476be0fd
...
...
@@ -231,6 +231,8 @@ class AudioHomeActivity :
private
var
canChangeRoute
:
Boolean
=
false
private
var
hasHandleRefused
=
false
private
val
notificationCallback
=
object
:
IMRegisterObserverCustomNotificationCallBack
{
override
fun
onObserverCustomNotification
(
fromUid
:
String
,
toUid
:
String
,
content
:
String
)
{
if
(
fromUid
==
listenerUid
)
{
...
...
@@ -240,11 +242,24 @@ class AudioHomeActivity :
"2"
->
{
//接受
runOnUiThread
{
joinChannel
()
onPeerAccepted
()
}
}
"4"
->
{
//拒绝
onCallRefused
()
}
}
}
catch
(
throwable
:
Throwable
)
{
LogUtil
.
e
(
throwable
.
message
)
}
}
}
}
fun
onCallRefused
()
{
runOnUiThread
{
if
(
hasHandleRefused
)
return
@runOnUiThread
hasHandleRefused
=
true
YDLavManager
.
instances
.
callEndStatusUpdate
(
channelId
?:
""
,
2
,
"被叫拒绝"
)
ToastUtil
.
toastShort
(
"对方已挂断"
)
writeAgoraLog
(
"被叫(专家)拒绝了通话邀请"
)
//通话结束或挂断时,上传日志文件
...
...
@@ -253,13 +268,6 @@ class AudioHomeActivity :
uploadExceptionStatus
(
"对方已拒绝"
,
2
)
}
}
}
}
catch
(
throwable
:
Throwable
)
{
LogUtil
.
e
(
throwable
.
message
)
}
}
}
}
/**
* 声网事件回调 (SDK 通过指定的事件通知应用程序 SDK 的运行事件,如: 加入或离开频道,新用户加入频道等)
...
...
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
View file @
476be0fd
...
...
@@ -30,8 +30,6 @@ import com.ydl.ydlcommon.utils.LogUtil
import
com.ydl.ydlcommon.utils.log.AliYunLogConfig
import
com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
import
com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack
import
com.yidianling.user.api.event.UserLoginEvent
import
com.yidianling.user.api.event.UserLogoutEvent
...
...
@@ -139,15 +137,7 @@ class YDLavManager {
onConfideEvent
(
dimension
,
response
?.
ChannelId
)
val
act
=
ActivityManager
.
getInstance
().
getTopTaskActivity
()
if
(
act
is
AudioHomeActivity
)
{
act
.
runOnUiThread
{
callEndStatusUpdate
(
response
?.
ChannelId
!!
,
2
,
"被叫拒绝"
)
ToastUtil
.
toastShort
(
"对方已挂断"
)
act
.
writeAgoraLog
(
"被叫(专家)拒绝了通话邀请"
)
//通话结束或挂断时,上传日志文件
act
.
uploadLog
()
act
.
leaveChannel
()
act
.
uploadExceptionStatus
(
"对方已拒绝"
,
2
)
}
act
.
onCallRefused
()
}
}
...
...
@@ -316,16 +306,6 @@ class YDLavManager {
}
}
})
AudioImIn
.
registerObserveCustomNotification
(
object
:
IMRegisterObserverCustomNotificationCallBack
{
override
fun
onObserverCustomNotification
(
fromUid
:
String
,
toUid
:
String
,
content
:
String
)
{
}
})
}
fun
rtcCall
(
listenerUid
:
String
?,
channelId
:
String
?,
sendDoctocrMsg
:
String
?)
{
...
...
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