fix bug

ykxie
1 parent 9b7bbdec
Showing 5 changed files with 82 additions and 48 deletions
src/css/recording.css
src/js/gbreplayer.js
src/js/recorder/Myna.js
src/player.html
src/scss/recording.scss
@@ -413,6 +413,7 @@ button {
   .recording-ctrl-bar .btn {
     width: 80px;
     background-size: 70%;
+    background: transparent;
     border: none; }
   .recording-ctrl-bar .recording {
     background: url("../img/recording.svg") no-repeat center; }
@@ -482,6 +483,17 @@ button {
     left: 50%;
     transform: translate(-50%, -50%); }
+.re-tips .btn-success, .pause-shodow .btn-success {
+  background-color: #1FB6FF;
+  border: none;
+  box-shadow: 0 1px 5px; }
+
+.re-tips .btn-danger, .pause-shodow .btn-danger {
+  background-color: #FFFFFF;
+  color: #6E787F;
+  border: none;
+  box-shadow: 0 1px 5px; }
+
 .re-tips {
   position: absolute;
   top: 0;
@@ -384,10 +384,12 @@ $(function(){
 		                    ,debuggers: false
 		                    ,allowSeek: false
 		                    ,playCallback: function(){
-		                    	playCoder();
+		                    	// playCoder();
+		                    	$('#play').trigger('click');
 		                    }
 		                    ,pauseCallback: function(){
-		                    	playCoder();
+		                    	// playCoder();
+		                    	$('#play').trigger('click');
 		                    }
 		                    ,seekedCallback: function(){}
 		                    ,endedCallback: function(){
@@ -433,24 +435,14 @@ $(function(){
 				}
 				$('#recordertab a:eq(1)').tab('show');
-
-				// 播放时初始化运行结果
-				var initcompile = {
-					cmpinfo: '',
-					output:  '',
-					result: 1,
-					stderr: ''
-				}
-				compileResult(initcompile);
 				var playstatus = $(this).data('status');
+
 				if(document.URL.indexOf('player.html')>=0){
 					if(playstatus){
 						GBCodePlayBack.pauseData = new Date().getTime();	// 暂停的时间
-						myAudio[0].pause();
 						$('#play').find('i').removeClass('icon-playcopy').addClass('icon-play').attr('data-original-title', '播放');
 					}else{
-						myAudio[0].play();
 						$('#play').find('i').removeClass('icon-play').addClass('icon-playcopy').attr('data-original-title', '暂停');
 					}
 				}
@@ -474,11 +466,13 @@ $(function(){
 								if (GBCodePlayBack.pauseData) {
 									if (tag === 1) {
 										GBCodePlayBack.stopIntervalTime = playbackrecord[0].intervaltime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
-										starttime =  GBCodePlayBack.stopIntervalTime
+										starttime =  GBCodePlayBack.stopIntervalTime;
+										console.log('+++++++++++++++++++++++++++' + starttime);
 										tag++;
 									}else{
 										GBCodePlayBack.stopIntervalTime = GBCodePlayBack.stopIntervalTime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
 										starttime = GBCodePlayBack.stopIntervalTime;
+										console.log('&&&&&&&&&&&&&&&&&&&&&&&&&&' + starttime);
 									}
 								}
@@ -888,7 +882,11 @@ $(function(){
 					var recorddata = {
 						intervaltime: GBCodePlayBack.records[i].intervaltime,
 						editor: GBCodePlayBack.records[i].editor,
-						changeobj: JSON.stringify(GBCodePlayBack.records[i].changeobj)
+						changeobj: JSON.stringify(GBCodePlayBack.records[i].changeobj),
+						cmpinfo: GBCodePlayBack.records[i].cmpinfo,
+						output:  GBCodePlayBack.records[i].output,
+						result: GBCodePlayBack.records[i].result,
+						stderr: GBCodePlayBack.records[i].stderr
 					}
 					recorddatas.push(recorddata);
@@ -899,7 +897,7 @@ $(function(){
 				var keepTimer = $('.recording-time').val()
 				replaydto.totaltime = parseInt(keepTimer);
-
+				console.log(replaydto);
 				if(_role == 0){
 					replaydto.codeRecordList = recorddatas;
 					$.ajax({
@@ -1019,8 +1017,10 @@ $(function(){
 	 				GBCodePlayBack.record_pause_time = new Date().getTime();  // 暂停的时间
 	 				Hourglass.pauseTimer();	// 暂停计时器
+	 				console.log('-------------暂停计时器---------------');
-	 				// $('#pause').data('status', '1');
+	 				$('#pause').data('status', '1');
+	 				$('#pause').data('pause', '0');
 	 				$('#pause').removeClass('hidden').addClass('show');
 	 				$('#start-recording').hide();
 	 				recorder.pause();
@@ -1066,10 +1066,15 @@ $(function(){
 			// 保存编译结果
 			$('#save_compile').click(function(){
-				Hourglass.pauseTimer();
-
 				var length = GBCodePlayBack.records.length - 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;
+
 				console.log(GBCodePlayBack.records);
 				GBCodePlayBack.record_continue_time = new Date().getTime();
@@ -1079,7 +1084,6 @@ $(function(){
 			// 不保存编译结果
 			$('#cancel_compile').click(function(){
-				Hourglass.pauseTimer();
 				contrlPause()
 				GBCodePlayBack.record_continue_time = new Date().getTime();
 			})
@@ -1352,11 +1356,11 @@ $(function(){
 			var pausetatus = $('#pause').data('status');
-			console.log(pausetatus)
+			console.log(pausetatus);
 			if(_role == 0 && pausetatus == 1){
-				intervaltime = (currenttime - GBCodePlayBack.record_continue_time) + (GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime)
+				intervaltime = (currenttime - GBCodePlayBack.record_continue_time) + (GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime);
 				$('#pause').data('status', '0');
@@ -1398,14 +1402,17 @@ $(function(){
 				record.trigger = 1; //标记已运行
 				record.playTime = new Date().getTime();	// 播放开始时间
-				if (record.compile) {
-					console.log(record.compile)
-					console.log('***************************************************')
-					var resultData = record.compile
-					compileResult(resultData)
+				
+				var resultData = {
+					output: record.output || '',
+					stderr: record.stderr || '',
+					cmpinfo: record.cmpinfo || '',
+					result: record.result || 1
 				}
+				compileResult(resultData);
 				console.log(record);
+
 				if(replay_type){
 					GBCodePlayBack.excercise_triggertotal += 1;
 				}else{ 
@@ -1416,8 +1423,7 @@ $(function(){
 				var percertage = '0%',percertagenum=0;			
 				if(replay_type){
 					percertagenum = Math.ceil(GBCodePlayBack.excercise_triggertotal/GBCodePlayBack.excercise_records.length*100)
-					percertage = percertagenum + '%';	
-										
+					percertage = percertagenum + '%';
 				}else{
 					if(!offset){
 						percertagenum = Math.ceil(GBCodePlayBack.triggertotal/GBCodePlayBack.records.length*100);
@@ -1565,8 +1571,8 @@ $(function(){
 	})
 	$('#re-sure').click(function(){
-		console.log('sdkddd')
 		initRecoding()
+		$('#start-recording').trigger('click');
 	})
 	$('#re-cancel').click(function(){
@@ -1747,8 +1753,6 @@ $(function(){
 	// 播发代码
 	function playCoder(){
-		GBCodePlayBack.htmlplayereditor.setValue('');
-		var myAudio = $('#play_audio');
 		//禁用修改
 		if(!$('#replaydone').data("readonly")){
 			$('#replaydone').trigger('click');
@@ -1757,16 +1761,14 @@ $(function(){
 		$('#recordertab a:eq(1)').tab('show');
 		var playstatus = $('#play').data('status');
-		// if(document.URL.indexOf('player.html')>=0){
-		// 	if(playstatus){
-		// 		GBCodePlayBack.pauseData = new Date().getTime();	// 暂停的时间
-		// 		myAudio[0].pause();
-		// 		$('#play').find('i').removeClass('icon-playcopy').addClass('icon-play').attr('data-original-title', '播放');
-		// 	}else{
-		// 		myAudio[0].play();
-		// 		$('#play').find('i').removeClass('icon-play').addClass('icon-playcopy').attr('data-original-title', '暂停');
-		// 	}
-		// }
+
+		if(document.URL.indexOf('player.html')>=0){
+			if(playstatus){
+				GBCodePlayBack.pauseData = new Date().getTime();	// 暂停的时间
+			}else{
+				GBCodePlayBack.htmlplayereditor.setValue('');
+			}
+		}
 		if(!playstatus){
 			var playbackrecord = GBCodePlayBack.records,
@@ -1783,7 +1785,7 @@ $(function(){
 						if (GBCodePlayBack.pauseData) {
 							if (tag === 1) {
 								GBCodePlayBack.stopIntervalTime = playbackrecord[0].intervaltime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
-								starttime =  GBCodePlayBack.stopIntervalTime
+								starttime =  GBCodePlayBack.stopIntervalTime;
 								tag++;
 							}else{
 								GBCodePlayBack.stopIntervalTime = GBCodePlayBack.stopIntervalTime - (GBCodePlayBack.pauseData - GBCodePlayBack.playRecordStart);
@@ -1918,12 +1920,16 @@ $(function(){
 	function contrlPause(){
+		
 		$('.compile-reslut').hide();
 		$('.compile-loading').show();
 		$('#pause').removeClass('show').addClass('hidden');
 		$('#start-recording').show();
 		$('.pause-shodow').removeClass('show').addClass('hidden');
+
+		$('#pause').data('pause', '1');
+		Hourglass.pauseTimer();
 		recorder.pause();	// 继续录制
 	}
@@ -1935,9 +1941,11 @@ $(function(){
 	            type: "PUT",
 	            url: gxb_api + "/programming/learn/chapter/" + _chapterId + "/user/" + _userId,
 	            success: function(data){
+	            	console.log(data);
 	            },
-	            error: function(){
-	                console.log('')
+	            error: function(data){
+	                console.log('播放结束错误');
+	                console.log(data);
 	            }
 	        });
 	    }
@@ -6,7 +6,7 @@
     var HZRecorder = function(stream, config) {
         config = config || {};
         config.sampleBits = config.sampleBits || 8; //采样数位 8, 16
-        config.sampleRate = config.sampleRate || 44100; //采样率(1/6 44100)
+        config.sampleRate = config.sampleRate || 11025; //采样率(1/6 44100)
         var context = new(window.webkitAudioContext || window.AudioContext)();
         var audioInput = context.createMediaStreamSource(stream);
@@ -131,7 +131,6 @@
         </div>
         <div class="" id="audioWrap">
-
             <button id="full-screen">
                 <i class="icon iconfont icon-fangda"></i>
             </button>
@@ -139,7 +138,7 @@
                 <i class="icon iconfont icon-fangda"></i>
             </button>
         </div>
-        <button id="play" class="" style="display: none;" data-status='0' title="暂停">
+        <button id="play" class="hidden" data-status='0' title="暂停">
             <i class="icon iconfont icon-playcopy"></i>
         </button>
 <!--         <div class="play-bar">
@@ -534,6 +534,7 @@ button{
     .btn{
         width: 80px;
         background-size: 70%;
+        background: transparent;
         border: none;
     }
     .recording{
@@ -629,6 +630,20 @@ button{
         transform: translate(-50%, -50%);
     }
 }
+.re-tips, .pause-shodow{
+    .btn-success{
+        background-color: #1FB6FF;
+        border: none;
+        box-shadow: 0 1px 5px;
+    }
+    .btn-danger{
+        background-color: #FFFFFF;
+        color: #6E787F;
+        border: none;
+        box-shadow: 0 1px 5px;
+    }
+}
+
 // ti
 .re-tips{
     position: absolute;