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
81ae4930
Commit
81ae4930
authored
Apr 01, 2021
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 声网埋点替换成net工具
parent
6f104313
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 deletions
+16
-15
config.gradle
config.gradle
+2
-2
AudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
+4
-4
YDLavManager.kt
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
+8
-5
ConsultantAudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
+2
-4
No files found.
config.gradle
View file @
81ae4930
...
@@ -39,7 +39,7 @@ ext {
...
@@ -39,7 +39,7 @@ ext {
"ydl-webview"
:
"0.0.38.38"
,
"ydl-webview"
:
"0.0.38.38"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-pay"
:
"0.0.18.16"
,
"ydl-pay"
:
"0.0.18.16"
,
"m-audioim"
:
"0.0.49.29.3
2
"
,
"m-audioim"
:
"0.0.49.29.3
3
"
,
"ydl-flutter-base"
:
"0.0.14.20"
,
"ydl-flutter-base"
:
"0.0.14.20"
,
//以下 几乎不会动
//以下 几乎不会动
...
@@ -121,7 +121,7 @@ ext {
...
@@ -121,7 +121,7 @@ ext {
"ydl-webview"
:
"0.0.38.38"
,
"ydl-webview"
:
"0.0.38.38"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-pay"
:
"0.0.18.16"
,
"ydl-pay"
:
"0.0.18.16"
,
"m-audioim"
:
"0.0.49.29.3
2
"
,
"m-audioim"
:
"0.0.49.29.3
3
"
,
"ydl-flutter-base"
:
"0.0.14.20"
,
"ydl-flutter-base"
:
"0.0.14.20"
,
//以下 几乎不会动
//以下 几乎不会动
...
...
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
View file @
81ae4930
...
@@ -50,10 +50,10 @@ import com.ydl.ydlcommon.utils.LogUtil
...
@@ -50,10 +50,10 @@ import com.ydl.ydlcommon.utils.LogUtil
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.log.AliYunLogConfig
import
com.ydl.ydlcommon.utils.log.AliYunLogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlnet.utils.log.AliYunLogConfig
import
com.ydl.ydlnet.utils.log.AliYunLogHelper
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.user.api.service.IUserService
import
com.yidianling.user.api.service.IUserService
import
de.greenrobot.event.EventBus
import
de.greenrobot.event.EventBus
...
@@ -453,7 +453,7 @@ class AudioHomeActivity :
...
@@ -453,7 +453,7 @@ class AudioHomeActivity :
initIntentData
()
initIntentData
()
writeAgoraLog
(
"通话页面打开的时候,RTM登录状态码:${YDLavManager.sdkStatus}"
)
writeAgoraLog
(
"通话页面打开的时候,RTM登录状态码:${YDLavManager.sdkStatus}"
)
AliYunLogHelper
.
getInstance
()
AliYunLogHelper
.
getInstance
()
.
sendLog
(
AliYunLogConfig
.
AGORA
,
"通话页面打开的时候,RTM登录状态码:${YDLavManager.sdkStatus}"
)
.
sendLog
(
AliYunLogConfig
.
RTM
,
"通话页面打开的时候,RTM登录状态码:${YDLavManager.sdkStatus}"
)
if
(
YDLavManager
.
sdkStatus
!=
Constants
.
CONNECTION_STATE_CONNECTED
)
{
if
(
YDLavManager
.
sdkStatus
!=
Constants
.
CONNECTION_STATE_CONNECTED
)
{
//再次登录声网,确保声网登录状态
//再次登录声网,确保声网登录状态
reLoginRTM
()
reLoginRTM
()
...
@@ -536,7 +536,7 @@ class AudioHomeActivity :
...
@@ -536,7 +536,7 @@ class AudioHomeActivity :
private
fun
reLoginRTM
()
{
private
fun
reLoginRTM
()
{
writeAgoraLog
(
"RMT状态:${YDLavManager.sdkStatus},重新登录RMT"
)
writeAgoraLog
(
"RMT状态:${YDLavManager.sdkStatus},重新登录RMT"
)
AliYunLogHelper
.
getInstance
()
AliYunLogHelper
.
getInstance
()
.
sendLog
(
AliYunLogConfig
.
AGORA
,
"RMT状态:${YDLavManager.sdkStatus},重新登录RMTt"
)
.
sendLog
(
AliYunLogConfig
.
RTM
,
"RMT状态:${YDLavManager.sdkStatus},重新登录RMTt"
)
val
uid
=
YdlCommonRouterManager
.
getYdlCommonRoute
().
getUid
().
toString
()
val
uid
=
YdlCommonRouterManager
.
getYdlCommonRoute
().
getUid
().
toString
()
YDLavManager
.
instances
.
login
(
uid
)
{
_isSuccess
,
_msg
->
YDLavManager
.
instances
.
login
(
uid
)
{
_isSuccess
,
_msg
->
// writeAgoraLog("拨打电话界面打开RTM重新登录,uid=${uid}")
// writeAgoraLog("拨打电话界面打开RTM重新登录,uid=${uid}")
...
...
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
View file @
81ae4930
...
@@ -25,9 +25,9 @@ import com.ydl.ydl_av.messge_service.response.CallRemoteResponse
...
@@ -25,9 +25,9 @@ import com.ydl.ydl_av.messge_service.response.CallRemoteResponse
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.LogUtil
import
com.ydl.ydlcommon.utils.LogUtil
import
com.ydl.ydlcommon.utils.log.AliYunLogConfig
import
com.ydl.ydlcommon.utils.log.AliYunLogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlnet.utils.log.AliYunLogConfig
import
com.ydl.ydlnet.utils.log.AliYunLogHelper
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
import
com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
import
com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack
import
com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack
...
@@ -309,6 +309,8 @@ class YDLavManager {
...
@@ -309,6 +309,8 @@ class YDLavManager {
toUid
:
String
,
toUid
:
String
,
content
:
String
content
:
String
)
{
)
{
// LogUtil.e("[agora]收到云信的通知消息:$content")
// LogUtil.e("[agora]收到云信的通知消息:$content")
// val agoraInvitationBean = Gson().fromJson(content, AgoraInvitationBean::class.java)
// val agoraInvitationBean = Gson().fromJson(content, AgoraInvitationBean::class.java)
...
@@ -409,7 +411,7 @@ class YDLavManager {
...
@@ -409,7 +411,7 @@ class YDLavManager {
// writeAgoraLog("云信发送通话邀请异常${throwable.message}-------Time:${AudioLogUtils.format.format(Calendar.getInstance().time)}", "confide.log", true)
// writeAgoraLog("云信发送通话邀请异常${throwable.message}-------Time:${AudioLogUtils.format.format(Calendar.getInstance().time)}", "confide.log", true)
// LogHelper.getInstance().uploadLog(false)
// LogHelper.getInstance().uploadLog(false)
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogConfig
.
AGORA
,
AliYunLogConfig
.
YUNXIN
,
"云信发送通话邀请异常${throwable.message}"
"云信发送通话邀请异常${throwable.message}"
)
)
}
}
...
@@ -418,7 +420,7 @@ class YDLavManager {
...
@@ -418,7 +420,7 @@ class YDLavManager {
// writeAgoraLog("云信发送通话邀请失败${code}-------Time:${AudioLogUtils.format.format(Calendar.getInstance().time)}", "confide.log", true)
// writeAgoraLog("云信发送通话邀请失败${code}-------Time:${AudioLogUtils.format.format(Calendar.getInstance().time)}", "confide.log", true)
// LogHelper.getInstance().uploadLog(false)
// LogHelper.getInstance().uploadLog(false)
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogConfig
.
AGORA
,
AliYunLogConfig
.
YUNXIN
,
"云信发送通话邀请失败${code}"
"云信发送通话邀请失败${code}"
)
)
}
}
...
@@ -430,7 +432,7 @@ class YDLavManager {
...
@@ -430,7 +432,7 @@ class YDLavManager {
true
true
)
)
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogConfig
.
AGORA
,
AliYunLogConfig
.
YUNXIN
,
"云信发送通话邀请成功"
"云信发送通话邀请成功"
)
)
}
}
...
@@ -449,6 +451,7 @@ class YDLavManager {
...
@@ -449,6 +451,7 @@ class YDLavManager {
if
(
TextUtils
.
isEmpty
(
userId
)
||
userId
?:
"0"
<=
"0"
)
{
if
(
TextUtils
.
isEmpty
(
userId
)
||
userId
?:
"0"
<=
"0"
)
{
//如果uid为空或小于等于0 ,则不进行登录,因为uid为0也会登录成功,会导致后面uid正确时无法登录
//如果uid为空或小于等于0 ,则不进行登录,因为uid为0也会登录成功,会导致后面uid正确时无法登录
LogUtil
.
e
(
"[agora]login-uid:$userId"
)
LogUtil
.
e
(
"[agora]login-uid:$userId"
)
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogConfig
.
AGORA
,
"uid为空或小于等于0 ,则不进行登录 login-uid:$userId"
)
return
return
}
}
isOnlineRtm
=
true
isOnlineRtm
=
true
...
...
m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
View file @
81ae4930
...
@@ -47,10 +47,10 @@ import com.ydl.ydlcommon.utils.LogUtil
...
@@ -47,10 +47,10 @@ import com.ydl.ydlcommon.utils.LogUtil
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.Utils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.log.AliYunLogConfig
import
com.ydl.ydlcommon.utils.log.AliYunLogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlcommon.utils.log.LogHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlnet.utils.log.AliYunLogConfig
import
com.ydl.ydlnet.utils.log.AliYunLogHelper
import
com.yidianling.user.api.service.IUserService
import
com.yidianling.user.api.service.IUserService
import
de.greenrobot.event.EventBus
import
de.greenrobot.event.EventBus
import
io.agora.rtc.Constants
import
io.agora.rtc.Constants
...
@@ -250,8 +250,6 @@ class ConsultantAudioHomeActivity :
...
@@ -250,8 +250,6 @@ class ConsultantAudioHomeActivity :
override
fun
onUserOffline
(
uid
:
Int
,
elapsed
:
Int
)
{
override
fun
onUserOffline
(
uid
:
Int
,
elapsed
:
Int
)
{
super
.
onUserOffline
(
uid
,
elapsed
)
super
.
onUserOffline
(
uid
,
elapsed
)
LogUtil
.
e
(
"[agora]$uid 主播离开频道回调"
)
LogUtil
.
e
(
"[agora]$uid 主播离开频道回调"
)
AliYunLogHelper
.
getInstance
().
sendLog
(
AliYunLogConfig
.
AGORA
,
"$uid 主播离开频道回调"
)
runOnUiThread
{
runOnUiThread
{
YDLavManager
.
instances
.
callEndStatusUpdate
(
YDLavManager
.
instances
.
callEndStatusUpdate
(
mAudioMessageBean
?.
channelId
!!
,
mAudioMessageBean
?.
channelId
!!
,
...
...
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