修改编译结构

ykxie
1 parent 6792eda2
Showing 1 changed file with 130 additions and 104 deletions
src/js/gbreplayer.js
@@ -38,6 +38,7 @@ $(function(){
 		isgblibreplay: 0,
 		continue_recording: 0, //是否继续自动保`存的录制
 		recording_status: 1, //当前是否在录制
+		isRcording: 0,	// 判断当前是否在录制	0:未录制 1:录制中
 		recordinit: function(codereplaytype, preload) {
 			/* #STRAT:生成CodeMirror Editor for JS/CSS/HTML */
 			var htmlid = document.getElementById('HTMLeditor'),
@@ -984,109 +985,8 @@ $(function(){
 				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);
-	 			// 暂停录制
-	 			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);
-
-	 				$('#pause').data('status', '1');
-	 				$('#pause').data('pause', '0');
-	 				$('#pause').removeClass('hidden').addClass('show');
-	 				$('#start-recording').hide();
-
-	 				$('.pause-shodow').removeClass('hidden').addClass('show');
-
-	 			}
-
-				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();
-				$("#comprun").data('run', 1);
-				contrlPause()
-				GBCodePlayBack.record_continue_time = new Date().getTime();
-			})
-
 			// 进度条滚动控制播放进度
 			var $sliderpropress = $(".replayprogress"); 
 			$sliderpropress.slider({}).slider( "option", "disabled", true );
@@ -1360,7 +1260,6 @@ $(function(){
 				$('#pause').data('status', '0');
 			}
-
 		  	var recordobj = {
 				intervaltime: intervaltime,
 				editor: editor,
@@ -1371,6 +1270,7 @@ $(function(){
 			};
 			GBCodePlayBack.records.push(recordobj);			
 			GBCodePlayBack.record_startime = currenttime; //设定起始时间
+			console.log(GBCodePlayBack.records);
 		},
 		changeValueCallback: function(record, replay_type, offset) {
 			var obj = record.changeobj,
@@ -1525,7 +1425,8 @@ $(function(){
 	// 开始录制
 	$('#start-recording').click(function(){
-	    	// 编译状态
+		GBCodePlayBack.isRcording = 1;
+	    // 编译状态
 	    var data = $(this).attr('data');
 	    var seconds = 0;
 	    $("#countdown").show();
@@ -1589,6 +1490,131 @@ $(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{
+			timerRecord();
+			pushRecords();
+			compileRun(l);
+		}
+
+	});
+	
+
+	// 保存编译结果
+	$('#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();
+		$("#comprun").data('run', 1);
+		contrlPause()
+		GBCodePlayBack.record_continue_time = new Date().getTime();
+	})
+
+	// 暂停计时、暂停录音
+	function timerRecord(){
+		var runStatus = $("#comprun").data('run');
+		if(runStatus == 1){
+			Hourglass.pauseTimer();	// 暂停计时器
+			recorder.pause();	// 音频暂停
+		}
+	}
+
+	// 禁止编写代码，添加遮罩
+	function showMask(){
+		$('#pause').data('status', '1');
+		$('#pause').data('pause', '0');
+		$('#pause').removeClass('hidden').addClass('show');
+		$('#start-recording').hide();
+
+		$('.pause-shodow').removeClass('hidden').addClass('show');
+	}
+
+	// 给数组插入一个元素
+	function pushRecords(){
+		// 暂停录制
+		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);
+		    showMask();
+		}
+	}
+
+	// 编译
+	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 autoRun(autorun){
 		if(autorun===1){
@@ -1743,7 +1769,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-run="1" 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 comprun" title="编译并运行代码">&nbsp;编译&运行</button>');
 			$('#ifrcontainer').addClass('hidden');
 			$('#cmprun-output').removeClass('hidden');