合并代码

ykxie
2 parents 918556f9 f1b28a3b
Showing 4 changed files with 162 additions and 181 deletions
src/css/recording.css
src/js/gbreplayer.js
src/js/recorder/Myna.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;
@@ -10,6 +10,7 @@ $(function(){
 		_source = getQuery('source');
 	var $recording_time = $('.recording-time');
 	var tag = 1;  // 标记第一次暂停
+	var player = $.AudioPlayer;
 	// 根据不同的角色渲染页面
 	if(_role == 1){
@@ -38,7 +39,9 @@ $(function(){
 		isgblibreplay: 0,
 		continue_recording: 0, //是否继续自动保`存的录制
 		recording_status: 1, //当前是否在录制
-		isRcording: 0,	// 判断当前是否在录制	0:未录制 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'),
@@ -377,8 +380,6 @@ $(function(){
 				        compileMode(langid);
 		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
-
-		                var player = $.AudioPlayer;
 		                player.init({
 		                    container: '#audioWrap'
 		                    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl
@@ -386,36 +387,15 @@ $(function(){
 		                    ,debuggers: false
 		                    ,allowSeek: false
 		                    ,playCallback: function(){		// 播放
-		                    	if (GBCodePlayBack.firstPlay == 0) {
-		                    		$('#readonly').trigger('click');
-		                    		GBCodePlayBack.htmlplayereditor.setValue(GBCodePlayBack.pauseValue)
-		                    	}else{
-		                    		GBCodePlayBack.htmlplayereditor.setValue('')
-		                    		var resultData = {
-		                    			output: '',
-		                    			stderr: '',
-		                    			cmpinfo: '',
-		                    			result: 1
-		                    		};
-		                    		compileResult(resultData);
-		                    	}
-
-		                    	playCoder();
-		                    	// $('#play').trigger('click');
+		                    	playCode();
 		                    }
-		                    ,pauseCallback: function(){		// 暂停
-
-		                    	GBCodePlayBack.pauseTime = new Date().getTime();	// 暂停的时间
-
-		                    	$('#readonly').trigger('click');
-
+		                    ,pauseCallback: function(){		// 暂停	
+		                    	GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
+		                    	console.log(parseInt(player.elements.audioDom.currentTime*1000));
+		                    	pauseCode();
 		                    	GBCodePlayBack.firstPlay = 0;
-
 		                    	GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
-
-		                    	// $('#play').trigger('click');
-		                    	playCoder();
-
+		                    	$('#readonly').trigger('click');
 		                    }
 		                    ,seekedCallback: function(){}	// 拖拽
 		                    ,endedCallback: function(){		// 结束播放
@@ -923,6 +903,7 @@ $(function(){
 				var keepTimer = $('.recording-time').val()
 				replaydto.totaltime = parseInt(keepTimer);
+				console.log(JSON.stringify(replaydto));
 				if(_role == 0){
 					replaydto.codeRecordList = recorddatas;
 					$.ajax({
@@ -984,8 +965,6 @@ $(function(){
 				$(this).toggleClass('btn-primary').toggleClass('btn-default');
 				GBCodePlayBack.replay_enhancement = !GBCodePlayBack.replay_enhancement;
 			});
-			
-			
 			// 进度条滚动控制播放进度
 			var $sliderpropress = $(".replayprogress"); 
@@ -1152,16 +1131,15 @@ $(function(){
 		  	this.resizeWindow($('#ifrcontainer').find('#resultiframe'));
-			// $(window).bind('beforeunload', function(){ 
-			
-			// 	return '确认立刻退出？  请确保已录制的代码回放以保存，以防回放数据丢失';
-
-			// });
+		  	if (document.URL.indexOf('index.htm')>=0) {
+		  		$(window).bind('beforeunload', function(){ 
+		  			return '确认立刻退出？  请确保已录制的代码回放以保存，以防回放数据丢失';
+		  		});
+		  	}
 			/* 解决Chrome浏览器非激活标签页下错乱问题 */
 			(function() {
-			    var hidden = "hidden";
-			
+			    var hidden = "hidden";		
 			    // Standards:
 			    if (hidden in document)
 			        document.addEventListener("visibilitychange", onchange);
@@ -1190,13 +1168,11 @@ $(function(){
 			        }else{        
 						document.body.className = this[hidden] ? "hidden" : "visible";
 					}
-					
 					/* Bugfix: Mobile Firefox has a bug here, when loading page it shows blur */
-					
 					if(document.body.className==='hidden'){
-						if($('#play').data('status')==1){
-							$('#play').trigger('click');
-						}
+						// player.pauseCallback();
+						// pauseCode()
+
 					}
 			    }
 			    // set the initial state
@@ -1293,6 +1269,7 @@ $(function(){
 				record.trigger = 1; //标记已运行
 				record.playTime = new Date().getTime();	// 播放开始时间
+				GBCodePlayBack.codeTimes = 1;	// 
 				var resultData = {
 					output: record.output || '',
@@ -1425,7 +1402,7 @@ $(function(){
 	// 开始录制
 	$('#start-recording').click(function(){
-		GBCodePlayBack.isRcording = 1;
+		$('#recordertab a:eq(0)').tab('show');
 	    // 编译状态
 	    var data = $(this).attr('data');
 	    var seconds = 0;
@@ -1438,6 +1415,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(){
@@ -1450,6 +1428,8 @@ $(function(){
 	    		},1000);
 	    	})
 	    }else{
+	    	GBCodePlayBack.isRcording = 0;
+	    	GBCodePlayBack.htmleditor.setOption('readOnly', true);
 	    	$("#countdown").hide();
 	    	$("#re-recoding").show();
 	    	$("#start-recording").hide();
@@ -1489,8 +1469,6 @@ $(function(){
 		runResult()
 	});
-
-
 	// 使用服务端编译语言
 	$('#comprunbtngrp').unbind("click").on('click', '#comprun', function(event){
 		event.preventDefault();
@@ -1498,23 +1476,59 @@ $(function(){
 		$('#comprun').find('ladda-spinner').remove();
 		l.start();
-		// 是否在录制录制
-		if(!GBCodePlayBack.isRcording){
-			compileRun(l);
-		}else{
-			timerRecord();
-			pushRecords();
-			compileRun(l);
-		}
-
+		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;
-		Hourglass.pauseTimer();
-		$("#comprun").data('run', 1);
+		recodingConf()
+
 		GBCodePlayBack.records[length].compile = GBCodePlayBack.compileResultData;
 		GBCodePlayBack.records[length].output = GBCodePlayBack.compileResultData.output;
@@ -1522,70 +1536,48 @@ $(function(){
 		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);
+		recodingConf()
 		contrlPause()
-		GBCodePlayBack.record_continue_time = new Date().getTime();
 	})
-	// 暂停计时、暂停录音
-	function timerRecord(){
-		var runStatus = $("#comprun").data('run');
-		if(runStatus == 1){
-			Hourglass.pauseTimer();	// 暂停计时器
-			recorder.pause();	// 音频暂停
-		}
+	// 继续录制配置
+	function recodingConf(){
+		Hourglass.pauseTimer();
+		$("#comprun").data('run', 1);
+		GBCodePlayBack.record_startime = new Date().getTime();
+		GBCodePlayBack.record_continue_time = new Date().getTime();
 	}
-	// 禁止编写代码，添加遮罩
-	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 autoRun(autorun){
+		if(autorun===1){
+			$('#runnow').prop('disabled',false).html('手动运行').attr('data-original-title', '手动运行');
+		}else{
+			$('#runnow').prop('disabled',true).html('自动运行').attr('data-original-title', '自动运行');
+		}
 	}
-	// 给数组插入一个元素
-	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 runResult(){
+		if(typeof GBCodePlayBack.htmleditor !== 'undefined'){
+			GBCodePlayBack.generateResult(GBCodePlayBack.htmleditor.getValue());
+			return false;
+		}
+		if(typeof GBCodePlayBack.htmlplayereditor !== 'undefined'){
+			GBCodePlayBack.generateResult(GBCodePlayBack.htmlplayereditor.getValue());
 		}
 	}
-	// 编译
+
+	// 云编译
 	function compileRun(l){
-		var code = (typeof GBCodePlayBack.htmleditor !=='undefined' && GBCodePlayBack.htmleditor.getValue()) || (typeof GBCodePlayBack.htmlplayereditor !=='undefined' && GBCodePlayBack.htmlplayereditor.getValue());
+		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 = {
@@ -1615,27 +1607,6 @@ $(function(){
 		});
 	}
-	// 切换自动/手动运行代码
-	function autoRun(autorun){
-		if(autorun===1){
-			$('#runnow').prop('disabled',false).html('手动运行').attr('data-original-title', '手动运行');
-		}else{
-			$('#runnow').prop('disabled',true).html('自动运行').attr('data-original-title', '自动运行');
-		}
-	}
-
-	// 编译结果
-	function runResult(){
-		if(typeof GBCodePlayBack.htmleditor !== 'undefined'){
-			GBCodePlayBack.generateResult(GBCodePlayBack.htmleditor.getValue());
-			return false;
-		}
-		if(typeof GBCodePlayBack.htmlplayereditor !== 'undefined'){
-			GBCodePlayBack.generateResult(GBCodePlayBack.htmlplayereditor.getValue());
-		}
-	}
-
-
 	// 初始化页面
 	function initRecoding(){
 		GBCodePlayBack.recordinit();
@@ -1784,60 +1755,61 @@ $(function(){
 	}
 	// 播发代码
-	function playCoder() {
-
-	    $('#recordertab a:eq(1)').tab('show');
-
-	    var playstatus = $('#play').data('status');
-	    if (!playstatus) {
-	        var playbackrecord = GBCodePlayBack.records;
-	        var starttime = playbackrecord[0].intervaltime;
-
-	        for (var i = 0; i < playbackrecord.length; i++) {
-	            if (playbackrecord[i].trigger === 0) {
-	                var timeoutcontroller = null;
-	                var replayinterval = playbackrecord[i].intervaltime,
-	                    replay_enhancement_interval = GBCodePlayBack.replay_enhancement_value;
-
-	                if (i === 0) {
-	                    starttime = replayinterval;
-	                    if (GBCodePlayBack.pauseTime) {
-	                        if (tag === 1) {
-	                            GBCodePlayBack.stopIntervalTime = playbackrecord[0].intervaltime - (GBCodePlayBack.pauseTime - GBCodePlayBack.playRecordStart);
-	                            starttime = GBCodePlayBack.stopIntervalTime;
-	                            tag++;
-	                        } else {
-	                            GBCodePlayBack.stopIntervalTime = GBCodePlayBack.stopIntervalTime - (GBCodePlayBack.pauseTime - GBCodePlayBack.playRecordStart);
-	                            starttime = GBCodePlayBack.stopIntervalTime;
-	                        }
-	                    }
-	                } else {
-	                    starttime = parseInt(starttime) + parseInt(replayinterval);
-
-	                    if (GBCodePlayBack.pauseTime && GBCodePlayBack.pauseTime - playbackrecord[i - 1].playTime > 0) {
-	                        GBCodePlayBack.stopIntervalTime = GBCodePlayBack.pauseTime - playbackrecord[i - 1].playTime;
-	                        starttime = GBCodePlayBack.stopIntervalTime + parseInt(replayinterval);
-	                    }
-	                }
-	                timeoutcontroller = setTimeout(GBCodePlayBack.changeValueCallback(playbackrecord[i]), starttime);
-	                GBCodePlayBack.recordtimeoutcontrolls.push(timeoutcontroller);
-	            }
-	        }
-	        // 记录播放的时间
-	        GBCodePlayBack.playRecordStart = new Date().getTime();
-	    } else {
-	        var recordtimeoutcontrolls = GBCodePlayBack.recordtimeoutcontrolls;
+	function playCode(){
+		if (GBCodePlayBack.firstPlay == 0) {
+			$('#readonly').trigger('click');
+			GBCodePlayBack.htmlplayereditor.setValue(GBCodePlayBack.pauseValue)
+		}else{
+			GBCodePlayBack.htmlplayereditor.setValue('')
+			var resultData = {
+				output: '',
+				stderr: '',
+				cmpinfo: '',
+				result: 1
+			};
+			compileResult(resultData);
+		}
-	        for (var i = 0; i < recordtimeoutcontrolls.length; i++) {
-	            clearTimeout(recordtimeoutcontrolls[i]);
-	        }
-	        GBCodePlayBack.recordtimeoutcontrolls = [];
-	        GBCodePlayBack.recordtimeouts = [];
-	    }
-	    $('#play').data('status', !playstatus);
+		var playbackrecord = GBCodePlayBack.records;
+		var starttime = 0;
+		var playTotalTime = 0;
+		
+		console.log(playbackrecord)
+		for (var i = 0; i < playbackrecord.length; i++) {
+			if (playbackrecord[i].trigger === 1) {
+			    playTotalTime +=  parseInt(playbackrecord[i].intervaltime);
+			}else if (playbackrecord[i].trigger === 0) {
+		    	var timeoutcontroller = null;
+				var replayinterval = playbackrecord[i].intervaltime;
+
+		    	if (!GBCodePlayBack.isPause) {
+	    		    starttime = replayinterval - (GBCodePlayBack.audioTime - playTotalTime);
+		    		GBCodePlayBack.isPause = 1
+		    	}else{
+		    		if (i == 0) {
+		    			starttime = replayinterval;
+		    		}else{
+		    			starttime = parseInt(starttime) + parseInt(replayinterval);
+		    		}
+		    	}
+		    	console.log(starttime);
+		    	timeoutcontroller = setTimeout(GBCodePlayBack.changeValueCallback(playbackrecord[i]), starttime/GBCodePlayBack.speed);
+	            GBCodePlayBack.recordtimeoutcontrolls.push(timeoutcontroller);
+		    }
+		}
+		console.log(GBCodePlayBack.recordtimeoutcontrolls);
 	}
+	function pauseCode(){
+		var recordtimeoutcontrolls = GBCodePlayBack.recordtimeoutcontrolls;
+		GBCodePlayBack.isPause = 0;
+		for (var i = 0; i < recordtimeoutcontrolls.length; i++) {
+		    clearTimeout(recordtimeoutcontrolls[i]);
+		}
+		GBCodePlayBack.recordtimeoutcontrolls = [];
+		GBCodePlayBack.recordtimeouts = [];
+	}
 	var htmlhlLine = null,
@@ -1908,6 +1880,12 @@ $(function(){
 	function selectLang(langid){
 		switch (langid) {
+			case 1:
+				$('#htmlbutton').data('languageid', 1).html("C++").trigger('click');
+				break;
+			case 42:
+				$('#htmlbutton').data('languageid', 42).html("C++").trigger('click');
+				break;
 			case 10:
 				$('#htmlbutton').data('languageid', 10).html("JAVA").trigger('click');
 				break;
@@ -1970,7 +1948,7 @@ $(function(){
 	    }
 	    GBCodePlayBack.firstPlay = 1;
-
+	    console.log(GBCodePlayBack.records);
         /* 初始化播放 */
         $('#play').data('status', 0);
         for (var i = 0; i < GBCodePlayBack.records.length; i++) {
@@ -221,6 +221,7 @@
                             coment_size: 0,
                             errorNum: 0
                         }
+                        console.log(obj);
                         uploadArr.push(obj)
                         for (var partIndex = 0; partIndex < parts.total_num; partIndex++) {
                             var partItem = parts.multi_list[partIndex];
@@ -260,13 +261,13 @@
             var headers = { 'x-amz-acl': 'public-read' }
             if (isMultiPart == true) {
-                headers = { 'Access-Control-Allow-Origin': "http://" + window.location.host }
+                headers = { 'Access-Control-Allow-Origin': "https://" + window.location.host }
             } else {
                 headers = { 'x-amz-acl': 'public-read' }
             }
             console.log(url);
-            url = 'https' + url.split('http')[1];
+            url = 'https' + url.split('https')[1];
             $.ajax({
                 url: url,
                 type: 'PUT',
@@ -648,6 +648,7 @@ button{
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
+        z-index: 999;
     }
 }
 .re-tips, .pause-shodow{