录制编译同步

ykxie
1 parent 35a69647
Showing 1 changed file with 23 additions and 17 deletions
src/js/gbreplayer.js
@@ -539,7 +539,6 @@ $(function(){
 			// 播放录制代码过程
 			$('.audio-play').unbind('click').click(function(){	
-				Hourglass.init();
 				var resultData = {
 					output: '',
 					stderr: '',
@@ -570,9 +569,9 @@ $(function(){
 				GBCodePlayBack.recordtimeoutcontrolls = [];
 			    /* END 初始化播放 */
-			    
 			    playbtn.data('status', 0);
 			    $('#play').trigger('click');
+			    Hourglass.init();
 			});
 			//setting speed in cookie
@@ -990,9 +989,16 @@ $(function(){
 			$('#comprunbtngrp').unbind("click").on('click', '#comprun', function(event){
 				event.preventDefault();
 				var l = Ladda.create(this);
-				$('#comprun').find('ladda-spinner').remove()
+				$('#comprun').find('ladda-spinner').remove();
 	 			l.start();
+	 			var runStatus = $("#comprun").data('run');
+	 			if(runStatus == 1){
+	 				Hourglass.pauseTimer();	// 暂停计时器
+	 				recorder.pause();	// 音频暂停
+	 			}
+	 			$("#comprun").data('run', 0);
+	 			console.log($("#comprun").data('run'));
 	 			// 暂停录制
 	 			var pauseState = $('#pause').data('pause');
 	 			if(pauseState == 1 && _role == 0){
@@ -1015,10 +1021,7 @@ $(function(){
 						playTime: 0
 					};
 					GBCodePlayBack.records.push(recordobj);
-					console.log(GBCodePlayBack.records)
-
-	 				Hourglass.pauseTimer();	// 暂停计时器
-	 				recorder.pause();	// 音频暂停
+					console.log(GBCodePlayBack.records);
 	 				$('#pause').data('status', '1');
 	 				$('#pause').data('pause', '0');
@@ -1026,21 +1029,19 @@ $(function(){
 	 				$('#start-recording').hide();
 	 				$('.pause-shodow').removeClass('hidden').addClass('show');
+
+	 				console.log('0000---1111')
 	 			}
 				var code = (typeof GBCodePlayBack.htmleditor !=='undefined' && GBCodePlayBack.htmleditor.getValue())
 							|| (typeof GBCodePlayBack.htmlplayereditor !=='undefined' && GBCodePlayBack.htmlplayereditor.getValue());
-							
 				var langid = $('#htmlbutton').data("languageid");
-				
 				var input = $('#input').val() || '';
-
 				var compileData = {
-					code:code,
-					langid:langid,
-					input: input
+				    code: code,
+				    langid: langid,
+				    input: input
 				}
-
 				$.ajax({
 				    type: "post",
 				    url: gxb_api + "/submit/submitCode/api",
@@ -1058,7 +1059,7 @@ $(function(){
 				    },
 				    error: function(){
 				    	l.stop();
-				    	alert('错误')
+				    	alert('错误');
 				    }
 				});
 			});
@@ -1068,6 +1069,7 @@ $(function(){
 			$('#save_compile').unbind("click").click(function(){
 				var length = GBCodePlayBack.records.length - 1;
 				Hourglass.pauseTimer();
+				$("#comprun").data('run', 1);
 				GBCodePlayBack.records[length].compile = GBCodePlayBack.compileResultData;
 				GBCodePlayBack.records[length].output = GBCodePlayBack.compileResultData.output;
@@ -1077,7 +1079,7 @@ $(function(){
 				GBCodePlayBack.record_continue_time = new Date().getTime();
-				contrlPause()
+				contrlPause();
 			})
@@ -1562,6 +1564,10 @@ $(function(){
 	})
 	$('#re-recoding').click(function(){
+		$('#audio')[0].pause();
+		Hourglass.stopTimer();
+		playEnd()
+		$('.audio-play').attr('disabled', false);
 		$('.re-tips').show();
 	})
@@ -1743,7 +1749,7 @@ $(function(){
 			// $('#comprunbtngrp').html('<button id="runnow" type="button" data-style="expand-right" class="btn" title="运行代码">&nbsp; 运行</button>');
 		}else{
 			$('#fontendrun').addClass('hidden');
-			$('#comprunbtngrp').html('<button id="comprun" type="button" data-style="expand-right" class="btn" title="编译并运行代码">&nbsp;编译&运行</button>');
+			$('#comprunbtngrp').html('<button id="comprun" type="button" data-run="1" data-style="expand-right" class="btn" title="编译并运行代码">&nbsp;编译&运行</button>');
 			$('#ifrcontainer').addClass('hidden');
 			$('#cmprun-output').removeClass('hidden');