正在显示
1 个修改的文件
包含
32 行增加
和
0 行删除
| @@ -205,6 +205,8 @@ a:active { | @@ -205,6 +205,8 @@ a:active { | ||
| 205 | if(data_len > 4){ | 205 | if(data_len > 4){ |
| 206 | var mic_num = dv.getUint32(8, true); | 206 | var mic_num = dv.getUint32(8, true); |
| 207 | var offset = 12; | 207 | var offset = 12; |
| 208 | + var micSel = document.getElementById("mics"); | ||
| 209 | + micSel.options.length = 0; | ||
| 208 | for(var i=0;i<mic_num; i++){ | 210 | for(var i=0;i<mic_num; i++){ |
| 209 | var mic_name_len = dv.getUint32(offset, true); | 211 | var mic_name_len = dv.getUint32(offset, true); |
| 210 | offset += 4; | 212 | offset += 4; |
| @@ -212,6 +214,10 @@ a:active { | @@ -212,6 +214,10 @@ a:active { | ||
| 212 | offset += mic_name_len; | 214 | offset += mic_name_len; |
| 213 | var data_sting = new TextDecoder("utf-8").decode(mic_name); | 215 | var data_sting = new TextDecoder("utf-8").decode(mic_name); |
| 214 | writeToScreen('<span style="color: blue;">MIC: ' + i + " " + data_sting + ' </span>'); | 216 | writeToScreen('<span style="color: blue;">MIC: ' + i + " " + data_sting + ' </span>'); |
| 217 | + var op = document.createElement("option"); | ||
| 218 | + op.value = i; | ||
| 219 | + op.text = data_sting; | ||
| 220 | + micSel.add(op); | ||
| 215 | } | 221 | } |
| 216 | } | 222 | } |
| 217 | } | 223 | } |
| @@ -273,6 +279,30 @@ a:active { | @@ -273,6 +279,30 @@ a:active { | ||
| 273 | else if(obj.id == "get_cam"){ | 279 | else if(obj.id == "get_cam"){ |
| 274 | cmd.type = 41; | 280 | cmd.type = 41; |
| 275 | } | 281 | } |
| 282 | + else if(obj.id == "cam_start"){ | ||
| 283 | + cmd.type = 42; | ||
| 284 | + cmd.data_len = 4 + 4 + 256 + 256; | ||
| 285 | + var buffer = new ArrayBuffer(cmd.data_len); | ||
| 286 | + var cam_name_len = new Uint32Array(buffer, 0, 1); | ||
| 287 | + var camSel = document.getElementById("cameras"); | ||
| 288 | + var index = camSel.selectedIndex; // 选中索引 | ||
| 289 | + var sel_cam_name = camSel.options[index].text; // 选中文本 | ||
| 290 | + cam_name_len[0] = sel_cam_name.length; | ||
| 291 | + var urlname_len = new Uint32Array(buffer, 4, 1); | ||
| 292 | + urlname_len[0] = 0; | ||
| 293 | + var cam_name = new Uint8Array(buffer, 8, 256); | ||
| 294 | + var cam_name_array = new TextEncoder("utf-8").encode(sel_cam_name); | ||
| 295 | + for(var i=0;i< cam_name_array.length; i++){ | ||
| 296 | + cam_name[i] = cam_name_array[i]; | ||
| 297 | + } | ||
| 298 | + var url_name = new Uint8Array(buffer, 8 + 256, 256);//todo: set push url | ||
| 299 | + cmd.data = new Uint8Array(buffer, 0, cmd.data_len); | ||
| 300 | + doSendWSCmd(cmd); | ||
| 301 | + return; | ||
| 302 | + } | ||
| 303 | + else if(obj.id == "cam_stop"){ | ||
| 304 | + cmd.type = 43; | ||
| 305 | + } | ||
| 276 | doSendWSCmd(cmd); | 306 | doSendWSCmd(cmd); |
| 277 | } | 307 | } |
| 278 | 308 | ||
| @@ -530,6 +560,8 @@ a:active { | @@ -530,6 +560,8 @@ a:active { | ||
| 530 | <tr> | 560 | <tr> |
| 531 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> | 561 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> |
| 532 | <td colspan="3"><button type="button" id="get_mic" onclick="javascript:onTestClick(this);">get_mic</button></td> | 562 | <td colspan="3"><button type="button" id="get_mic" onclick="javascript:onTestClick(this);">get_mic</button></td> |
| 563 | + <td width="300" ><img src="images/spacer.gif" width="20" height="10" /> | ||
| 564 | + <select width = "300" id="mics" name="mics" /></td> | ||
| 533 | </tr> | 565 | </tr> |
| 534 | <tr> | 566 | <tr> |
| 535 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> | 567 | <td width="35" colspan="2"><img src="images/spacer.gif" width="20" height="10" /></td> |
-
请 注册 或 登录 后发表评论