修复编译异常操作bug

ykxie
1 parent 8f8a761d
Showing 3 changed files with 127 additions and 106 deletions
src/css/recording.css
src/js/gbreplayer.js
src/scss/recording.scss
@@ -502,7 +502,8 @@ button {
     position: absolute;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, -50%); }
+    transform: translate(-50%, -50%);
+    z-index: 999; }
 .re-tips .btn-success, .pause-shodow .btn-success {
   background-color: #1FB6FF;
@@ -40,6 +40,7 @@ $(function(){
 		recording_status: 1, //当前是否在录制
 		times: 0,	// 播放次数
 		isPause: 1,		// 是否暂停 1:不暂停，0:暂停
+		isRcording: 0,  // 是否录制 1:录制中，0:暂停中
 		recordinit: function(codereplaytype, preload) {
 			/* #STRAT:生成CodeMirror Editor for JS/CSS/HTML */
 			var htmlid = document.getElementById('HTMLeditor'),
@@ -966,111 +967,6 @@ $(function(){
 				$(this).toggleClass('btn-primary').toggleClass('btn-default');
 				GBCodePlayBack.replay_enhancement = !GBCodePlayBack.replay_enhancement;
 			});
-			
-			// 使用服务端编译语言
-			$('#comprunbtngrp').unbind("click").on('click', '#comprun', function(event){
-				event.preventDefault();
-				var l = Ladda.create(this);
-				$('#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){
-	 				GBCodePlayBack.record_pause_time = new Date().getTime();  // 暂停的时间
-		 			var recordobj = {
-						intervaltime: GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime,
-						editor: 'html',
-						changeobj: {
-							from:{
-								ch: 0,
-								line: 0,
-							},
-							text: '',
-							to:{
-								ch: 0,
-								line: 0,
-							}
-						},
-						trigger: 0,
-						playTime: 0
-					};
-					GBCodePlayBack.records.push(recordobj);
-					console.log(GBCodePlayBack.records);
-
-	 				$('#pause').data('status', '1');
-	 				$('#pause').data('pause', '0');
-	 				$('#pause').removeClass('hidden').addClass('show');
-	 				$('#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
-				}
-				$.ajax({
-				    type: "post",
-				    url: gxb_api + "/submit/submitCode/api",
-				    data: JSON.stringify(compileData),
-				    dataType: "json",
-				    contentType: "application/json",
-				    success: function(data) {
-				        compileResult(data)
-				        l.stop();
-
-				        $('.compile-loading').hide();
-				        $('.compile-reslut').show();
-				        GBCodePlayBack.compileResultData = data;
-				        
-				    },
-				    error: function(){
-				    	l.stop();
-				    	alert('错误');
-				    }
-				});
-			});
-			
-
-			// 保存编译结果
-			$('#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;
-				GBCodePlayBack.records[length].stderr = GBCodePlayBack.compileResultData.stderr;
-				GBCodePlayBack.records[length].cmpinfo = GBCodePlayBack.compileResultData.cmpinfo;
-				GBCodePlayBack.records[length].result = GBCodePlayBack.compileResultData.result;
-
-				GBCodePlayBack.record_continue_time = new Date().getTime();
-
-				contrlPause();
-
-			})
-
-			// 不保存编译结果
-			$('#cancel_compile').unbind('click').click(function(){
-				Hourglass.pauseTimer();
-				contrlPause()
-				GBCodePlayBack.record_continue_time = new Date().getTime();
-			})
 			// 进度条滚动控制播放进度
 			var $sliderpropress = $(".replayprogress"); 
@@ -1515,6 +1411,7 @@ $(function(){
 	// 开始录制
 	$('#start-recording').click(function(){
+		$('#recordertab a:eq(0)').tab('show');
 	    // 编译状态
 	    var data = $(this).attr('data');
 	    var seconds = 0;
@@ -1527,6 +1424,7 @@ $(function(){
 		};
 		runResult()
 	    if(data == 1){
+	    	GBCodePlayBack.isRcording = 1;
 	    	$("#countdown").find('img').attr('src', 'img/ready-go.gif');
 	    	$("#countdown").find('img').load(function(){
 	    		var countdown = setInterval(function(){
@@ -1539,6 +1437,7 @@ $(function(){
 	    		},1000);
 	    	})
 	    }else{
+	    	GBCodePlayBack.isRcording = 0;
 	    	$("#countdown").hide();
 	    	$("#re-recoding").show();
 	    	$("#start-recording").hide();
@@ -1579,6 +1478,93 @@ $(function(){
 	});
+	// 使用服务端编译语言
+	$('#comprunbtngrp').unbind("click").on('click', '#comprun', function(event){
+		event.preventDefault();
+		var l = Ladda.create(this);
+		$('#comprun').find('ladda-spinner').remove();
+		l.start();
+
+		if (!GBCodePlayBack.isRcording) {
+            compileRun(l)
+        }else{
+        	var runStatus = $("#comprun").data('run');
+        	if (runStatus == 1) {
+        	    Hourglass.pauseTimer(); // 暂停计时器
+        	    recorder.pause(); // 音频暂停
+        	}
+        	$("#comprun").data('run', 0);
+        	$('.compile-loading').show();
+        	console.log($("#comprun").data('run'));
+        	// 暂停录制
+        	var pauseState = $('#pause').data('pause');
+        	if (pauseState == 1 && _role == 0) {
+        	    GBCodePlayBack.record_pause_time = new Date().getTime(); // 暂停的时间
+        	    var recordobj = {
+        	        intervaltime: GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime,
+        	        editor: 'html',
+        	        changeobj: {
+        	            from: {
+        	                ch: 0,
+        	                line: 0,
+        	            },
+        	            text: '',
+        	            to: {
+        	                ch: 0,
+        	                line: 0,
+        	            }
+        	        },
+        	        trigger: 0,
+        	        playTime: 0
+        	    };
+        	    GBCodePlayBack.records.push(recordobj);
+        	    console.log(GBCodePlayBack.records);
+
+        	    $('#pause').data('status', '1');
+        	    $('#pause').data('pause', '0');
+        	    $('#pause').removeClass('hidden').addClass('show');
+        	    $('#start-recording').hide();
+
+        	    $('.pause-shodow').removeClass('hidden').addClass('show');
+        	    console.log('0000---1111')
+        	}
+
+        	compileRun(l)
+        }
+
+	});
+	
+
+	// 保存编译结果
+	$('#save_compile').unbind("click").click(function(){
+		var length = GBCodePlayBack.records.length - 1;
+		recodingConf()
+
+		GBCodePlayBack.records[length].compile = GBCodePlayBack.compileResultData;
+
+		GBCodePlayBack.records[length].output = GBCodePlayBack.compileResultData.output;
+		GBCodePlayBack.records[length].stderr = GBCodePlayBack.compileResultData.stderr;
+		GBCodePlayBack.records[length].cmpinfo = GBCodePlayBack.compileResultData.cmpinfo;
+		GBCodePlayBack.records[length].result = GBCodePlayBack.compileResultData.result;
+
+		contrlPause();
+	})
+
+	// 不保存编译结果
+	$('#cancel_compile').unbind('click').click(function(){
+		recodingConf()
+		contrlPause()
+	})
+
+	// 继续录制配置
+	function recodingConf(){
+		Hourglass.pauseTimer();
+		$("#comprun").data('run', 1);
+		GBCodePlayBack.record_startime = new Date().getTime();
+		GBCodePlayBack.record_continue_time = new Date().getTime();
+	}
+
+
 	// 切换自动/手动运行代码
 	function autoRun(autorun){
 		if(autorun===1){
@@ -1600,6 +1586,39 @@ $(function(){
 	}
+	// 云编译
+	function compileRun(l){
+		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
+		}
+		$.ajax({
+		    type: "post",
+		    url: gxb_api + "/submit/submitCode/api",
+		    data: JSON.stringify(compileData),
+		    dataType: "json",
+		    contentType: "application/json",
+		    success: function(data) {
+		        compileResult(data)
+		        l.stop();
+
+		        $('.compile-loading').hide();
+		        $('.compile-reslut').show();
+		        GBCodePlayBack.compileResultData = data;
+		        
+		    },
+		    error: function(){
+		    	l.stop();
+		    	alert('错误');
+		    }
+		});
+	}
+
 	// 初始化页面
 	function initRecoding(){
 		GBCodePlayBack.recordinit();
@@ -648,6 +648,7 @@ button{
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
+        z-index: 999;
     }
 }
 .re-tips, .pause-shodow{