张桐

1.增加开始上课,暂停上课,结束课堂功能

2.页码为1时,不能点击上一页按钮,页码为总页数时,不能点击下一页
3.音视频更新  进行修复
@@ -264,7 +264,7 @@ height: 1080px; @@ -264,7 +264,7 @@ height: 1080px;
264 margin-left: 20px; 264 margin-left: 20px;
265 color: #333; 265 color: #333;
266 font-size: 12px; 266 font-size: 12px;
267 - width: 40px; 267 + width: 100px;
268 height: 20px; 268 height: 20px;
269 } 269 }
270 270
@@ -285,6 +285,16 @@ height: 1080px; @@ -285,6 +285,16 @@ height: 1080px;
285 box-shadow: 1px; 285 box-shadow: 1px;
286 border-radius: 3px; 286 border-radius: 3px;
287 } 287 }
  288 + .am-dropdown-content-li-pause{
  289 + display: none;
  290 + }
  291 + .am-dropdown-content-li-rest{
  292 + display: none;
  293 + }
  294 +
  295 +
  296 +
  297 +
288 .am-dropdown-content3{ 298 .am-dropdown-content3{
289 min-width: 0; 299 min-width: 0;
290 z-index: 3000; 300 z-index: 3000;
@@ -783,6 +793,9 @@ height: 1080px; @@ -783,6 +793,9 @@ height: 1080px;
783 float: right; 793 float: right;
784 794
785 } 795 }
  796 +.am-dropdownClass{
  797 + float: left;
  798 +}
786 .am-modal-bd-file{ 799 .am-modal-bd-file{
787 height: 256px; 800 height: 256px;
788 width: 398px; 801 width: 398px;
@@ -1057,8 +1070,15 @@ height: 1080px; @@ -1057,8 +1070,15 @@ height: 1080px;
1057 font-size: 22px; 1070 font-size: 22px;
1058 cursor:pointer; 1071 cursor:pointer;
1059 } 1072 }
  1073 +.left .control .showBoardBtn{
  1074 + display: none;
  1075 + float: left;
  1076 + margin-left: 15px;
  1077 + font-size: 22px;
  1078 + cursor:pointer;
  1079 +}
