正在显示
1 个修改的文件
包含
40 行增加
和
5 行删除
| @@ -1109,7 +1109,27 @@ | @@ -1109,7 +1109,27 @@ | ||
| 1109 | } | 1109 | } |
| 1110 | else if(cmdName == "enter_channel"){ | 1110 | else if(cmdName == "enter_channel"){ |
| 1111 | cmd.type = 58; | 1111 | cmd.type = 58; |
| 1112 | - var param = "Token=" + document.getElementById("token").value; | 1112 | + var param = ""; |
| 1113 | + var appid = document.getElementById("app_id").value; | ||
| 1114 | + if(appid.length > 0) { | ||
| 1115 | + param += " AppID="; | ||
| 1116 | + param += appid; | ||
| 1117 | + } | ||
| 1118 | + var token = document.getElementById("token").value; | ||
| 1119 | + if(token.length > 0 ) { | ||
| 1120 | + param += " Token="; | ||
| 1121 | + param += token; | ||
| 1122 | + } | ||
| 1123 | + var chname = document.getElementById("channel_name").value; | ||
| 1124 | + if(chname.length > 0 ) { | ||
| 1125 | + param += " Channel="; | ||
| 1126 | + param += chname; | ||
| 1127 | + } | ||
| 1128 | + var uid = document.getElementById("uid").value; | ||
| 1129 | + if(uid.length > 0 ) { | ||
| 1130 | + param += " UID="; | ||
| 1131 | + param += uid; | ||
| 1132 | + } | ||
| 1113 | cmd.data = utf16to8(param); | 1133 | cmd.data = utf16to8(param); |
| 1114 | cmd.data_len = cmd.data.length; | 1134 | cmd.data_len = cmd.data.length; |
| 1115 | } | 1135 | } |
| @@ -1117,6 +1137,21 @@ | @@ -1117,6 +1137,21 @@ | ||
| 1117 | cmd.type = 59; | 1137 | cmd.type = 59; |
| 1118 | cmd.data_len = 0; | 1138 | cmd.data_len = 0; |
| 1119 | } | 1139 | } |
| 1140 | + else if(cmdName == "start_screen_share"){ | ||
| 1141 | + cmd.type = 60; | ||
| 1142 | + var param = ""; | ||
| 1143 | + var asc_region = document.getElementById("asc_region").value; | ||
| 1144 | + if(asc_region.length > 0){ | ||
| 1145 | + param += "Rect="; | ||
| 1146 | + param += asc_region; | ||
| 1147 | + } | ||
| 1148 | + cmd.data = utf16to8(param); | ||
| 1149 | + cmd.data_len = cmd.data.length; | ||
| 1150 | + } | ||
| 1151 | + else if(cmdName == "stop_screen_share"){ | ||
| 1152 | + cmd.type = 61; | ||
| 1153 | + cmd.data_len = 0; | ||
| 1154 | + } | ||
| 1120 | 1155 | ||
| 1121 | doSendWSCmd(cmd); | 1156 | doSendWSCmd(cmd); |
| 1122 | } | 1157 | } |
| @@ -1649,14 +1684,14 @@ | @@ -1649,14 +1684,14 @@ | ||
| 1649 | <tr> | 1684 | <tr> |
| 1650 | <td colspan="2">AppID</td> | 1685 | <td colspan="2">AppID</td> |
| 1651 | <td colspan="4"> | 1686 | <td colspan="4"> |
| 1652 | - <input id="AppID" size="40" /> | 1687 | + <input id="app_id" size="40" /> |
| 1653 | </td> | 1688 | </td> |
| 1654 | </tr> | 1689 | </tr> |
| 1655 | <tr> | 1690 | <tr> |
| 1656 | 1691 | ||
| 1657 | <td colspan="2">Token</td> | 1692 | <td colspan="2">Token</td> |
| 1658 | <td colspan="4"> | 1693 | <td colspan="4"> |
| 1659 | - <input id="token" size="200" /> | 1694 | + <input id="token" size="160" /> |
| 1660 | </td> | 1695 | </td> |
| 1661 | 1696 | ||
| 1662 | </tr> | 1697 | </tr> |
| @@ -1688,8 +1723,8 @@ | @@ -1688,8 +1723,8 @@ | ||
| 1688 | </tr> | 1723 | </tr> |
| 1689 | 1724 | ||
| 1690 | <tr> | 1725 | <tr> |
| 1691 | - <td colspan="2"><button type="button" id="start_screenshare" onclick="javascript:onTestClick(this);">Start Screen share</button></td> | ||
| 1692 | - <td colspan="2"><button type="button" id="stop_screenshare" onclick="javascript:onTestClick(this);">Stop Screen Share</button></td> | 1726 | + <td colspan="2"><button type="button" id="start_screen_share" onclick="javascript:onTestClick(this);">Start Screen share</button></td> |
| 1727 | + <td colspan="2"><button type="button" id="stop_screen_share" onclick="javascript:onTestClick(this);">Stop Screen Share</button></td> | ||
| 1693 | </tr> | 1728 | </tr> |
| 1694 | 1729 | ||
| 1695 | </table> | 1730 | </table> |
-
请 注册 或 登录 后发表评论