张桐

20170303 演示版本

@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 <script type="text/javascript" src="js/xdyEvent.js"></script> 16 <script type="text/javascript" src="js/xdyEvent.js"></script>
17 <script type="text/javascript" src="js/drag.js"></script> 17 <script type="text/javascript" src="js/drag.js"></script>
18 18
19 - <script type="text/javascript" src="js/McuClient.js?v=1.0.0302.19"></script>  
20 - <!--<script type="text/javascript" src="http://192.168.1.140/McuClient/McuClient.js?722990836"></script>--> 19 + <script type="text/javascript" src="js/McuClient.js?v=1.0.0303.10"></script>
  20 + <!--<script type="text/javascript" src="http://192.168.1.140/McuClient/McuClient.js?722836"></script>-->
21 <script type="text/javascript" src="js/jquery-1.11.3.min.js"></script> 21 <script type="text/javascript" src="js/jquery-1.11.3.min.js"></script>
22 22
23 <script type="text/javascript" src="src/main.js"></script> 23 <script type="text/javascript" src="src/main.js"></script>
此 diff 太大无法显示。
@@ -211,7 +211,7 @@ function showFile(_data){ @@ -211,7 +211,7 @@ function showFile(_data){
211 211
212 } 212 }
213 $(".spinner").css("display","none"); 213 $(".spinner").css("display","none");
214 - $(".doc-headline-a").trigger("click"); 214 + // $(".doc-headline-a").trigger("click");
215 215
216 // var strHTML = format(tplDoc, { 216 // var strHTML = format(tplDoc, {
217 // name: _data.fileName, 217 // name: _data.fileName,
@@ -485,10 +485,22 @@ function docDelete(callbackData){ @@ -485,10 +485,22 @@ function docDelete(callbackData){
485 console.log(callbackData); 485 console.log(callbackData);
486 updateDocList(callbackData,1); 486 updateDocList(callbackData,1);
487 487
  488 +
  489 +
  490 +
488 //操作页面 491 //操作页面
489 $("li").remove(".xin"); 492 $("li").remove(".xin");
490 $(".spinner").css("display","none"); 493 $(".spinner").css("display","none");
491 $(".doc-headline-a").trigger("click"); 494 $(".doc-headline-a").trigger("click");
  495 + if (fileFromArr.length==0){
  496 + $("#docImage").attr("src","");
  497 +
  498 + $(".next-page ").css("display","none");
  499 + $(".total-page").css("display","none");
  500 + $(".bias").css("display","none");
  501 + $(".cur-page").css("display","none");
  502 + $(".prev").css("display","none");
  503 + }
492 504
493 } 505 }
494 506
@@ -980,7 +992,7 @@ function whiteboardUpdate(callbackData) { @@ -980,7 +992,7 @@ function whiteboardUpdate(callbackData) {
980 draw.drawCanvas(callbackData); 992 draw.drawCanvas(callbackData);
981 $(".spinner").css("display","none"); 993 $(".spinner").css("display","none");
982 $(".spinner1").css("display","none"); 994 $(".spinner1").css("display","none");
983 - $(".doc-headline-a").trigger("click"); 995 + // $(".doc-headline-a").trigger("click");
984 } 996 }
985 997
986 998
@@ -151,7 +151,7 @@ $(function () { @@ -151,7 +151,7 @@ $(function () {
151 $("#teacherVideo-voice").addClass("teacherVideo-voice"); 151 $("#teacherVideo-voice").addClass("teacherVideo-voice");
152 $("#teacherVideo-voice").removeClass("teacherVideo-voiceBg"); 152 $("#teacherVideo-voice").removeClass("teacherVideo-voiceBg");
153 $(".teacherVideoBg").css("display","none"); 153 $(".teacherVideoBg").css("display","none");
154 - $(".teacherVideo").css("background", "#CCCCCC"); 154 + // $(".teacherVideo").css("background", "#CCCCCC");
155 $(".teacherVideo-voice").css("bottom","4px"); 155 $(".teacherVideo-voice").css("bottom","4px");
156 $(".teacherVoicing").css("display","none"); 156 $(".teacherVoicing").css("display","none");
157 157
@@ -356,7 +356,6 @@ function _videoUpdate(callbackDate){ @@ -356,7 +356,6 @@ function _videoUpdate(callbackDate){
356 console.log("videoUpdate==============>",callbackDate); 356 console.log("videoUpdate==============>",callbackDate);
357 if (callbackDate.fromNodeId==classAllInfo.nodeId) return; 357 if (callbackDate.fromNodeId==classAllInfo.nodeId) return;
358 358
359 -  
360 if((classAllInfo.userRole=="host")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){ 359 if((classAllInfo.userRole=="host")&&(callbackDate.status==1)&&(callbackDate.fromNodeId==stuNodeId)){
361 360
362 //获取学生播流地址 361 //获取学生播流地址
@@ -686,7 +685,7 @@ function achieveStuPlayAudioStream(_pubResultObj){ @@ -686,7 +685,7 @@ function achieveStuPlayAudioStream(_pubResultObj){
686 console.log("result是=============>",streamInfo); 685 console.log("result是=============>",streamInfo);
687 $(".stuPlay").css({"width":"240px","height":"180px"}); 686 $(".stuPlay").css({"width":"240px","height":"180px"});
688 $(".teacherVideoBg").css("display","none"); 687 $(".teacherVideoBg").css("display","none");
689 - $(".teacherVideo").css("background", "#CCCCCC"); 688 + // $(".teacherVideo").css("background", "#CCCCCC");
690 $(".teacherVideo-voice").css("bottom","4px"); 689 $(".teacherVideo-voice").css("bottom","4px");
691 690
692 if(! window.playflashStuAudio) { 691 if(! window.playflashStuAudio) {
@@ -888,7 +887,7 @@ function achievePlayAudioStream(_pubResultObj){ @@ -888,7 +887,7 @@ function achievePlayAudioStream(_pubResultObj){
888 console.log("result是=============>",streamInfo); 887 console.log("result是=============>",streamInfo);
889 $(".play").css({"width":"240px","height":"180px"}); 888 $(".play").css({"width":"240px","height":"180px"});
890 $(".teacherVideoBg").css("display","none"); 889 $(".teacherVideoBg").css("display","none");
891 - $(".teacherVideo").css("background", "#CCCCCC"); 890 + // $(".teacherVideo").css("background", "#CCCCCC");
892 $(".teacherVideo-voice").css("bottom","4px"); 891 $(".teacherVideo-voice").css("bottom","4px");
893 892
894 if(! window.playflashAudio) { 893 if(! window.playflashAudio) {