1060 1080
1061 -.left .control .next-page a{ 1081 +.left .control .next-page .nextPage{
1062 float: right; 1082 float: right;
1063 margin:14px 20px 0 10px; 1083 margin:14px 20px 0 10px;
1064 width: 20px; 1084 width: 20px;
@@ -1066,7 +1086,14 @@ height: 1080px; @@ -1066,7 +1086,14 @@ height: 1080px;
1066 background:url("../images/right-normal.png") no-repeat; 1086 background:url("../images/right-normal.png") no-repeat;
1067 } 1087 }
1068 1088
1069 -.left .control .next-page a:active{ 1089 +.left .control .next-page .nextPage:active{
  1090 + background:url("../images/right-pre.png") no-repeat;
  1091 +}
  1092 +.nextPageNoClick{
  1093 + float: right;
  1094 + margin:14px 20px 0 10px;
  1095 + width: 20px;
  1096 + height: 20px;
1070 background:url("../images/right-pre.png") no-repeat; 1097 background:url("../images/right-pre.png") no-repeat;
1071 } 1098 }
1072 1099
@@ -1100,7 +1127,7 @@ height: 1080px; @@ -1100,7 +1127,7 @@ height: 1080px;
1100 1127
1101 } 1128 }
1102 1129
1103 -.left .control .prev a{ 1130 +.left .control .prev .prevPage{
1104 float: right; 1131 float: right;
1105 margin-top: 14px; 1132 margin-top: 14px;
1106 width: 20px; 1133 width: 20px;
@@ -1108,7 +1135,7 @@ height: 1080px; @@ -1108,7 +1135,7 @@ height: 1080px;
1108 background:url("../images/left-normal.png") no-repeat; 1135 background:url("../images/left-normal.png") no-repeat;
1109 cursor: pointer; 1136 cursor: pointer;
1110 } 1137 }
1111 -.left .control .prev a:active{ 1138 +.left .control .prev .prevPage:active{
1112 background:url("../images/left-pre.png") no-repeat; 1139 background:url("../images/left-pre.png") no-repeat;
1113 } 1140 }
1114 1141
@@ -2643,7 +2670,7 @@ canvas { @@ -2643,7 +2670,7 @@ canvas {
2643 width: 18px; 2670 width: 18px;
2644 2671
2645 } 2672 }
2646 - .left .control .next-page a{ 2673 + .left .control .next-page .nextPage{
2647 float: right; 2674 float: right;
2648 margin:5px 20px 0 10px; 2675 margin:5px 20px 0 10px;
2649 width: 20px; 2676 width: 20px;
@@ -2651,7 +2678,15 @@ canvas { @@ -2651,7 +2678,15 @@ canvas {
2651 background:url("../images/right-normal.png") no-repeat; 2678 background:url("../images/right-normal.png") no-repeat;
2652 } 2679 }
2653 2680
2654 - .left .control .next-page a:active{ 2681 + .left .control .next-page .nextPage:active{
  2682 + background:url("../images/right-pre.png") no-repeat;
  2683 + }
  2684 + .nextPageNoClick{
  2685 + float: right;
  2686 + margin:5px 20px 0 10px;
  2687 + width: 20px;
  2688 + height: 20px;
  2689 + cursor: default;
2655 background:url("../images/right-pre.png") no-repeat; 2690 background:url("../images/right-pre.png") no-repeat;
2656 } 2691 }
2657 2692
@@ -2659,16 +2694,17 @@ canvas { @@ -2659,16 +2694,17 @@ canvas {
2659 float: right; 2694 float: right;
2660 margin-left: 5px; 2695 margin-left: 5px;
2661 height: 30px; 2696 height: 30px;
2662 - line-height: 30px; 2697 + line-height: 26px;
2663 } 2698 }
2664 .left .control .total-page span{ 2699 .left .control .total-page span{
2665 font-size: 12px; 2700 font-size: 12px;
  2701 +
2666 } 2702 }
2667 .left .control .bias{ 2703 .left .control .bias{
2668 float: right; 2704 float: right;
2669 margin-left: 5px; 2705 margin-left: 5px;
2670 height: 30px ; 2706 height: 30px ;
2671 - line-height: 30px; 2707 + line-height: 27px;
2672 2708
2673 } 2709 }
2674 .left .control .cur-page{ 2710 .left .control .cur-page{
@@ -2688,7 +2724,7 @@ canvas { @@ -2688,7 +2724,7 @@ canvas {
2688 2724
2689 } 2725 }
2690 2726
2691 - .left .control .prev a{ 2727 + .left .control .prev .prevPage{
2692 float: right; 2728 float: right;
2693 margin-top: 5px; 2729 margin-top: 5px;
2694 width: 20px; 2730 width: 20px;
@@ -2696,9 +2732,97 @@ canvas { @@ -2696,9 +2732,97 @@ canvas {
2696 background:url("../images/left-normal.png") no-repeat; 2732 background:url("../images/left-normal.png") no-repeat;
2697 cursor: pointer; 2733 cursor: pointer;
2698 } 2734 }
2699 - .left .control .prev a:active{ 2735 + .left .control .prev .prevPage:active{
2700 background:url("../images/left-pre.png") no-repeat; 2736 background:url("../images/left-pre.png") no-repeat;
2701 } 2737 }
  2738 + .prevPageNoClick{
  2739 + float: right;
  2740 + margin-top: 5px;
  2741 + width: 20px;
  2742 + height: 20px;
  2743 + cursor: default;
  2744 + background:url("../images/left-pre.png") no-repeat;
  2745 + }
  2746 +
  2747 + /*直播中*/
  2748 +
  2749 + .live {
  2750 + position: absolute;
  2751 + width: 26%;
  2752 + height: 34%;
  2753 + bottom: 20%;
  2754 + }
  2755 +
  2756 + .live i {
  2757 + width: 4%;
  2758 + height: 10%;
  2759 + position: absolute;
  2760 + bottom: 0;
  2761 + background-color: red;
  2762 + }
  2763 +
  2764 + .live i:nth-of-type(1) {
  2765 + left: 0;
  2766 + }
  2767 +
  2768 + .live i:nth-of-type(2) {
  2769 + left: 6px;
  2770 + }
  2771 +
  2772 + .live i:nth-of-type(3) {
  2773 + left: 12px;
  2774 + }
  2775 +
  2776 + .live i:nth-of-type(4) {
  2777 + left: 18px;
  2778 + }
  2779 +
  2780 + .live.active i:nth-of-type(1) {
  2781 + -webkit-animation: wave 0.9s linear infinite;
  2782 + animation: wave 0.9s linear infinite;
  2783 + }
  2784 +
  2785 + .live.active i:nth-of-type(2) {
  2786 + -webkit-animation: wave 0.7s linear infinite;
  2787 + animation: wave 0.7s linear infinite;
  2788 + }
  2789 +
  2790 + .live.active i:nth-of-type(3) {
  2791 + -webkit-animation: wave 0.8s linear infinite;
  2792 + animation: wave 0.8s linear infinite;
  2793 + }
  2794 +
  2795 + .live.active i:nth-of-type(4) {
  2796 + -webkit-animation: wave 0.6s linear infinite;
  2797 + animation: wave 0.6s linear infinite;
  2798 + }
  2799 +
  2800 + @-webkit-keyframes wave {
  2801 + 0% {
  2802 + height: 6px
  2803 + }
  2804 + 50% {
  2805 + height: 20px
  2806 + }
  2807 + 100% {
  2808 + height: 12px
  2809 + }
  2810 + }
  2811 +
  2812 + @keyframes wave {
  2813 + 0% {
  2814 + height: 8px
  2815 + }
  2816 + 50% {
  2817 + height: 20px
  2818 + }
  2819 + 100% {
  2820 + height: 12px
  2821 + }
  2822 + }
  2823 +
  2824 +
  2825 +
2702 2826
2703 /*进度条*/ 2827 /*进度条*/
2704 .left .control .voice-progress{ 2828 .left .control .voice-progress{
@@ -3610,9 +3734,8 @@ canvas { @@ -3610,9 +3734,8 @@ canvas {
3610 position: absolute; 3734 position: absolute;
3611 width: 26%; 3735 width: 26%;
3612 height: 34%; 3736 height: 34%;
3613 - margin-left: 25%;  
3614 - bottom: 30%;  
3615 - display: none; 3737 + bottom: 20%;
  3738 +
3616 } 3739 }
3617 .live i { 3740 .live i {
3618 width: 4%; 3741 width: 4%;
@@ -71,41 +71,8 @@ @@ -71,41 +71,8 @@
71 71
72 <!--头部--> 72 <!--头部-->
73 <div class="header clear"> 73 <div class="header clear">
74 - <!--<li class="cur-status">-->  
75 - <!--<span id="no-start" class="no-start iconfont">&#xe62b;</span>-->  
76 - <!--<div id='live' class="live active">-->  
77 - <!--<i></i>-->  
78 - <!--<i></i>-->  
79 - <!--<i></i>-->  
80 - <!--<i></i>-->  
81 - <!--</div>-->  
82 - <!--<a id="a-status" href="javascript: void(0)">未开始</a></li>-->  
83 - <!--右侧未开始-->  
84 - <div class="am-dropdown" data-am-dropdown>  
85 - <button type="button" class="am-btn am-btn-primary am-dropdown-toggle " data-am-dropdown-toggle><span  
86 - id="span-iconfont" class="span-classes iconfont">&#xe62b;</span><span id="class-now">未开始</span>  
87 - </button>  
88 - <ul class="am-dropdown-content">  
89 - <li><span id="am-dropdown-content-span-1" class="am-dropdown-content-span iconfont">&#xe61d;</span>  
90 - <button id="classes-status-1" type="button"  
91 - class="am-btn am-btn-primary am-dropdown-content-button"  
92 - href="#">开始上课  
93 - </button>  
94 - </li>  
95 -  
96 - <li><span class="am-dropdown-content-span iconfont">&#xe607;</span>  
97 - <button id="classes-status-2" type="button"  
98 - class="am-btn am-btn-primary am-dropdown-content-button"  
99 - data-am-modal="{target: '#end-classes', closeViaDimmer: 0, width: 340, height: 172}"  
100 - href="#">结束课堂  
101 - </button>  
102 - </li>  
103 -  
104 -  
105 - </ul>  
106 - </div>  
107 - <li class="classroom"><a id="classCurName" href="javascript: void(0)"></a></li>  
108 - <li class="classCurId"><a id="classCurId" href="javascript: void(0)"></a></li> 74 + <li class="classroom">课堂主题:<a id="classCurName" href="javascript: void(0)"></a></li>
  75 + <li class="classCurId">用户ID:<a id="classCurId" href="javascript: void(0)"></a></li>
109 76
110 <!--设置--> 77 <!--设置-->
111 <div class="am-dropdown" data-am-dropdown> 78 <div class="am-dropdown" data-am-dropdown>
@@ -181,36 +148,48 @@ @@ -181,36 +148,48 @@
181 148
182 149
183 <!--帮助--> 150 <!--帮助-->
184 - <div class="am-dropdown" data-am-dropdown> 151 + <div class="am-dropdown " data-am-dropdown>
185 <a href="javascript: void(0)"><button class="am-btn am-btn-primary am-dropdown-toggle " data-am-dropdown-toggle><span 152 <a href="javascript: void(0)"><button class="am-btn am-btn-primary am-dropdown-toggle " data-am-dropdown-toggle><span
186 class="span-help iconfont">&#xe608;</span>帮助 153 class="span-help iconfont">&#xe608;</span>帮助
187 </button></a> 154 </button></a>
188 </div> 155 </div>
189 156
190 - <!--&lt;!&ndash;右侧未开始&ndash;&gt;-->  
191 - <!--<div class="am-dropdown" data-am-dropdown>-->  
192 - <!--<button type="button" class="am-btn am-btn-primary am-dropdown-toggle " data-am-dropdown-toggle><span-->  
193 - <!--id="span-iconfont" class="span-classes iconfont">&#xe62b;</span><span id="class-now">未开始</span>-->  
194 - <!--</button>-->  
195 - <!--<ul class="am-dropdown-content">-->  
196 - <!--<li><span id="am-dropdown-content-span-1" class="am-dropdown-content-span iconfont">&#xe61d;</span>-->  
197 - <!--<button id="classes-status-1" type="button"-->  
198 - <!--class="am-btn am-btn-primary am-dropdown-content-button"-->  
199 - <!--href="#">开始上课-->  
200 - <!--</button>-->  
201 - <!--</li>--> 157 + <!--右侧未开始-->
  158 + <div class="am-dropdown classStatus" data-am-dropdown>
  159 + <button type="button" class="am-btn am-btn-primary am-dropdown-toggle " data-am-dropdown-toggle><span
  160 + id="span-iconfont" class="span-classes iconfont">&#xe62b;</span><span id="class-now">未开始</span>
  161 + </button>
  162 + <ul class="am-dropdown-content">
  163 + <li class="am-dropdown-content-li-begin"><span id="am-dropdown-content-span-1" class="am-dropdown-content-span iconfont">&#xe61d;</span>
  164 + <button id="classes-status-begin" type="button"
  165 + class="am-btn am-btn-primary am-dropdown-content-button"
  166 + href="#">开始上课
  167 + </button>
  168 + </li>
  169 + <li class="am-dropdown-content-li-pause"><span id="am-dropdown-content-span-pause" class="am-dropdown-content-span iconfont">&#xe60a;</span>
  170 + <button id="classes-status-pause" type="button"
  171 + class="am-btn am-btn-primary am-dropdown-content-button"
  172 + href="#">暂停课堂
  173 + </button>
  174 + </li>
  175 + <li class="am-dropdown-content-li-rest"><span id="am-dropdown-content-span-rest" class="am-dropdown-content-span iconfont">&#xe61d;</span>
  176 + <button id="classes-status-rest" type="button"
  177 + class="am-btn am-btn-primary am-dropdown-content-button"
  178 + href="#">继续上课
  179 + </button>
  180 + </li>
202 181
203 - <!--<li><span class="am-dropdown-content-span iconfont">&#xe607;</span>-->  
204 - <!--<button id="classes-status-2" type="button"-->  
205 - <!--class="am-btn am-btn-primary am-dropdown-content-button"-->  
206 - <!--data-am-modal="{target: '#end-classes', closeViaDimmer: 0, width: 340, height: 172}"-->  
207 - <!--href="#">结束课堂-->  
208 - <!--</button>-->  
209 - <!--</li>--> 182 + <li class="am-dropdown-content-li-stop"><span class="am-dropdown-content-span iconfont">&#xe607;</span>
  183 + <button id="classes-status-2" type="button"
  184 + class="am-btn am-btn-primary am-dropdown-content-button"
  185 + data-am-modal="{target: '#end-classes-1', closeViaDimmer: 0, width: 340, height: 172}"
  186 + href="#">结束课堂
  187 + </button>
  188 + </li>
210 189
211 190
212 - <!--</ul>-->  
213 - <!--</div>--> 191 + </ul>
  192 + </div>
214 193
215 194
216 <!--弹出层-结束课堂--> 195 <!--弹出层-结束课堂-->
@@ -349,12 +328,14 @@ @@ -349,12 +328,14 @@
349 <div class="control"> 328 <div class="control">
350 <ul class="clear"> 329 <ul class="clear">
351 <li class="fileUpload iconfont" data-am-modal="{target: '#doc-modal-1', closeViaDimmer: 0, width: 398, height: 288}">&#xe620;</li> 330 <li class="fileUpload iconfont" data-am-modal="{target: '#doc-modal-1', closeViaDimmer: 0, width: 398, height: 288}">&#xe620;</li>
  331 + <li class="showBoardBtn iconfont">&#xe61f;</li>
  332 +
352 333
353 - <li class="next-page "><a id="nextPage" href="javascript:void(0)"></a></li> 334 + <li class="next-page "><a id="nextPage" class="nextPage" href="javascript:void(0)"></a></li>
354 <li class="total-page"><span id="totalPageNum">0</span></li> 335 <li class="total-page"><span id="totalPageNum">0</span></li>
355 <li class="bias">/</li> 336 <li class="bias">/</li>
356 <li class="cur-page"><span id="curPageNum">0</span></li> 337 <li class="cur-page"><span id="curPageNum">0</span></li>
357 - <li class="prev"><a id="prevPage" href="javascript:void(0)"></a></li> 338 + <li class="prev"><a id="prevPage" class="prevPage" href="javascript:void(0)"></a></li>
358 339
359 340
360 </ul> 341 </ul>
@@ -471,15 +471,6 @@ var color = '#b8242a'; @@ -471,15 +471,6 @@ var color = '#b8242a';
471 } 471 }
472 472
473 } 473 }
474 - function trans(msg) {  
475 - CanvasConInfo=msg;  
476 -  
477 -  
478 - }  
479 - // function transInfo(msg) {  
480 - // CanvasConInfoTran=msg;  
481 - //  
482 - // }  
483 474
484 window.draw={ 475 window.draw={
485 initCanvas:initCanvas, 476 initCanvas:initCanvas,
@@ -488,7 +479,6 @@ window.draw={ @@ -488,7 +479,6 @@ window.draw={
488 recordPencilResult:recordPencilResult, 479 recordPencilResult:recordPencilResult,
489 drawCanvas:drawCanvas, 480 drawCanvas:drawCanvas,
490 clearCanvasCon:clearCanvasCon, 481 clearCanvasCon:clearCanvasCon,
491 - trans:trans,  
492 clearContextCan:clearContextCan, 482 clearContextCan:clearContextCan,
493 483
494 clearDocCanvas:clearDocCanvas 484 clearDocCanvas:clearDocCanvas
@@ -18,6 +18,7 @@ var imgUrl; @@ -18,6 +18,7 @@ var imgUrl;
18 var curPageNum; 18 var curPageNum;
19 var pageNum; 19 var pageNum;
20 var fileItemIdx; 20 var fileItemIdx;
  21 +var classErrorCode;
21 22
22 23
23 //画布 24 //画布
@@ -46,7 +47,7 @@ function mainTimeStamp() { @@ -46,7 +47,7 @@ function mainTimeStamp() {
46 47
47 $(function () { 48 $(function () {
48 initEngine();//加载MCUClientEngine; 49 initEngine();//加载MCUClientEngine;
49 - listenClass(); 50 + listenClass(); //监听事件
50 loading(); 51 loading();
51 urlParamsJudge();//对地址栏参数的数据进行判断 52 urlParamsJudge();//对地址栏参数的数据进行判断
52 }); 53 });
@@ -530,7 +531,6 @@ function docDelete(callbackData){ @@ -530,7 +531,6 @@ function docDelete(callbackData){
530 $(".doc-headline-a").trigger("click"); 531 $(".doc-headline-a").trigger("click");
531 if (fileFromArr.length==0){ 532 if (fileFromArr.length==0){
532 $("#docImage").attr("src",""); 533 $("#docImage").attr("src","");
533 -  
534 $(".next-page ").css("display","none"); 534 $(".next-page ").css("display","none");
535 $(".total-page").css("display","none"); 535 $(".total-page").css("display","none");
536 $(".bias").css("display","none"); 536 $(".bias").css("display","none");
@@ -565,11 +565,15 @@ function updateDocList(_data,isAdd) { @@ -565,11 +565,15 @@ function updateDocList(_data,isAdd) {
565 $("#docImage").attr("src",""); 565 $("#docImage").attr("src","");
566 $("#showImg").attr("src",""); 566 $("#showImg").attr("src","");
567 $(".canvas_container").css("overflow-y","hidden"); 567 $(".canvas_container").css("overflow-y","hidden");
  568 + $(".canvas_container").scrollTop(0);
568 hideTurnPage(); 569 hideTurnPage();
569 if (classAllInfo.userRole=="normal"){ 570 if (classAllInfo.userRole=="normal"){
  571 + $("#showImg").css("display","block");
570 $("#docImage").attr("src",""); 572 $("#docImage").attr("src","");
571 $("#showImg").attr("src",""); 573 $("#showImg").attr("src","");
  574 + $(".canvas_container").scrollTop(0);
572 $(".canvas_container").css("overflow-y","hidden"); 575 $(".canvas_container").css("overflow-y","hidden");
  576 +
573 } 577 }
574 fileFromArr.splice(i,1); 578 fileFromArr.splice(i,1);
575 579
@@ -605,8 +609,8 @@ function classFailed(callbackData) { @@ -605,8 +609,8 @@ function classFailed(callbackData) {
605 console.log("classFailed---课堂失败"); 609 console.log("classFailed---课堂失败");
606 console.log(callbackData); 610 console.log(callbackData);
607 611
608 - var code=callbackData.code;  
609 - switch(code) { 612 + classErrorCode=callbackData.code;
  613 + switch(classErrorCode) {
610 case 100: 614 case 100:
611 //当前没有 课堂号 用户角色 ip 615 //当前没有 课堂号 用户角色 ip
612 if((classLoadInfo.classId)==""||classLoadInfo.userRole==""||(classLoadInfo.portal)==":"||(classLoadInfo.portalPort)==""||(classLoadInfo.portalIP)==""||(classLoadInfo.userName)==""){ 616 if((classLoadInfo.classId)==""||classLoadInfo.userRole==""||(classLoadInfo.portal)==":"||(classLoadInfo.portalPort)==""||(classLoadInfo.portalIP)==""||(classLoadInfo.userName)==""){
@@ -693,6 +697,10 @@ function classFailed(callbackData) { @@ -693,6 +697,10 @@ function classFailed(callbackData) {
693 function mcuErrorTip(){ 697 function mcuErrorTip(){
694 $(".passWordTip").css("margin-left","45px"); 698 $(".passWordTip").css("margin-left","45px");
695 $(".passWordTip")[0].innerHTML="请稍后再试,正在重新连接"; 699 $(".passWordTip")[0].innerHTML="请稍后再试,正在重新连接";
  700 + if (classAllInfo.userRole=="normal"){
  701 + $(".box").css("display","none");
  702 + }
  703 +
696 } 704 }
697 705
698 706
@@ -784,7 +792,7 @@ function showLogin(isShow){ @@ -784,7 +792,7 @@ function showLogin(isShow){
784 $("#btnLogin").click(function (e) { 792 $("#btnLogin").click(function (e) {
785 793
786 console.log("点击了登录按钮---------->"); 794 console.log("点击了登录按钮---------->");
787 - var userName = classLoadInfo.userName; 795 + var userName = $(".userNameInput")[0].value;
788 var pwd = $(".passWordInput")[0].value; 796 var pwd = $(".passWordInput")[0].value;
789 797
790 // var userName = $(".userNameInput").val(); 798 // var userName = $(".userNameInput").val();
@@ -844,8 +852,8 @@ function showLogin(isShow){ @@ -844,8 +852,8 @@ function showLogin(isShow){
844 852
845 $("#btnLogin").click(function (e) { 853 $("#btnLogin").click(function (e) {
846 console.log("点击了登录按钮---------->"); 854 console.log("点击了登录按钮---------->");
847 - var userName = classLoadInfo.userName;  
848 - console.log(userName,pwd); 855 + var userName = $(".userNameInput")[0].value;
  856 + // console.log(userName,pwd);
849 // var userName = $(".userNameInput").val(); 857 // var userName = $(".userNameInput").val();
850 // var pwd = $(".passWordInput").val(); 858 // var pwd = $(".passWordInput").val();
851 if ($(".userNameInput").length) { 859 if ($(".userNameInput").length) {
@@ -921,8 +929,16 @@ function showParmasInput(){ @@ -921,8 +929,16 @@ function showParmasInput(){
921 //加入课堂成功 929 //加入课堂成功
922 function classJoinSuccess(callbackData){ 930 function classJoinSuccess(callbackData){
923 classAllInfo=callbackData; 931 classAllInfo=callbackData;
924 - console.log("classJoinSuccess",callbackData);  
925 - console.log(callbackData); 932 + console.log("classJoinSuccess====>",callbackData);
  933 +
  934 +
  935 +
  936 +
  937 +
  938 +
  939 +
  940 +
  941 +
926 942
927 //去掉复制功能 943 //去掉复制功能
928 document.body.onselectstart=document.body.oncontextmenu=function(){ return false;} 944 document.body.onselectstart=document.body.oncontextmenu=function(){ return false;}
@@ -931,7 +947,7 @@ function classJoinSuccess(callbackData){ @@ -931,7 +947,7 @@ function classJoinSuccess(callbackData){
931 $(".Color1").trigger("click"); 947 $(".Color1").trigger("click");
932 $(".pencil").trigger("click"); 948 $(".pencil").trigger("click");
933 //根据用户权限,隐藏不同界面,如果是学生,隐藏白板 949 //根据用户权限,隐藏不同界面,如果是学生,隐藏白板
934 -if (callbackData.userRole=="normal"){ 950 + if (callbackData.userRole=="normal"){
935 951
936 $("#tool").css("display","none"); 952 $("#tool").css("display","none");
937 $(".fileUpload").css("display","none"); 953 $(".fileUpload").css("display","none");
@@ -944,7 +960,6 @@ if (callbackData.userRole=="normal"){ @@ -944,7 +960,6 @@ if (callbackData.userRole=="normal"){
944 $(".stuVideo-videoNotClick").css("display","none"); 960 $(".stuVideo-videoNotClick").css("display","none");
945 $(".stuVideo-voiceNotClick").css("display","none"); 961 $(".stuVideo-voiceNotClick").css("display","none");
946 } 962 }
947 -  
948 //准备主页面 963 //准备主页面
949 layoutView(); 964 layoutView();
950 } 965 }
@@ -981,8 +996,14 @@ function layoutView( ) { @@ -981,8 +996,14 @@ function layoutView( ) {
981 // 996 //
982 // } 997 // }
983 998
984 -  
985 - 999 + $(".showBoardBtn").click(function () {
  1000 + $(".docImage").css("display","none");
  1001 + $(".showImg").css("display","none");
  1002 + });
  1003 + $(".fileUpload").click(function () {
  1004 + $(".docImage").css("display","block");
  1005 + $(".showImg").css("display","block");
  1006 + });
986 1007
987 1008
988 1009
@@ -1000,8 +1021,19 @@ function layoutView( ) { @@ -1000,8 +1021,19 @@ function layoutView( ) {
1000 1021
1001 //点击下一页 1022 //点击下一页
1002 $("#nextPage").on("click",function (e) { 1023 $("#nextPage").on("click",function (e) {
  1024 + $("#prevPage").removeClass("prevPageNoClick");
  1025 + $("#prevPage").addClass("prevPage");
1003 1026
1004 console.log(curPageNum); 1027 console.log(curPageNum);
  1028 + if (curPageNum<pageNum){
  1029 + $("#nextPage").removeClass("nextPageNoClick");
  1030 + $("#nextPage").addClass("nextPage");
  1031 +
  1032 + console.log(curPageNum);
  1033 + var docfullSingle=docfullPath[curPageNum-1];
  1034 + console.log("curPageNum,docfullSingle",curPageNum,docfullSingle);
  1035 + $("#docImage").attr("src",docfullSingle);
  1036 +
1005 1037
1006 var paramInfo={ 1038 var paramInfo={
1007 "itemIdx": fileItemIdx, 1039 "itemIdx": fileItemIdx,
@@ -1010,29 +1042,27 @@ function layoutView( ) { @@ -1010,29 +1042,27 @@ function layoutView( ) {
1010 console.log("paramInfo=======>",paramInfo) 1042 console.log("paramInfo=======>",paramInfo)
1011 client.sendDocumentSwitchPage(paramInfo); 1043 client.sendDocumentSwitchPage(paramInfo);
1012 $("#curPageNum").html(curPageNum); 1044 $("#curPageNum").html(curPageNum);
1013 -  
1014 - if (curPageNum!==pageNum){  
1015 - console.log(curPageNum);  
1016 - var docfullSingle=docfullPath[curPageNum-1];  
1017 - console.log("curPageNum,docfullSingle",curPageNum,docfullSingle);  
1018 - $("#docImage").attr("src",docfullSingle);  
1019 -  
1020 - // curPageNum++;  
1021 } 1045 }
1022 - 1046 + if(curPageNum==(pageNum-1)){
  1047 + $("#nextPage").removeClass("nextPage");
  1048 + $("#nextPage").addClass("nextPageNoClick");
  1049 + }
1023 1050
1024 }); 1051 });
1025 1052
1026 //点击上一页 1053 //点击上一页
1027 $("#prevPage").on("click",function (e) { 1054 $("#prevPage").on("click",function (e) {
1028 if (curPageNum>1){ 1055 if (curPageNum>1){
  1056 + $("#nextPage").removeClass("nextPageNoClick");
  1057 + $("#nextPage").addClass("nextPage");
  1058 +
  1059 + $("#prevPage").removeClass("prevPageNoClick");
  1060 + $("#prevPage").addClass("prevPage");
1029 console.log("curPageNum",curPageNum); 1061 console.log("curPageNum",curPageNum);
1030 1062
1031 var docfullSingle=docfullPath[curPageNum-1]; 1063 var docfullSingle=docfullPath[curPageNum-1];
1032 console.log("curPageNum,docfullSingle",curPageNum,docfullSingle); 1064 console.log("curPageNum,docfullSingle",curPageNum,docfullSingle);
1033 $("#docImage").attr("src",docfullSingle); 1065 $("#docImage").attr("src",docfullSingle);
1034 -  
1035 - }  
1036 console.log(curPageNum); 1066 console.log(curPageNum);
1037 var paramInfo={ 1067 var paramInfo={
1038 "itemIdx": fileItemIdx, 1068 "itemIdx": fileItemIdx,
@@ -1042,6 +1072,16 @@ function layoutView( ) { @@ -1042,6 +1072,16 @@ function layoutView( ) {
1042 client.sendDocumentSwitchPage(paramInfo); 1072 client.sendDocumentSwitchPage(paramInfo);
1043 $("#curPageNum").html(curPageNum); 1073 $("#curPageNum").html(curPageNum);
1044 1074
  1075 + }
  1076 +
  1077 + if (curPageNum==2){
  1078 + $("#prevPage").removeClass("prevPage");
  1079 + $("#prevPage").addClass("prevPageNoClick");
  1080 +
  1081 +
  1082 + }
  1083 +
  1084 +
1045 }); 1085 });
1046 1086
1047 1087
@@ -1077,7 +1117,72 @@ function whiteboardUpdate(callbackData) { @@ -1077,7 +1117,72 @@ function whiteboardUpdate(callbackData) {
1077 // } 1117 // }
1078 //监听会议状态更新 1118 //监听会议状态更新
1079 function classUpdateStatus(callbackData) { 1119 function classUpdateStatus(callbackData) {
1080 - console.log(callbackData); 1120 + console.log("监听会议状态更新======>",callbackData);
  1121 +
  1122 + //当前课堂的状态0(未开始) 、1(已经开始) 2(暂停中)
  1123 + if(callbackData.classStatus==0){
  1124 + //加入课堂成功后,点击开始上课
  1125 + $("#classes-status-begin").click(function () {
  1126 +
  1127 + $(".am-dropdown-content-li-begin").css("display","none");
  1128 + $(".am-dropdown-content-li-pause").css("display","block");
  1129 + $(".span-classes").html("&#xe609;");
  1130 + $("#class-now").html("直播中");
  1131 + client.sendStartClass();
  1132 +
  1133 +
  1134 + });
  1135 + }else if (callbackData.classStatus==1){
  1136 + //暂停课堂
  1137 + $("#classes-status-pause").click(function () {
  1138 + $(".span-classes").html("&#xe60a;");
  1139 + $("#class-now").html("休息中");
  1140 + $(".am-dropdown-content-li-pause").css("display","none");
  1141 + $(".am-dropdown-content-li-rest").css("display","block");
  1142 + client.sendPauseClass();
  1143 +
  1144 + });
  1145 +
  1146 +
  1147 + //结束课堂,课堂的状态还原为未开始状态,所有人都要离开课堂。
  1148 + $("#end").click(function () {
  1149 + $(".box").css("display", "none");
  1150 + client.sendCloseClass();
  1151 + });
  1152 + //退出,但不结束课堂,是当前这个人退出
  1153 + $("#end-no-exit").click(function () {
  1154 + client.leaveClass();
  1155 + $(".box").css("display", "none");
  1156 + });
  1157 +
  1158 + }else if (callbackData.classStatus==2){
  1159 +
  1160 + //继续上课
  1161 + $("#classes-status-rest").click(function () {
  1162 + client.sendStartClass();
  1163 + $(".am-dropdown-content-li-rest").css("display","none");
  1164 + $(".am-dropdown-content-li-pause").css("display","block");
  1165 + $(".span-classes").html("&#xe609;");
  1166 + $("#class-now").html("直播中");
  1167 +
  1168 + });
  1169 +
  1170 + //结束课堂,课堂的状态还原为未开始状态,所有人都要离开课堂。
  1171 + $("#end").click(function () {
  1172 + $(".box").css("display", "none");
  1173 + client.sendCloseClass();
  1174 + });
  1175 + //退出,但不结束课堂,是当前这个人退出
  1176 + $("#end-no-exit").click(function () {
  1177 + client.leaveClass();
  1178 + $(".box").css("display", "none");
  1179 + });
  1180 +
  1181 + }else{
  1182 +
  1183 + }
  1184 +
  1185 +
1081 } 1186 }
1082 1187
1083 //接收聊天消息 1188 //接收聊天消息
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 6
7 var client; //客户端 7 var client; //客户端
8 8
  9 +var teaNodeId;
9 var stuNodeId; 10 var stuNodeId;
10 11
11 var videoWithFlash={}; 12 var videoWithFlash={};
@@ -359,6 +360,17 @@ function userListUpdate(callbackData) { @@ -359,6 +360,17 @@ function userListUpdate(callbackData) {
359 $(".curStuUserName").html(callbackData.nodeData.name); 360 $(".curStuUserName").html(callbackData.nodeData.name);
360 } 361 }
361 } 362 }
  363 + if (classAllInfo.userRole=="normal"){
  364 + if (classAllInfo.nodeId == callbackData.nodeId) {
  365 + console.log("callbackData.nodeId=====normal===========>", callbackData.nodeId);
  366 + stuNodeId = callbackData.nodeId;
  367 + }else{
  368 + teaNodeId=callbackData.nodeId;
  369 + console.log("callbackData.nodeId=====teaNodeIdnormal===========>", teaNodeId,callbackData.nodeId)
  370 +
  371 + }
  372 +
  373 + }
362 374
363 } 375 }
364 //人员离开 376 //人员离开
@@ -375,7 +387,7 @@ function userListLeave(callbackData){ @@ -375,7 +387,7 @@ function userListLeave(callbackData){
375 } 387 }
376 // 监听当前是否有视频流更新 388 // 监听当前是否有视频流更新
377 function _videoUpdate(callbackDate){ 389 function _videoUpdate(callbackDate){
378 - console.log("videoUpdate==============>",callbackDate); 390 + console.log("videoUpdate==============>",callbackDate,callbackDate.fromNodeId,stuNodeId);
379 if (callbackDate.fromNodeId==classAllInfo.nodeId) return; 391 if (callbackDate.fromNodeId==classAllInfo.nodeId) return;
380 392
381 if((classAllInfo.userRole=="host")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){ 393 if((classAllInfo.userRole=="host")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){
@@ -383,7 +395,7 @@ function _videoUpdate(callbackDate){ @@ -383,7 +395,7 @@ function _videoUpdate(callbackDate){
383 //获取学生播流地址 395 //获取学生播流地址
384 achieveStuPlayStream(callbackDate); 396 achieveStuPlayStream(callbackDate);
385 } 397 }
386 - if ((classAllInfo.userRole=="normal")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){ 398 + if ((classAllInfo.userRole=="normal")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==teaNodeId)){
387 399
388 //获取老师播流地址 400 //获取老师播流地址
389 achievePlayStream(callbackDate); 401 achievePlayStream(callbackDate);
@@ -410,7 +422,7 @@ function _videoUpdate(callbackDate){ @@ -410,7 +422,7 @@ function _videoUpdate(callbackDate){
410 422
411 423
412 } 424 }
413 - if((classAllInfo.userRole=="normal")&&(callbackDate.status==0)&&(callbackDate.fromNodeId == stuNodeId)){ 425 + if((classAllInfo.userRole=="normal")&&(callbackDate.status==0)&&(callbackDate.fromNodeId == teaNodeId)){
414 //老师的流关闭 426 //老师的流关闭
415 if(window.playflash){ 427 if(window.playflash){
416 428
@@ -447,7 +459,7 @@ function _audioUpdate(callbackDate){ @@ -447,7 +459,7 @@ function _audioUpdate(callbackDate){
447 459
448 } 460 }
449 461
450 - if ((classAllInfo.userRole=="normal")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){ 462 + if ((classAllInfo.userRole=="normal")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==teaNodeId)){
451 achievePlayAudioStream(callbackDate); 463 achievePlayAudioStream(callbackDate);
452 464
453 } 465 }
@@ -473,7 +485,7 @@ function _audioUpdate(callbackDate){ @@ -473,7 +485,7 @@ function _audioUpdate(callbackDate){
473 485
474 486
475 } 487 }
476 - if ((classAllInfo.userRole=="normal")&&(callbackDate.status==0)&&(callbackDate.fromNodeId==stuNodeId)){ 488 + if ((classAllInfo.userRole=="normal")&&(callbackDate.status==0)&&(callbackDate.fromNodeId==teaNodeId)){
477 if(window.playflashAudio) { 489 if(window.playflashAudio) {
478 console.log("playflashAudioId", playflashAudioId); 490 console.log("playflashAudioId", playflashAudioId);
479 const stopPlayInfo = JSON.stringify({ 491 const stopPlayInfo = JSON.stringify({