Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
李勇
/
McuClient
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
李勇
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f02ab8f1ca8fcf1b81e2a0f882cd9444cdb89b4b
f02ab8f1
1 parent
27764fef
1.音视频模块消息中增加用户名字
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
7 行增加
和
1 行删除
dist/McuClient.js
src/apes/AudioApe.js
src/apes/VideoApe.js
src/pdus/pro.js
dist/McuClient.js
查看文件 @
f02ab8f
此 diff 太大无法显示。
src/apes/AudioApe.js
查看文件 @
f02ab8f
...
...
@@ -316,6 +316,7 @@ class AudioApe extends Ape {
let
receiveChannelInfo
=
{};
receiveChannelInfo
.
mediaId
=
unpackChannelInfo
.
channelId
;
receiveChannelInfo
.
fromNodeId
=
unpackChannelInfo
.
fromNodeId
;
receiveChannelInfo
.
userName
=
unpackChannelInfo
.
userName
||
""
;
//消息不是自己同步的,需要处理
if
(
unpackChannelInfo
.
status
==
ApeConsts
.
CHANNEL_STATUS_OPENING
){
...
...
@@ -375,6 +376,7 @@ class AudioApe extends Ape {
packPduModel
.
mediaType
=
_param
.
mediaType
||
ApeConsts
.
MEDIA_TYPE_AUDIO
;
packPduModel
.
timestamp
=
_param
.
timestamp
||
EngineUtils
.
creatTimestamp
();
packPduModel
.
fromNodeId
=
GlobalConfig
.
nodeId
;
packPduModel
.
userName
=
GlobalConfig
.
userName
||
""
;
packPduModel
.
toNodeId
=
0
;
loger
.
log
(
"packPdu"
,
packPduModel
);
return
packPduModel
;
...
...
src/apes/VideoApe.js
查看文件 @
f02ab8f
...
...
@@ -243,7 +243,7 @@ class VideoApe extends Ape {
}
return
{
"code"
:
ApeConsts
.
RETURN_SUCCESS
,
"data"
:
""
};
}
//发送到mcu同步(更新数据)
sendTableUpdateHandler
(
_channelInfo
)
{
loger
.
log
(
"video===sendTableUpdateHandler "
);
let
updateModelPdu
=
this
.
packPdu
(
_channelInfo
,
_channelInfo
.
channelId
);
//let updateModelPdu=this.packPdu({},ApeConsts.VIDEO_OBJ_TABLE_ID+2);
...
...
@@ -321,6 +321,7 @@ class VideoApe extends Ape {
let
receiveChannelInfo
=
{};
receiveChannelInfo
.
mediaId
=
unpackChannelInfo
.
channelId
;
receiveChannelInfo
.
fromNodeId
=
unpackChannelInfo
.
fromNodeId
;
receiveChannelInfo
.
userName
=
unpackChannelInfo
.
userName
||
""
;
//消息不是自己同步的,需要处理
if
(
unpackChannelInfo
.
status
==
ApeConsts
.
CHANNEL_STATUS_OPENING
){
//正在推流
...
...
@@ -380,6 +381,7 @@ class VideoApe extends Ape {
packPduModel
.
mediaType
=
_param
.
mediaType
||
ApeConsts
.
MEDIA_TYPE_VIDEO
;
packPduModel
.
timestamp
=
_param
.
timestamp
||
0
;
packPduModel
.
fromNodeId
=
GlobalConfig
.
nodeId
;
packPduModel
.
userName
=
GlobalConfig
.
userName
||
""
;
packPduModel
.
toNodeId
=
0
;
loger
.
log
(
packPduModel
);
return
packPduModel
;
...
...
src/pdus/pro.js
查看文件 @
f02ab8f
...
...
@@ -777,6 +777,7 @@ message RCAudioChannelInfoPdu {
optional
string
site_id
=
8
;
//站点号
optional
string
user_id
=
9
;
//用户的userId
optional
string
stream_id
=
10
;
//流名称
optional
string
user_name
=
11
;
//用户的名字
}
message
RCVideoChannelInfoPdu
{
...
...
@@ -790,6 +791,7 @@ message RCVideoChannelInfoPdu {
optional
string
site_id
=
8
;
//站点号
optional
string
user_id
=
9
;
//用户的userId
optional
string
stream_id
=
10
;
//流名称
optional
string
user_name
=
11
;
//用户的名字
}
message
RCVideoChannelInfoRecordPdu
{
...
...
请
注册
或
登录
后发表评论