Merge branch 'new_Kira' of gitlab.gaoxiaobang.com:kira/programming into feature/20170228_rest

ykxie
2 parents 7eb3b182 852f0773
Showing 2 changed files with 14 additions and 52 deletions
src/js/gb.js
src/js/gbreplayer.js
@@ -1955,7 +1955,11 @@ $(function() {
                     error: record.error || '',
                     code: record.code || ''
                 };
-                compileResult(resultData, record.runtimeArgus);
+                console.log(resultData.code)
+                if (record.code == 0) {
+                    compileResult(resultData, record.runtimeArgus);
+                }
+                
                 // if (resultData.status) {
                 //     compileResult(resultData);
                 // }
@@ -382,7 +382,6 @@ $(function(){
 				        console.log(coderecords);
 		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
 		                if (_role ==0) {
-		                	var coderecords = coderecords.codeRecordList;
 		                	player.init({
 		                	    container: '#audioWrap'
 		                	    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
@@ -405,9 +404,10 @@ $(function(){
 		                	    	playEnd()
 		                	    }
 		                	});
+		                	var coderecords = coderecords.codeRecordList;
 		                }else{
-		                	var coderecords = coderecords.studentRecordList;
 		                	$('.play-code').show();
+		                	var coderecords = coderecords.studentRecordList;
 		                }
 		                GBCodePlayBack.htmlplayereditor.setValue('');
@@ -1258,14 +1258,8 @@ $(function(){
 		changeValueCallback: function(record, replay_type, offset) {
 			var obj = record.changeobj,
 			    editor = record.editor;
-
+			console.log(record);
 			return function() { 
-				if(GBCodePlayBack.active_editor!==editor){
-					$('#' + editor + 'button').trigger('click'); //这里出发触发选择编辑事件
-				}else{
-					GBCodePlayBack.active_editor = editor;
-				}
-				
 				if(editor==='html'){
 					processChangeObject(GBCodePlayBack.htmlplayereditor, obj);
 				}else if(editor==='css'){
@@ -1276,7 +1270,6 @@ $(function(){
 				record.trigger = 1; //标记已运行
 				record.playTime = new Date().getTime();	// 播放开始时间
-				GBCodePlayBack.codeTimes = 1;	// 
 				var resultData = {
 					output: record.output || '',
@@ -1295,35 +1288,19 @@ $(function(){
 					GBCodePlayBack.triggertotal += 1;
 				}
-				/*计算播放进度*/
-				var percertage = '0%',
-				    percertagenum = 0;
-				if (replay_type) {
-				    percertagenum = Math.ceil(GBCodePlayBack.excercise_triggertotal / GBCodePlayBack.excercise_records.length * 100)
-				    percertage = percertagenum + '%';
-				} else {
-				    if (!offset) {
-				        percertagenum = Math.ceil(GBCodePlayBack.triggertotal / GBCodePlayBack.records.length * 100);
-				        percertage = percertagenum + '%';
-				        $('#replayprogressbar').css({ 'width': percertage }).find('span').html(percertage);
-				        $('.slider').slider("option", "now", percertagenum);
-				    }
-				}
-
+				// 最后一个字符调用
 				if(GBCodePlayBack.triggertotal === GBCodePlayBack.records.length && !replay_type){
-				
+					
+					$('#recordertab a:first').tab('show');
+
 					$('#play')
 					    .data('status', 0)
 					    .attr('title', '播放')
-					    .addClass('btn-success')
-					    .removeClass('btn-danger')
 					    .removeClass('infinite')
 					    .find('span')
 					    .addClass('glyphicon-play')
 					    .removeClass('glyphicon-pause');
-
-					$('#recordertab a:first').tab('show');
 					if(_role == 1){
 					    for (var i = 0; i < GBCodePlayBack.records.length; i++) {
 					        GBCodePlayBack.records[i].trigger = 0;
@@ -1335,9 +1312,6 @@ $(function(){
 					    Hourglass.stopTimer();
 					}
 					console.log("-----------播放结束------------")
-					/* 移动设备的下一节和代码编写控制 */
-					$('#donenext').removeClass('disabled');
-					
 					$('#mobiledonenext').removeClass('disabled');
@@ -1345,24 +1319,6 @@ $(function(){
 						$('#resizeeditors').trigger('click');
 					}
-					$('#replayprogressbar').addClass("animated flash");
-					
-					//教程里的完成和联系按钮
-					var panelbody = $('#trybymyselfttips').closest('.panel-body');
-					
-					$('#trybymyselfttips').removeClass('tutorialexcercise_hide').addClass('tutorialexcercise_show');
-					
-					
-					if($("#replaydone").length){
-						scrollToElement(panelbody, $('#donenext'));
-					}
-					
-					$('#replaydone').addClass('animated bounce');
-					
-					if($('#replaydone').data("readonly")){
-						$('#replaydone').trigger('click');
-					}
-					
 					GBCodePlayBack.triggeroffset=0; //reset offset for 滑动进度条
 				}
@@ -1370,6 +1326,8 @@ $(function(){
 					var $sliderpropress = $(".replayprogress");
 					$sliderpropress.slider( "option", "disabled", false );
 					$('#excerciselist .ineedautocodehelp').data('status',0).attr('title','播放').find('span').addClass('glyphicon-play-circle').removeClass('glyphicon-stop');
+					console.log('============================================')
+					console.log(GBCodePlayBack.excercise_triggertotal)
 					if(_role == 1){
 					    for (var i = 0; i < GBCodePlayBack.records.length; i++) {
 					        GBCodePlayBack.records[i].trigger = 0;