发灰度

ykxie
1 parent ee3eb1ff
Showing 3 changed files with 58 additions and 40 deletions
src/index.html
src/js/gbreplayer.js
src/js/recorder/Myna.js
@@ -8,6 +8,7 @@
     <link href="css/validationEngine.jquery.css" rel="stylesheet">
     <link href="css/codemirror.css" rel="stylesheet">
     <link href="css/cm-theme/gbtags.css" rel="stylesheet">
+    <link href="css/cm-theme/eclipse.css" rel="stylesheet">
     <link href="css/cm-theme/gbtags-dark.css" rel="stylesheet">
     <link href="css/font/iconfont.css" rel="stylesheet">
     <link href="css/font_all/iconfont.css" rel="stylesheet">
@@ -54,6 +55,7 @@
     <script src="js/gbdebug/mode/javascript/javascript.js"></script>
     <script src="js/gbdebug/mode/css/css.js"></script>
     <script src="js/gbdebug/mode/htmlmixed/htmlmixed.js"></script> 
+    <script src="js/gbdebug/mode/clike/clike.js"></script> 
 </head>
 <body>
@@ -31,6 +31,7 @@ $(function(){
 		replay_enhancement:1, //是否优化播放，即匀速播放
 		replay_enhancement_value: 250,
 		speed: 1,
+		playstatus: 0,
 		recordtimeoutcontrolls: [],
 		excercise_recordtimeoutcontrolls: [],
 		isgblibreplay: 0,
@@ -386,10 +387,12 @@ $(function(){
 		                    ,playCallback: function(){
 		                    	// playCoder();
 		                    	$('#play').trigger('click');
+		                    	GBCodePlayBack.playstatus = 0;
 		                    }
 		                    ,pauseCallback: function(){
 		                    	// playCoder();
 		                    	$('#play').trigger('click');
+		                    	GBCodePlayBack.playstatus = 0;
 		                    }
 		                    ,seekedCallback: function(){}
 		                    ,endedCallback: function(){
@@ -426,7 +429,7 @@ $(function(){
 		    }, 50)
 			/* #STRAT: 播放和暂停控制元素 */
-			$('#play').click(function(){
+			$('#play').unbind('click').click(function(){
 				var myAudio = $('#play_audio');
 				//禁用修改
@@ -446,6 +449,10 @@ $(function(){
 						$('#play').find('i').removeClass('icon-play').addClass('icon-playcopy').attr('data-original-title', '暂停');
 					}
 				}
+
+				if(GBCodePlayBack.playstatus = 1){
+					GBCodePlayBack.htmlplayereditor.setValue('');
+				}
 				if(!playstatus){
 					var playbackrecord = GBCodePlayBack.records,
@@ -516,8 +523,15 @@ $(function(){
 			// 播放录制代码过程
-			$('.audio-play').click(function(){	
+			$('.audio-play').unbind('click').click(function(){	
 				Hourglass.init();
+				var resultData = {
+					output: '',
+					stderr: '',
+					cmpinfo: '',
+					result: 1
+				}
+				compileResult(resultData);
 				var data = $(this).attr('data');
 				if (_role == 0) {
@@ -527,24 +541,24 @@ $(function(){
 			    $(this).attr('data', 0).attr('data-original-title', '播放录音');
 			    var playbtn= $('#play'), 
-			    	playbackrecord = GBCodePlayBack.records;
-			    
-			    GBCodePlayBack.triggertotal = 0;
+				    playbackrecord = GBCodePlayBack.records;
+				    
+				GBCodePlayBack.triggertotal = 0;
-			    /* 初始化播放 */
-			    for (var i = 0; i < playbackrecord.length; i++) {
-				     playbackrecord[i].trigger = 0;
-				 }
+				for(var i=0;i<playbackrecord.length;i++){
+					playbackrecord[i].trigger = 0;
+				}
-			    for (var i = 0; i < GBCodePlayBack.recordtimeoutcontrolls.length; i++) {
-			        clearTimeout(GBCodePlayBack.recordtimeoutcontrolls[i]);
-			    }
-			    GBCodePlayBack.recordtimeoutcontrolls = [];
+				for(var i=0;i<GBCodePlayBack.recordtimeoutcontrolls.length;i++){
+					clearTimeout(GBCodePlayBack.recordtimeoutcontrolls[i]);
+				}
+				GBCodePlayBack.recordtimeoutcontrolls = [];
 			    /* END 初始化播放 */
 			    GBCodePlayBack.htmlplayereditor.setValue('');
 			    playbtn.data('status', 0);
 			    $('#play').trigger('click');
+			    console.log('--------------=============')
 			});
 			//setting speed in cookie
@@ -598,7 +612,7 @@ $(function(){
 			}
 			//播放代码回放
-			$('#playrecord').click(function(){
+			$('#playrecord').unbind('click').click(function(){
 				console.log("---------------------")
 				// 根据不同的角色请求不同的接口播放
 				$('#playrecord').hide();
@@ -820,14 +834,14 @@ $(function(){
 			});
-			$('#cancel').click(function(){
+			$('#cancel').unbind('click').click(function(){
 				$(window).unbind('beforeunload',  function(){ 
 					return '确认退出？ 将不保存你的代码';
 				});
 				window.close();
 			})
 			// 保存代码
-			$('#savecorde').click(function(){
+			$('#savecorde').unbind('click').click(function(){
 				$('#savemsg').addClass('hidden');
 				$('.upload-tip').show();
@@ -1084,7 +1098,7 @@ $(function(){
 			})
 			// 不保存编译结果
-			$('#cancel_compile').click(function(){
+			$('#cancel_compile').unbind('click').click(function(){
 				Hourglass.pauseTimer();
 				contrlPause()
 				GBCodePlayBack.record_continue_time = new Date().getTime();
@@ -1409,10 +1423,13 @@ $(function(){
 					output: record.output || '',
 					stderr: record.stderr || '',
 					cmpinfo: record.cmpinfo || '',
-					result: record.result || 1
+					result: record.result
+				}
+
+				if(resultData.cmpinfo || resultData.result == 1){
+					compileResult(resultData);
 				}
-				compileResult(resultData);
 				console.log(record);
 				if(replay_type){
@@ -1479,11 +1496,7 @@ $(function(){
 					GBCodePlayBack.triggeroffset=0; //reset offset for 滑动进度条
-					if($('#readonly').length>0){
-						setTimeout(function(){$('#readonly').popover({html:true, placement:'right', container: 'body', content:''}).popover('show');}, 2000);
-						setTimeout(function(){$('#readonly').trigger('click');},1500);
-						setTimeout(function(){$('#readonly').popover('destroy');}, 5000);
-					}
+					
 				}
 				if(GBCodePlayBack.excercise_triggertotal === GBCodePlayBack.excercise_records.length){
@@ -1545,13 +1558,15 @@ $(function(){
 	    $("#countdown").show();
 	    if(data == 1){
 	    	$("#countdown").find('img').attr('src', 'img/ready-go.gif');
-			var countdown = setInterval(function(){
-			    seconds += 1;
-			    if(seconds == 2){
-			    	$("#countdown").hide();
-			    	startReacoder();
-			    }
-			},1000);
+	    	$("#countdown").find('img').load(function(){
+	    		var countdown = setInterval(function(){
+	    		    seconds += 1;
+	    		    if(seconds == 2){
+	    		    	$("#countdown").hide();
+	    		    	startReacoder();
+	    		    }
+	    		},1000);
+	    	})
 	    }else{
 	    	$("#countdown").hide();
 	    	$("#re-recoding").show();
@@ -1563,11 +1578,6 @@ $(function(){
 	    }
 	})
-	// 暂停录制
-	$('.pause-recording').click(function(){
-	    // recorder.pause();
-	})
-
 	$('#re-recoding').click(function(){
 		$('.re-tips').show();
 	})
@@ -1616,7 +1626,7 @@ $(function(){
 				$('#cmprun-tabs a[href="#stderr"]').tab('show');
 			}else if(data.output.length){
 				$('#cmprun-tabs a[href="#output"]').tab('show');
-			}	
+			}
 			if(!data.cmpinfo.length){
 				$('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 编译已成功</p>');
@@ -1629,6 +1639,7 @@ $(function(){
 			if(!data.output.length){
 				$('#output').prepend('<p class="alert alert-warning"><i class="glyphicon glyphicon-exclamation-sign"></i> 代码编译错误或者运行相关功能受限制</p>');
 			}
+
 		}else{
 			$('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 云端编译超时，请稍后重新尝试</p>');
 			$('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
@@ -1961,6 +1972,8 @@ $(function(){
         GBCodePlayBack.triggertotal = 0;
+        GBCodePlayBack.playstatus = 1;
+
         /* 初始化播放 */
         for (var i = 0; i < GBCodePlayBack.records.length; i++) {
     	     GBCodePlayBack.records[i].trigger = 0;
@@ -1969,6 +1982,12 @@ $(function(){
         for (var i = 0; i < GBCodePlayBack.recordtimeoutcontrolls.length; i++) {
             clearTimeout(GBCodePlayBack.recordtimeoutcontrolls[i]);
         }
+
+        if($('#readonly').length>0){
+        	setTimeout(function(){$('#readonly').popover({html:true, placement:'right', container: 'body', content:''}).popover('show');}, 2000);
+        	setTimeout(function(){$('#readonly').trigger('click');},1500);
+        	setTimeout(function(){$('#readonly').popover('destroy');}, 5000);
+        }
 	}
 });	
@@ -131,18 +131,15 @@
             console.log(context.state);
             if (context.state === 'running') {
                 context.suspend().then(function() {
-                    console.log('-----------------暂停录制------------------')
                 });
             } else if (context.state === 'suspended') {
                 context.resume().then(function() {
-                     console.log('-----------------继续录制------------------')
                 });
             }
         }
         //停止
         this.stop = function() {
-             console.log('&&&&&&&&&&&&');
             recorder.disconnect();
         }