正在显示
5 个修改的文件
包含
65 行增加
和
15 行删除
| @@ -1307,8 +1307,8 @@ height: 1080px; | @@ -1307,8 +1307,8 @@ height: 1080px; | ||
| 1307 | 1307 | ||
| 1308 | .curStuUserName{ | 1308 | .curStuUserName{ |
| 1309 | position: absolute; | 1309 | position: absolute; |
| 1310 | - left: 47px; | ||
| 1311 | - bottom: 5px; | 1310 | + left: 68px; |
| 1311 | + bottom: 40px; | ||
| 1312 | width: auto; | 1312 | width: auto; |
| 1313 | height: 16px; | 1313 | height: 16px; |
| 1314 | color: #333333; | 1314 | color: #333333; |
| @@ -263,13 +263,13 @@ | @@ -263,13 +263,13 @@ | ||
| 263 | <li id="li-Color1" class="Color1" title="#b8242a" value="#b8242a" | 263 | <li id="li-Color1" class="Color1" title="#b8242a" value="#b8242a" |
| 264 | onclick="choose(1)"></li> | 264 | onclick="choose(1)"></li> |
| 265 | <!--蓝色--> | 265 | <!--蓝色--> |
| 266 | - <li id="li-Color2" class="Color2" title="#0071bc" value="#0071bc" | 266 | + <li id="li-Color2" class="Color2" title="#0071bc" value="#0071bc" |
| 267 | onclick="choose(2)"></li> | 267 | onclick="choose(2)"></li> |
| 268 | <!--紫色--> | 268 | <!--紫色--> |
| 269 | <li id="li-Color3" class="Color3" title="#6a0db2" value="#6a0db2" | 269 | <li id="li-Color3" class="Color3" title="#6a0db2" value="#6a0db2" |
| 270 | onclick="choose(3)"></li> | 270 | onclick="choose(3)"></li> |
| 271 | <!--黄色--> | 271 | <!--黄色--> |
| 272 | - <li id="li-Color4" class="Color4" title="#fae81b" value="#fae81b" | 272 | + <li id="li-Color4" class="Color4" title="fae81b" value="#fae81b" |
| 273 | onclick="choose(4)"></li> | 273 | onclick="choose(4)"></li> |
| 274 | 274 | ||
| 275 | 275 |
| @@ -46,7 +46,8 @@ $(function (){ | @@ -46,7 +46,8 @@ $(function (){ | ||
| 46 | }); | 46 | }); |
| 47 | 47 | ||
| 48 | $(".clearContext").on("click", function () { | 48 | $(".clearContext").on("click", function () { |
| 49 | - draw.clearContext('1'); | 49 | + client.sendDeleteAllAnnotation(); |
| 50 | + // draw.clearContext('1'); | ||
| 50 | }); | 51 | }); |
| 51 | 52 | ||
| 52 | 53 |
| @@ -21,6 +21,9 @@ var fileItemIdx; | @@ -21,6 +21,9 @@ var fileItemIdx; | ||
| 21 | var classErrorCode; | 21 | var classErrorCode; |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | + | ||
| 25 | + | ||
| 26 | + | ||
| 24 | //画布 | 27 | //画布 |
| 25 | var canvas ; | 28 | var canvas ; |
| 26 | var context ; | 29 | var context ; |
| @@ -930,16 +933,6 @@ function showParmasInput(){ | @@ -930,16 +933,6 @@ function showParmasInput(){ | ||
| 930 | function classJoinSuccess(callbackData){ | 933 | function classJoinSuccess(callbackData){ |
| 931 | classAllInfo=callbackData; | 934 | classAllInfo=callbackData; |
| 932 | console.log("classJoinSuccess====>",callbackData); | 935 | console.log("classJoinSuccess====>",callbackData); |
| 933 | - | ||
| 934 | - | ||
| 935 | - | ||
| 936 | - | ||
| 937 | - | ||
| 938 | - | ||
| 939 | - | ||
| 940 | - | ||
| 941 | - | ||
| 942 | - | ||
| 943 | //去掉复制功能 | 936 | //去掉复制功能 |
| 944 | document.body.onselectstart=document.body.oncontextmenu=function(){ return false;} | 937 | document.body.onselectstart=document.body.oncontextmenu=function(){ return false;} |
| 945 | 938 | ||
| @@ -976,6 +969,20 @@ function layoutView( ) { | @@ -976,6 +969,20 @@ function layoutView( ) { | ||
| 976 | "display":"block" | 969 | "display":"block" |
| 977 | }); | 970 | }); |
| 978 | 971 | ||
| 972 | + | ||
| 973 | + | ||
| 974 | + | ||
| 975 | + | ||
| 976 | + | ||
| 977 | + | ||
| 978 | + | ||
| 979 | + | ||
| 980 | + | ||
| 981 | + | ||
| 982 | + | ||
| 983 | + | ||
| 984 | + | ||
| 985 | + | ||
| 979 | // if(_type==1){ | 986 | // if(_type==1){ |
| 980 | // //主页面显示 | 987 | // //主页面显示 |
| 981 | // $(".box").css({ | 988 | // $(".box").css({ |
| @@ -1092,6 +1099,35 @@ function layoutView( ) { | @@ -1092,6 +1099,35 @@ function layoutView( ) { | ||
| 1092 | $("#classCurId").html(classAllInfo.nodeId); | 1099 | $("#classCurId").html(classAllInfo.nodeId); |
| 1093 | 1100 | ||
| 1094 | } | 1101 | } |
| 1102 | + | ||
| 1103 | + | ||
| 1104 | +function choose(agrs) { | ||
| 1105 | + switch (agrs) { | ||
| 1106 | + case 1: | ||
| 1107 | + chooseColor.style.background = 'url("images/color6-n.png") no-repeat'; | ||
| 1108 | + var colorValue1=$(".Color1").attr('value'); | ||
| 1109 | + $("#chooseColor").attr('value',colorValue1); | ||
| 1110 | + break; | ||
| 1111 | + case 2: | ||
| 1112 | + chooseColor.style.background = 'url("images/color2-n.png") no-repeat'; | ||
| 1113 | + var colorValue2=$(".Color2").attr('value'); | ||
| 1114 | + $("#chooseColor").attr('value',colorValue2); | ||
| 1115 | + break; | ||
| 1116 | + case 3: | ||
| 1117 | + | ||
| 1118 | + chooseColor.style.background = 'url("images/color3-n.png") no-repeat'; | ||
| 1119 | + var colorValue3=$(".Color3").attr('value'); | ||
| 1120 | + $("#chooseColor").attr('value',colorValue3); | ||
| 1121 | + break; | ||
| 1122 | + case 4: | ||
| 1123 | + chooseColor.style.background = 'url("images/color4-n.png") no-repeat'; | ||
| 1124 | + var colorValue4=$(".Color4").attr('value'); | ||
| 1125 | + $("#chooseColor").attr('value',colorValue4); | ||
| 1126 | + break; | ||
| 1127 | + default:break; | ||
| 1128 | + } | ||
| 1129 | +} | ||
| 1130 | + | ||
| 1095 | function whiteboardUpdate(callbackData) { | 1131 | function whiteboardUpdate(callbackData) { |
| 1096 | console.log("同步canvas消息"); | 1132 | console.log("同步canvas消息"); |
| 1097 | console.log(callbackData); | 1133 | console.log(callbackData); |
| @@ -1133,6 +1169,12 @@ function classUpdateStatus(callbackData) { | @@ -1133,6 +1169,12 @@ function classUpdateStatus(callbackData) { | ||
| 1133 | 1169 | ||
| 1134 | }); | 1170 | }); |
| 1135 | }else if (callbackData.classStatus==1){ | 1171 | }else if (callbackData.classStatus==1){ |
| 1172 | + $(".span-classes").html(""); | ||
| 1173 | + $("#class-now").html("直播中"); | ||
| 1174 | + $(".am-dropdown-content-li-pause").css("display","block"); | ||
| 1175 | + | ||
| 1176 | + $(".am-dropdown-content-li-begin").css("display","none"); | ||
| 1177 | + | ||
| 1136 | //暂停课堂 | 1178 | //暂停课堂 |
| 1137 | $("#classes-status-pause").click(function () { | 1179 | $("#classes-status-pause").click(function () { |
| 1138 | $(".span-classes").html(""); | 1180 | $(".span-classes").html(""); |
| @@ -1157,6 +1199,12 @@ function classUpdateStatus(callbackData) { | @@ -1157,6 +1199,12 @@ function classUpdateStatus(callbackData) { | ||
| 1157 | 1199 | ||
| 1158 | }else if (callbackData.classStatus==2){ | 1200 | }else if (callbackData.classStatus==2){ |
| 1159 | 1201 | ||
| 1202 | + $(".span-classes").html(""); | ||
| 1203 | + $("#class-now").html("休息中"); | ||
| 1204 | + $(".am-dropdown-content-li-begin").css("display","none"); | ||
| 1205 | + $(".am-dropdown-content-li-rest").css("display","block"); | ||
| 1206 | + | ||
| 1207 | + | ||
| 1160 | //继续上课 | 1208 | //继续上课 |
| 1161 | $("#classes-status-rest").click(function () { | 1209 | $("#classes-status-rest").click(function () { |
| 1162 | client.sendStartClass(); | 1210 | client.sendStartClass(); |
-
请 注册 或 登录 后发表评论