正在显示
1 个修改的文件
包含
52 行增加
和
2 行删除
| @@ -436,6 +436,17 @@ a:active { | @@ -436,6 +436,17 @@ a:active { | ||
| 436 | } | 436 | } |
| 437 | } | 437 | } |
| 438 | } | 438 | } |
| 439 | + else if(77 == result){//file_get success | ||
| 440 | + if(data_len >= 8 + 256){//head_len + filename_len | ||
| 441 | + var filelen =data_len - 256; | ||
| 442 | + var filecontent = new Uint8Array(evt.target.result, 8 + 256 , filelen); | ||
| 443 | + var data_sting = utf8to16(filecontent); | ||
| 444 | + writeToScreen('<span style="color: green;">filelen: ' + filelen + ": " + data_sting + ' </span>'); | ||
| 445 | + } | ||
| 446 | + } | ||
| 447 | + else if(78 == result){ | ||
| 448 | + writeToScreen('<span style="color: green;">file_get fail </span>'); | ||
| 449 | + } | ||
| 439 | else if(85 == result){//cam_share success | 450 | else if(85 == result){//cam_share success |
| 440 | //playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/cs"); | 451 | //playRTMPStream("rtmp://127.0.0.1:" + rtmp_port + "/live/cs"); |
| 441 | } | 452 | } |
| @@ -639,6 +650,35 @@ a:active { | @@ -639,6 +650,35 @@ a:active { | ||
| 639 | else if(cmdName == "aud_stop"){ | 650 | else if(cmdName == "aud_stop"){ |
| 640 | cmd.type = 30; | 651 | cmd.type = 30; |
| 641 | } | 652 | } |
| 653 | + else if(cmdName == "file_get"){ | ||
| 654 | + cmd.type = 38; | ||
| 655 | + var param = document.getElementById("filename"); | ||
| 656 | + //cmd.data = new TextEncoder("utf-8").encode(param.value); | ||
| 657 | + cmd.data = utf16to8(param.value); | ||
| 658 | + cmd.data_len = cmd.data.length; | ||
| 659 | + } | ||
| 660 | + else if(cmdName == "file_set"){ | ||
| 661 | + cmd.type = 39; | ||
| 662 | + var filename = utf16to8(document.getElementById("filename").value); | ||
| 663 | + var filecontent = utf16to8(document.getElementById("filecontent").value); | ||
| 664 | + //cmd.data = new TextEncoder("utf-8").encode(param.value); | ||
| 665 | + cmd.data_len = 256 + filecontent.length; | ||
| 666 | + var buffer = new ArrayBuffer(cmd.data_len); | ||
| 667 | + var filelen_buf = new Uint8Array(buffer, 0, 256); | ||
| 668 | + for(var i=0;i< filename.length; i++){ | ||
| 669 | + filelen_buf[i] = filename[i]; | ||
| 670 | + } | ||
| 671 | + for(var i = filename.length; i < 256; i++){ | ||
| 672 | + filelen_buf[i] = 0; | ||
| 673 | + } | ||
| 674 | + var filecontent_buf = new Uint8Array(buffer, 256, filecontent.length); | ||
| 675 | + for(var i = 0; i < filecontent.length; i++){ | ||
| 676 | + filecontent_buf[i] = filecontent[i]; | ||
| 677 | + } | ||
| 678 | + cmd.data = new Uint8Array(buffer, 0, cmd.data_len); | ||
| 679 | + doSendWSCmd(cmd); | ||
| 680 | + return; | ||
| 681 | + } | ||
| 642 | else if(cmdName == "get_cam"){ | 682 | else if(cmdName == "get_cam"){ |
| 643 | cmd.type = 41; | 683 | cmd.type = 41; |
| 644 | } | 684 | } |
| @@ -721,6 +761,7 @@ a:active { | @@ -721,6 +761,7 @@ a:active { | ||
| 721 | else if(cmdName == "get_mic_vol"){ | 761 | else if(cmdName == "get_mic_vol"){ |
| 722 | cmd.type = 54; | 762 | cmd.type = 54; |
| 723 | } | 763 | } |
| 764 | + | ||
| 724 | 765 | ||
| 725 | doSendWSCmd(cmd); | 766 | doSendWSCmd(cmd); |
| 726 | } | 767 | } |
| @@ -797,7 +838,7 @@ function addPushList(url){ | @@ -797,7 +838,7 @@ function addPushList(url){ | ||
| 797 | { | 838 | { |
| 798 | output = document.getElementById("output"); | 839 | output = document.getElementById("output"); |
| 799 | 840 | ||
| 800 | - document.getElementById( 'websocketURL' ).value = "ws://127.0.0.1:6080"; | 841 | + document.getElementById( 'websocketURL' ).value = "ws://127.0.0.1:8090"; |
| 801 | 842 | ||
| 802 | document.getElementById( 'inputURL' ).value = queryParameters['source']; | 843 | document.getElementById( 'inputURL' ).value = queryParameters['source']; |
| 803 | 844 | ||
| @@ -1093,6 +1134,15 @@ function addPushList(url){ | @@ -1093,6 +1134,15 @@ function addPushList(url){ | ||
| 1093 | </td> | 1134 | </td> |
| 1094 | <td colspan="3"><input id="videoparam" size="36" /></td> | 1135 | <td colspan="3"><input id="videoparam" size="36" /></td> |
| 1095 | <td colspan="2"><button type="button" id="set_videoparam" onclick="javascript:onTestClick(this);">set_videoparam</button></td> | 1136 | <td colspan="2"><button type="button" id="set_videoparam" onclick="javascript:onTestClick(this);">set_videoparam</button></td> |
| 1137 | + </tr> | ||
| 1138 | + <tr> | ||
| 1139 | + <td colspan="1"><img src="images/spacer.gif" width="5" height="10" /></td> | ||
| 1140 | + <td colspan="2"><button type="button" id="file_get" onclick="javascript:onTestClick(this);">file_get</button></td> | ||
| 1141 | + <td colspan="4"> | ||
| 1142 | + <input id="filename" size="5" /> | ||
| 1143 | + <input id="filecontent" size="40" /> | ||
| 1144 | + </td> | ||
| 1145 | + <td colspan="2"><button type="button" id="file_set" onclick="javascript:onTestClick(this);">file_set</button></td> | ||
| 1096 | </tr> | 1146 | </tr> |
| 1097 | </table> | 1147 | </table> |
| 1098 | </td> | 1148 | </td> |
| @@ -1190,4 +1240,4 @@ function addPushList(url){ | @@ -1190,4 +1240,4 @@ function addPushList(url){ | ||
| 1190 | <div id = output /> | 1240 | <div id = output /> |
| 1191 | </body> | 1241 | </body> |
| 1192 | </html> | 1242 | </html> |
| 1193 | - | 1243 | + |
-
请 注册 或 登录 后发表评论