Merge branch 'new_Kira' of gitlab.gaoxiaobang.com:kira/programming into feature/20170228_rest

ykxie
2 parents 2c8e086e 47332003
Showing 6 changed files with 107 additions and 34 deletions
src/css/recording.css
src/js/gb.js
src/js/gbreplayer.js
src/player.html
src/scss/recording.scss
src/v1.1/player.html
@@ -38,6 +38,12 @@ button {
   padding-left: 0;
   padding-right: 0; }
+.play-code {
+  background: transparent;
+  color: #fff;
+  border: none;
+  padding-left: 24px; }
+
 .upload-tip {
   position: absolute;
   top: 0;
@@ -308,6 +308,10 @@ $(function() {
                 _CodeMirrorRecordId, 
                 _CodeMirrorReplayId,
                 _num = 0;
+
+            console.log('---------------------------------------')
+            console.log(obj)
+            console.log('---------------------------------------')
             // 判断是否是初始化选时候调用 showEdite
             if(obj){
                 for (var i = 0; i < treeLinkEditor.length; i++) {
@@ -996,8 +1000,7 @@ $(function() {
                         }
                     });
                 }else{
-                    playCode();
-                    GBCodePlayBack.editable(0)
+                    $('.play-code').show();
                 }
@@ -1912,7 +1915,8 @@ $(function() {
         },
         changeValueCallback: function(record, replay_type, offset) {
             // console.info('GBCodePlayBack.changeValueCallback');
-            // console.log(record);
+            console.log(record);
+
             var obj = record.changeobj,
                 editor = record.editor;
@@ -1943,7 +1947,7 @@ $(function() {
                 record.trigger = 1; //标记已运行
                 record.playTime = new Date().getTime(); // 播放开始时间
                 GBCodePlayBack.codeTimes = 1;   // 
-                console.log(record)
+                
                 var resultData = {
                     status: record.status || 200,
                     compilerInfo: record.compilerInfo || '',
@@ -1990,6 +1994,13 @@ $(function() {
                         .removeClass('glyphicon-pause');
                     $('#recordertab a:first').tab('show');
+                    if(_role == 1){
+                        for (var i = 0; i < GBCodePlayBack.records.length; i++) {
+                            GBCodePlayBack.records[i].trigger = 0;
+                        }
+                        $('.play-code').attr('disabled', false);
+                    }
+                    
                     if(document.URL.indexOf('index.htm') >= 0) {
                         Hourglass.stopTimer();
                     }
@@ -2029,6 +2040,12 @@ $(function() {
                     var $sliderpropress = $(".replayprogress");
                     $sliderpropress.slider("option", "disabled", false);
                     $('#excerciselist .ineedautocodehelp').data('status', 0).attr('title', '播放').find('span').addClass('glyphicon-play-circle').removeClass('glyphicon-stop');
+                    if(_role == 1){
+                        for (var i = 0; i < GBCodePlayBack.records.length; i++) {
+                            GBCodePlayBack.records[i].trigger = 0;
+                        }
+                        $('.play-code').attr('disabled', false);
+                    }
                 }
             }
         },
@@ -2327,6 +2344,14 @@ $(function() {
         runResult()
     });
+    $('.play-code').click(function(){
+        $('.play-code').attr('disabled', true);
+        console.log('--------------------');
+        playCode();
+        GBCodePlayBack.editable(0)
+        // playEnd();
+    });
+
     // 使用服务端编译语言
     $('#compileBtnGroup').unbind("click").on('click', '#CompileBtn', function(event){
         console.info('$(\'#compileBtnGroup\').unbind("click")')
@@ -2341,13 +2366,15 @@ $(function() {
             var runStatus = $("#CompileBtn").data('run');
             if (runStatus == 1) {
                 Hourglass.pauseTimer(); // 暂停计时器
-                recorder.pause(); // 音频暂停
+                if (_role == 0) {
+                    recorder.pause(); // 音频暂停
+                }
             }
             $("#CompileBtn").data('run', 0);
             $('.compile-loading').show();
             // 暂停录制
             var pauseState = $('#pause').data('pause');
-            if (pauseState == 1 && _role == 0) {
+            if (pauseState == 1) {
                 GBCodePlayBack.record_pause_time = new Date().getTime(); // 暂停的时间
                 var recordobj = {
                     intervaltime: GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime,
@@ -3037,8 +3064,9 @@ $(function() {
         $('.pause-shodow').removeClass('show').addClass('hidden');
         $('#pause').data('pause', '1');
-
-        recorder.pause(); // 继续录制
+        if (_role == 0) {
+            recorder.pause(); // 继续录制
+        }
     }
     function playEnd() {
@@ -381,34 +381,35 @@ $(function(){
 				        compileMode(langid);
 				        console.log(coderecords);
 		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
-		                player.init({
-		                    container: '#audioWrap'
-		                    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
-		                    ,imagePath: 'js/audioPlayer/image'
-		                    ,debuggers: false
-		                    ,allowSeek: false
-		                    ,playCallback: function(){		// 播放
-		                    	playCode();
-		                    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
-		                    }
-		                    ,pauseCallback: function(){		// 暂停	
-		                    	GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
-		                    	pauseCode();
-		                    	GBCodePlayBack.firstPlay = 0;
-		                    	GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
-		                    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
-		                    }
-		                    ,seekedCallback: function(){}	// 拖拽
-		                    ,endedCallback: function(){		// 结束播放
-		                    	playEnd()
-		                    }
-		                });
-
-		                if (_role == 0) {
+		                if (_role ==0) {
 		                	var coderecords = coderecords.codeRecordList;
-		                }else if (_role == 1) {
+		                	player.init({
+		                	    container: '#audioWrap'
+		                	    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
+		                	    ,imagePath: 'js/audioPlayer/image'
+		                	    ,debuggers: false
+		                	    ,allowSeek: false
+		                	    ,playCallback: function(){		// 播放
+		                	    	playCode();
+		                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
+		                	    }
+		                	    ,pauseCallback: function(){		// 暂停	
+		                	    	GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
+		                	    	pauseCode();
+		                	    	GBCodePlayBack.firstPlay = 0;
+		                	    	GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
+		                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
+		                	    }
+		                	    ,seekedCallback: function(){}	// 拖拽
+		                	    ,endedCallback: function(){		// 结束播放
+		                	    	playEnd()
+		                	    }
+		                	});
+		                }else{
 		                	var coderecords = coderecords.studentRecordList;
+		                	$('.play-code').show();
 		                }
+
 		                GBCodePlayBack.htmlplayereditor.setValue('');
 		        		GBCodePlayBack.cssplayereditor.setValue('');
 		        		GBCodePlayBack.jsplayereditor.setValue('');
@@ -1323,7 +1324,16 @@ $(function(){
 					$('#recordertab a:first').tab('show');
-					Hourglass.stopTimer();
+					if(_role == 1){
+					    for (var i = 0; i < GBCodePlayBack.records.length; i++) {
+					        GBCodePlayBack.records[i].trigger = 0;
+					    }
+					    $('.play-code').attr('disabled', false);
+					}
+
+					if(document.URL.indexOf('index.htm') >= 0) {
+					    Hourglass.stopTimer();
+					}
 					console.log("-----------播放结束------------")
 					/* 移动设备的下一节和代码编写控制 */
 					$('#donenext').removeClass('disabled');
@@ -1360,6 +1370,12 @@ $(function(){
 					var $sliderpropress = $(".replayprogress");
 					$sliderpropress.slider( "option", "disabled", false );
 					$('#excerciselist .ineedautocodehelp').data('status',0).attr('title','播放').find('span').addClass('glyphicon-play-circle').removeClass('glyphicon-stop');
+					if(_role == 1){
+					    for (var i = 0; i < GBCodePlayBack.records.length; i++) {
+					        GBCodePlayBack.records[i].trigger = 0;
+					    }
+					    $('.play-code').attr('disabled', false);
+					}
 				}
 			}
 		},
@@ -1549,6 +1565,12 @@ $(function(){
 		contrlPause()
 	})
+	$('.play-code').click(function(){
+		$('.play-code').attr('disabled', true);
+	    playCode();
+	    GBCodePlayBack.editable(0)
+	});
+
 	// 继续录制配置
 	function recodingConf(){
 		Hourglass.pauseTimer();
@@ -125,6 +125,9 @@
         </div>
         <div class="" id="audioWrap">
+            <button class="play-code" style="display: none;">
+                <i class="icon iconfont icon-play"></i>
+            </button>
             <button id="full-screen">
                 <i class="icon iconfont icon-fangda"></i>
             </button>
@@ -61,6 +61,13 @@ button{
     // }
 }
+.play-code{
+    background: transparent;
+    color: #fff;
+    border: none;
+    padding-left: 24px;
+}
+
 .upload-tip{
     position: absolute;
     top: 0;
@@ -126,6 +126,7 @@
                         </div>
                         <div class="pull-right">
                             <a id="full-screen" href="javascript:;" data-toggle="tooltip" data-placement="left" data-original-title="全屏录制" class="btn btn-link"><i class="icon iconfont icon-fangda"></i></a>
+                            <a id="back-screen" href="javascript:;" data-toggle="tooltip" data-placement="left" data-original-title="退出全屏录制" class="btn btn-link" style="display: none;"><i class="icon iconfont icon-fangda"></i></a>
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-success" id="play" data-status="0" title="" style="display: none;"><</button>
@@ -166,7 +167,13 @@
         </div>
         <div id="playFooter">
             <div class="" id="audioWrap">
+                <button class="play-code" style="display: none;">
+                    <i class="icon iconfont icon-play"></i>
+                </button>
             </div>
+<!--             <div class="playCode">
+                <button>开始</button>
+            </div> -->
         </div>
     </div>
     <!--  -->