正在显示
4 个修改的文件
包含
8 行增加
和
2 行删除
| @@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter { | @@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter { | ||
| 58 | constructor() { | 58 | constructor() { |
| 59 | super(); | 59 | super(); |
| 60 | //sdk 信息 | 60 | //sdk 信息 |
| 61 | - GlobalConfig.sdkVersion = "v1.65.26.20170809"; | 61 | + GlobalConfig.sdkVersion = "v1.66.1.20170809"; |
| 62 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); | 62 | loger.warn("sdkVersion:" + GlobalConfig.sdkVersion); |
| 63 | 63 | ||
| 64 | //获取设备和系统信息 | 64 | //获取设备和系统信息 |
| @@ -373,6 +373,8 @@ class AudioApe extends Ape { | @@ -373,6 +373,8 @@ class AudioApe extends Ape { | ||
| 373 | receiveChannelInfo.mediaType=unpackChannelInfo.mediaType||ApeConsts.MEDIA_TYPE_DEFAULT; | 373 | receiveChannelInfo.mediaType=unpackChannelInfo.mediaType||ApeConsts.MEDIA_TYPE_DEFAULT; |
| 374 | receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth; | 374 | receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth; |
| 375 | receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight; | 375 | receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight; |
| 376 | + receiveChannelInfo.deviceType=unpackChannelInfo.deviceType||0; | ||
| 377 | + | ||
| 376 | //消息不是自己同步的,需要处理 | 378 | //消息不是自己同步的,需要处理 |
| 377 | if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ | 379 | if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ |
| 378 | //正在推流 | 380 | //正在推流 |
| @@ -469,6 +471,7 @@ class AudioApe extends Ape { | @@ -469,6 +471,7 @@ class AudioApe extends Ape { | ||
| 469 | packPduModel.userRole=_param.userRole||GlobalConfig.userRole; | 471 | packPduModel.userRole=_param.userRole||GlobalConfig.userRole; |
| 470 | packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth; | 472 | packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth; |
| 471 | packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight; | 473 | packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight; |
| 474 | + packPduModel.deviceType=_param.deviceType||GlobalConfig.deviceType; | ||
| 472 | loger.log("packPdu->",packPduModel); | 475 | loger.log("packPdu->",packPduModel); |
| 473 | return packPduModel; | 476 | return packPduModel; |
| 474 | } | 477 | } |
| @@ -465,6 +465,7 @@ class VideoApe extends Ape { | @@ -465,6 +465,7 @@ class VideoApe extends Ape { | ||
| 465 | receiveChannelInfo.mediaType=unpackChannelInfo.mediaType||ApeConsts.MEDIA_TYPE_DEFAULT; | 465 | receiveChannelInfo.mediaType=unpackChannelInfo.mediaType||ApeConsts.MEDIA_TYPE_DEFAULT; |
| 466 | receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth; | 466 | receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth; |
| 467 | receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight; | 467 | receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight; |
| 468 | + receiveChannelInfo.deviceType=unpackChannelInfo.deviceType||0; | ||
| 468 | //消息不是自己同步的,需要处理 | 469 | //消息不是自己同步的,需要处理 |
| 469 | if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ | 470 | if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){ |
| 470 | //正在推流 | 471 | //正在推流 |
| @@ -595,6 +596,7 @@ class VideoApe extends Ape { | @@ -595,6 +596,7 @@ class VideoApe extends Ape { | ||
| 595 | packPduModel.userRole=_param.userRole||GlobalConfig.userRole; | 596 | packPduModel.userRole=_param.userRole||GlobalConfig.userRole; |
| 596 | packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth; | 597 | packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth; |
| 597 | packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight; | 598 | packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight; |
| 599 | + packPduModel.deviceType=_param.deviceType||GlobalConfig.deviceType; | ||
| 598 | loger.log('packPdu->',packPduModel); | 600 | loger.log('packPdu->',packPduModel); |
| 599 | return packPduModel; | 601 | return packPduModel; |
| 600 | } | 602 | } |
| @@ -831,6 +831,7 @@ message RCAudioChannelInfoPdu { | @@ -831,6 +831,7 @@ message RCAudioChannelInfoPdu { | ||
| 831 | optional string user_role = 12;//用户的身份 | 831 | optional string user_role = 12;//用户的身份 |
| 832 | optional uint32 screenWidth = 13;//屏幕分辨率宽 | 832 | optional uint32 screenWidth = 13;//屏幕分辨率宽 |
| 833 | optional uint32 screenHeight = 14;//屏幕分辨率高 | 833 | optional uint32 screenHeight = 14;//屏幕分辨率高 |
| 834 | + optional uint32 deviceType = 15;//设备类型 | ||
| 834 | } | 835 | } |
| 835 | 836 | ||
| 836 | message RCVideoChannelInfoPdu { | 837 | message RCVideoChannelInfoPdu { |
| @@ -848,7 +849,7 @@ message RCVideoChannelInfoPdu { | @@ -848,7 +849,7 @@ message RCVideoChannelInfoPdu { | ||
| 848 | optional string user_role = 12;//用户的身份 | 849 | optional string user_role = 12;//用户的身份 |
| 849 | optional uint32 screenWidth = 13;//屏幕分辨率宽 | 850 | optional uint32 screenWidth = 13;//屏幕分辨率宽 |
| 850 | optional uint32 screenHeight = 14;//屏幕分辨率高 | 851 | optional uint32 screenHeight = 14;//屏幕分辨率高 |
| 851 | - | 852 | + optional uint32 deviceType = 15;//设备类型 |
| 852 | } | 853 | } |
| 853 | 854 | ||
| 854 | message RCVideoChannelInfoRecordPdu { | 855 | message RCVideoChannelInfoRecordPdu { |
-
请 注册 或 登录 后发表评论