李勇

人员信息中增加ms列表数据

此 diff 太大无法显示。
@@ -28,7 +28,7 @@ import MediaModule from 'apes/MediaModule'; @@ -28,7 +28,7 @@ import MediaModule from 'apes/MediaModule';
28 import UTF8 from 'utf-8'; 28 import UTF8 from 'utf-8';
29 29
30 let loger = Loger.getLoger('McuClient'); 30 let loger = Loger.getLoger('McuClient');
31 -let _sdkInfo = {"version": "v1.23.5.201705023", "author": "www.3mang.com"}; 31 +let _sdkInfo = {"version": "v1.24.0.201705024", "author": "www.3mang.com"};
32 32
33 //APE 33 //APE
34 let _sass; 34 let _sass;
@@ -119,7 +119,20 @@ class ConferApe extends Ape { @@ -119,7 +119,20 @@ class ConferApe extends Ape {
119 nodeInfoRecordPdu.province= GlobalConfig.province;//服务商 119 nodeInfoRecordPdu.province= GlobalConfig.province;//服务商
120 nodeInfoRecordPdu.isp=GlobalConfig.isp;//服务商 120 nodeInfoRecordPdu.isp=GlobalConfig.isp;//服务商
121 121
122 - 122 + //用户的MS列表
  123 + let msListAll=GlobalConfig.msListAll;
  124 + for(let k=0;k<msListAll.length;k++){
  125 + let msItem=msListAll[k];
  126 + if(msItem){
  127 + let msListItemPdu = new pdu['MsListItemPdu'];
  128 + msListItemPdu.ip=msItem.ip||"";
  129 + msListItemPdu.port=msItem.port||"";
  130 + msListItemPdu.country=msItem.country||"";
  131 + msListItemPdu.province=msItem.province||"";
  132 + msListItemPdu.city=msItem.city||"";
  133 + nodeInfoRecordPdu.msList.push(msListItemPdu);
  134 + }
  135 + }
123 return nodeInfoRecordPdu; 136 return nodeInfoRecordPdu;
124 } 137 }
125 138
@@ -833,7 +833,13 @@ message RCVideoDeviceInfoRecordPdu { @@ -833,7 +833,13 @@ message RCVideoDeviceInfoRecordPdu {
833 required uint32 device_id = 1; 833 required uint32 device_id = 1;
834 required string device_name = 2; 834 required string device_name = 2;
835 } 835 }
836 - 836 +message MsListItemPdu {
  837 + optional string ip = 1;
  838 + optional string port = 2;
  839 + optional string country = 3;
  840 + optional string province = 4;
  841 + optional string city = 5;
  842 +}
837 message RCNodeInfoRecordPdu { 843 message RCNodeInfoRecordPdu {
838 required uint32 node_id = 1; 844 required uint32 node_id = 1;
839 required string name = 2; 845 required string name = 2;
@@ -863,6 +869,7 @@ message RCNodeInfoRecordPdu { @@ -863,6 +869,7 @@ message RCNodeInfoRecordPdu {
863 optional string city=26; 869 optional string city=26;
864 optional string province=27; 870 optional string province=27;
865 optional string isp=28; 871 optional string isp=28;
  872 + repeated MsListItemPdu msList = 29;
866 } 873 }
867 874
868 message RCVotingPollSettingsPdu { 875 message RCVotingPollSettingsPdu {