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
8c3b433e
Commit
8c3b433e
authored
5 years ago
by
严久程
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
通话结束后增加接口调用
parent
82809e56
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
135 additions
and
29 deletions
+135
-29
config.gradle
config.gradle
+7
-7
AudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
+0
-0
YDLavManager.kt
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
+96
-15
AgoraInvitationBean.java
m-audioim/src/main/java/com/ydl/audioim/bean/AgoraInvitationBean.java
+14
-0
AudioApiRequestUtil.kt
m-audioim/src/main/java/com/ydl/audioim/http/AudioApiRequestUtil.kt
+11
-5
AudioNetAPi.kt
m-audioim/src/main/java/com/ydl/audioim/http/AudioNetAPi.kt
+4
-0
ConsultantAudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
+0
-0
ImObserversHelper.kt
m-im/src/main/java/com/yidianling/im/helper/ImObserversHelper.kt
+1
-1
IMRegisterObserverCustomNotificationCallBack.kt
m-im/src/main/modular_api/com/yidianling/im/api/bean/IMRegisterObserverCustomNotificationCallBack.kt
+2
-1
No files found.
config.gradle
View file @
8c3b433e
ext
{
ext
{
kotlin_version
=
"1.3.21"
kotlin_version
=
"1.3.21"
dev_mode
=
tru
e
dev_mode
=
fals
e
ydlPublishVersion
=
[
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
// -------------- 业务模块 --------------
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.48.
23
"
,
"m-confide"
:
"0.0.48.
42
"
,
"m-consultant"
:
"0.0.59.10"
,
"m-consultant"
:
"0.0.59.10"
,
"m-fm"
:
"0.0.29.9"
,
"m-fm"
:
"0.0.29.9"
,
"m-user"
:
"0.0.60.8"
,
"m-user"
:
"0.0.60.8"
,
"m-home"
:
"0.0.22.3"
,
"m-home"
:
"0.0.22.3"
,
"m-im"
:
"0.0.18.
4
"
,
"m-im"
:
"0.0.18.
5
"
,
"m-dynamic"
:
"0.0.7.7"
,
"m-dynamic"
:
"0.0.7.7"
,
"m-article"
:
"0.0.0.5"
,
"m-article"
:
"0.0.0.5"
,
...
@@ -28,7 +28,7 @@ ext {
...
@@ -28,7 +28,7 @@ ext {
"m-tests-api"
:
"0.0.2"
,
"m-tests-api"
:
"0.0.2"
,
"m-user-api"
:
"0.0.10.15"
,
"m-user-api"
:
"0.0.10.15"
,
"m-home-api"
:
"0.0.4.1"
,
"m-home-api"
:
"0.0.4.1"
,
"m-im-api"
:
"0.0.12.
19
"
,
"m-im-api"
:
"0.0.12.
20
"
,
"m-dynamic-api"
:
"0.0.3.7"
,
"m-dynamic-api"
:
"0.0.3.7"
,
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
...
@@ -39,7 +39,7 @@ ext {
...
@@ -39,7 +39,7 @@ ext {
"ydl-webview"
:
"0.0.38.31"
,
"ydl-webview"
:
"0.0.38.31"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-pay"
:
"0.0.18.9"
,
"ydl-pay"
:
"0.0.18.9"
,
"m-audioim"
:
"0.0.49.
2
"
,
"m-audioim"
:
"0.0.49.
13
"
,
"ydl-flutter-base"
:
"0.0.14.14"
,
"ydl-flutter-base"
:
"0.0.14.14"
,
//以下 几乎不会动
//以下 几乎不会动
...
@@ -111,7 +111,7 @@ ext {
...
@@ -111,7 +111,7 @@ ext {
"m-tests-api"
:
"0.0.2"
,
"m-tests-api"
:
"0.0.2"
,
"m-user-api"
:
"0.0.10.15"
,
"m-user-api"
:
"0.0.10.15"
,
"m-home-api"
:
"0.0.4.1"
,
"m-home-api"
:
"0.0.4.1"
,
"m-im-api"
:
"0.0.12.
18
"
,
"m-im-api"
:
"0.0.12.
20
"
,
"m-dynamic-api"
:
"0.0.3.7"
,
"m-dynamic-api"
:
"0.0.3.7"
,
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
...
@@ -122,7 +122,7 @@ ext {
...
@@ -122,7 +122,7 @@ ext {
"ydl-webview"
:
"0.0.38.31"
,
"ydl-webview"
:
"0.0.38.31"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-media"
:
"0.0.21.6"
,
"ydl-pay"
:
"0.0.18.9"
,
"ydl-pay"
:
"0.0.18.9"
,
"m-audioim"
:
"0.0.49.
2
"
,
"m-audioim"
:
"0.0.49.
13
"
,
"ydl-flutter-base"
:
"0.0.14.14"
,
"ydl-flutter-base"
:
"0.0.14.14"
,
//以下 几乎不会动
//以下 几乎不会动
...
...
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
View file @
8c3b433e
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
View file @
8c3b433e
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/audioim/bean/AgoraInvitationBean.java
0 → 100644
View file @
8c3b433e
package
com
.
ydl
.
audioim
.
bean
;
/**
* @author jiucheng
* @描述:自定义的Invitation
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2020/4/23
*/
public
class
AgoraInvitationBean
{
public
String
data
;
public
String
business
=
"agora"
;
public
String
callType
;
//1发起呼叫 2接受呼叫 3取消呼叫 4拒绝呼叫邀请 5呼叫超时
}
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/audioim/http/AudioApiRequestUtil.kt
View file @
8c3b433e
...
@@ -3,7 +3,9 @@ package com.ydl.audioim.http
...
@@ -3,7 +3,9 @@ package com.ydl.audioim.http
import
com.google.gson.Gson
import
com.google.gson.Gson
import
com.ydl.audioim.bean.AgoraTokenResponse
import
com.ydl.audioim.bean.AgoraTokenResponse
import
com.ydl.audioim.bean.ConnectBean
import
com.ydl.audioim.bean.ConnectBean
import
com.ydl.audioim.http.command.*
import
com.ydl.audioim.http.command.ConnectCommand
import
com.ydl.audioim.http.command.ConnectExceptionCommand
import
com.ydl.audioim.http.command.NoticePushCommand
import
com.ydl.consultantim.bean.ListenTokenBean
import
com.ydl.consultantim.bean.ListenTokenBean
import
com.ydl.consultantim.command.ListenTokenCmd
import
com.ydl.consultantim.command.ListenTokenCmd
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
...
@@ -29,8 +31,7 @@ class AudioApiRequestUtil {
...
@@ -29,8 +31,7 @@ class AudioApiRequestUtil {
*/
*/
fun
connectListen
(
cmd
:
ConnectCommand
):
Observable
<
BaseAPIResponse
<
ConnectBean
>>
{
fun
connectListen
(
cmd
:
ConnectCommand
):
Observable
<
BaseAPIResponse
<
ConnectBean
>>
{
return
RxUtils
.
mapObservable
(
cmd
)
return
RxUtils
.
mapObservable
(
cmd
)
.
flatMap
{
.
flatMap
{
it
->
it
->
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
connectListen
(
it
)
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
connectListen
(
it
)
}
}
}
}
...
@@ -85,15 +86,19 @@ class AudioApiRequestUtil {
...
@@ -85,15 +86,19 @@ class AudioApiRequestUtil {
/**
/**
* 获取声网登录token
* 获取声网登录token
*/
*/
fun
getAgoraToken
():
Observable
<
BaseAPIResponse
<
AgoraTokenResponse
>>{
fun
getAgoraToken
():
Observable
<
BaseAPIResponse
<
AgoraTokenResponse
>>
{
return
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
getAgoraToken
()
return
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
getAgoraToken
()
}
}
/**
/**
* 获取声网登录token
* 获取声网登录token
*/
*/
fun
listenToken
(
cmd
:
ListenTokenCmd
):
Observable
<
BaseResponse
<
ListenTokenBean
>>{
fun
listenToken
(
cmd
:
ListenTokenCmd
):
Observable
<
BaseResponse
<
ListenTokenBean
>>
{
return
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
listenToken
(
NetworkParamsUtils
.
getMaps
(
cmd
))
return
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
listenToken
(
NetworkParamsUtils
.
getMaps
(
cmd
))
}
}
fun
callEndStatusUpdate
(
channelId
:
String
,
endStatus
:
Int
,
msg
:
String
):
Observable
<
BaseResponse
<
Any
>>
{
return
YDLHttpUtils
.
obtainApi
(
AudioNetAPi
::
class
.
java
).
callEndStatusUpdate
(
channelId
,
endStatus
,
msg
)
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/audioim/http/AudioNetAPi.kt
View file @
8c3b433e
...
@@ -69,4 +69,7 @@ interface AudioNetAPi {
...
@@ -69,4 +69,7 @@ interface AudioNetAPi {
fun
listenToken
(
@FieldMap
map
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
ListenTokenBean
>>
fun
listenToken
(
@FieldMap
map
:
Map
<
String
,
String
>):
Observable
<
BaseResponse
<
ListenTokenBean
>>
@GET
(
"message/call-end/agora"
)
fun
callEndStatusUpdate
(
channelId
:
String
,
endStatus
:
Int
,
msg
:
String
):
Observable
<
BaseResponse
<
Any
>>
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
View file @
8c3b433e
This diff is collapsed.
Click to expand it.
m-im/src/main/java/com/yidianling/im/helper/ImObserversHelper.kt
View file @
8c3b433e
...
@@ -174,7 +174,7 @@ class ImObserversHelper {
...
@@ -174,7 +174,7 @@ class ImObserversHelper {
private
var
receiveSystemMessageObserver
:
Observer
<
CustomNotification
>
=
Observer
<
CustomNotification
>
{
private
var
receiveSystemMessageObserver
:
Observer
<
CustomNotification
>
=
Observer
<
CustomNotification
>
{
LogUtil
.
e
(
it
.
content
)
LogUtil
.
e
(
it
.
content
)
imCustomNotificationCallBack
?.
onObserverCustomNotification
(
it
.
content
)
imCustomNotificationCallBack
?.
onObserverCustomNotification
(
it
.
fromAccount
,
it
.
sessionId
,
it
.
content
)
}
}
private
var
msgRevokeFilter
=
MsgRevokeFilter
{
message
->
private
var
msgRevokeFilter
=
MsgRevokeFilter
{
message
->
...
...
This diff is collapsed.
Click to expand it.
m-im/src/main/modular_api/com/yidianling/im/api/bean/IMRegisterObserverCustomNotificationCallBack.kt
View file @
8c3b433e
...
@@ -9,5 +9,5 @@ package com.yidianling.im.api.bean
...
@@ -9,5 +9,5 @@ package com.yidianling.im.api.bean
*/
*/
interface
IMRegisterObserverCustomNotificationCallBack
{
interface
IMRegisterObserverCustomNotificationCallBack
{
fun
onObserverCustomNotification
(
content
:
String
)
fun
onObserverCustomNotification
(
fromUid
:
String
,
toUid
:
String
,
content
:
String
)
}
}
\ No newline at end of file
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