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
李勇
2017-08-09 17:01:33 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
07efe6318bcfe6e5e72dde99bd166c265b3d8ab4
07efe631
1 parent
c3643a25
音视频模块数据中增加用户设备信息,播放器需要根据不同设备推送的流做不同的处理才能正常播放器
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
8 行增加
和
2 行删除
src/EngineEntrance.js
src/apes/AudioApe.js
src/apes/VideoApe.js
src/pdus/pro.js
src/EngineEntrance.js
查看文件 @
07efe63
...
...
@@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
constructor
()
{
super
();
//sdk 信息
GlobalConfig
.
sdkVersion
=
"v1.6
5.26
.20170809"
;
GlobalConfig
.
sdkVersion
=
"v1.6
6.1
.20170809"
;
loger
.
warn
(
"sdkVersion:"
+
GlobalConfig
.
sdkVersion
);
//获取设备和系统信息
...
...
src/apes/AudioApe.js
查看文件 @
07efe63
...
...
@@ -373,6 +373,8 @@ class AudioApe extends Ape {
receiveChannelInfo
.
mediaType
=
unpackChannelInfo
.
mediaType
||
ApeConsts
.
MEDIA_TYPE_DEFAULT
;
receiveChannelInfo
.
screenWidth
=
unpackChannelInfo
.
screenWidth
||
GlobalConfig
.
screenWidth
;
receiveChannelInfo
.
screenHeight
=
unpackChannelInfo
.
screenHeight
||
GlobalConfig
.
screenHeight
;
receiveChannelInfo
.
deviceType
=
unpackChannelInfo
.
deviceType
||
0
;
//消息不是自己同步的,需要处理
if
(
unpackChannelInfo
.
status
==
ApeConsts
.
CHANNEL_STATUS_OPENING
){
//正在推流
...
...
@@ -469,6 +471,7 @@ class AudioApe extends Ape {
packPduModel
.
userRole
=
_param
.
userRole
||
GlobalConfig
.
userRole
;
packPduModel
.
screenWidth
=
_param
.
screenWidth
||
GlobalConfig
.
screenWidth
;
packPduModel
.
screenHeight
=
_param
.
screenHeight
||
GlobalConfig
.
screenHeight
;
packPduModel
.
deviceType
=
_param
.
deviceType
||
GlobalConfig
.
deviceType
;
loger
.
log
(
"packPdu->"
,
packPduModel
);
return
packPduModel
;
}
...
...
src/apes/VideoApe.js
查看文件 @
07efe63
...
...
@@ -465,6 +465,7 @@ class VideoApe extends Ape {
receiveChannelInfo
.
mediaType
=
unpackChannelInfo
.
mediaType
||
ApeConsts
.
MEDIA_TYPE_DEFAULT
;
receiveChannelInfo
.
screenWidth
=
unpackChannelInfo
.
screenWidth
||
GlobalConfig
.
screenWidth
;
receiveChannelInfo
.
screenHeight
=
unpackChannelInfo
.
screenHeight
||
GlobalConfig
.
screenHeight
;
receiveChannelInfo
.
deviceType
=
unpackChannelInfo
.
deviceType
||
0
;
//消息不是自己同步的,需要处理
if
(
unpackChannelInfo
.
status
==
ApeConsts
.
CHANNEL_STATUS_OPENING
){
//正在推流
...
...
@@ -595,6 +596,7 @@ class VideoApe extends Ape {
packPduModel
.
userRole
=
_param
.
userRole
||
GlobalConfig
.
userRole
;
packPduModel
.
screenWidth
=
_param
.
screenWidth
||
GlobalConfig
.
screenWidth
;
packPduModel
.
screenHeight
=
_param
.
screenHeight
||
GlobalConfig
.
screenHeight
;
packPduModel
.
deviceType
=
_param
.
deviceType
||
GlobalConfig
.
deviceType
;
loger
.
log
(
'packPdu->'
,
packPduModel
);
return
packPduModel
;
}
...
...
src/pdus/pro.js
查看文件 @
07efe63
...
...
@@ -831,6 +831,7 @@ message RCAudioChannelInfoPdu {
optional
string
user_role
=
12
;
//用户的身份
optional
uint32
screenWidth
=
13
;
//屏幕分辨率宽
optional
uint32
screenHeight
=
14
;
//屏幕分辨率高
optional
uint32
deviceType
=
15
;
//设备类型
}
message
RCVideoChannelInfoPdu
{
...
...
@@ -848,7 +849,7 @@ message RCVideoChannelInfoPdu {
optional
string
user_role
=
12
;
//用户的身份
optional
uint32
screenWidth
=
13
;
//屏幕分辨率宽
optional
uint32
screenHeight
=
14
;
//屏幕分辨率高
optional
uint32
deviceType
=
15
;
//设备类型
}
message
RCVideoChannelInfoRecordPdu
{
...
...
请
注册
或
登录
后发表评论