Merge branch 'feature/20170418_webIDE' into develop

ykxie
2 parents 83e693cd f583926f
Showing 3 changed files with 93 additions and 62 deletions
src/css/recording.css
src/js/gbreplayer.js
src/scss/recording.scss
@@ -359,7 +359,8 @@ button {
   height: 34px;
   line-height: 34px;
   padding: 0;
-  border-radius: 21px; }
+  border-radius: 21px;
+  color: #666; }
 .recording-page #previewpanel .nav-tabs > li.active > a {
   background: #fff !important;
@@ -11,6 +11,7 @@ $(function(){
 	var $recording_time = $('.recording-time');
 	var tag = 1;  // 标记第一次暂停
 	var player = $.AudioPlayer;
+	var coderecordsData;
 	// 根据不同的角色渲染页面
 	if(_role == 1){
@@ -22,6 +23,39 @@ $(function(){
 		$('#upload').show();
 	}
+	if(document.URL.indexOf('player.htm')>=0){
+		if (_role == 0) {
+			var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
+			getLangid(apiUrl);
+		} else if (_role == 1) {
+			var apiUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
+			getLangid(apiUrl);
+		}
+	}
+	console.log(_languageid)
+
+	function getLangid(apiUrl){
+		$.ajax({
+		    type: "get",
+		    url: apiUrl,
+		    async: false,
+		    success: function(coderecords) {
+		        _languageid = parseInt(coderecords.languageid);
+		        if(coderecords){
+		        	coderecordsData = coderecords;
+		        }else{
+		        	// TODO 提示错误信息
+		        	alert('错误')	
+		        }
+		    },
+		    error: function(){
+		    	alert('错误')
+		    }
+		});
+	}
+
+
+
 	var GBCodePlayBack = {
 		records: [],
 		excercise_records: [],
@@ -361,75 +395,70 @@ $(function(){
 			if(document.URL.indexOf('player.htm')>=0){
 				if (_role == 0) {
 					console.log('----========')
-					var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
-					initPlayerPage(apiUrl);
+					// var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
+					initPlayerPage();
 				} else if (_role == 1) {
-					var apiUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
-					initPlayerPage(apiUrl)
+					// var apiUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
+					initPlayerPage()
 				}
 			}else {
 				compileMode(_languageid)
 			}
 			// 初始化渲染页面
-			function initPlayerPage(apiUrl){
-				$.ajax({
-				    type: "get",
-				    url: apiUrl,
-				    success: function(coderecords) {
-				        var langid = parseInt(coderecords.languageid);
-				        selectLang(langid);
-				        compileMode(langid);
-				        console.log(coderecords);
-		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
-		                if (_role ==0) {
-		                	player.init({
-		                	    container: '#audioWrap'
-		                	    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
-		                	    ,imagePath: 'js/audioPlayer/image'
-		                	    ,debuggers: false
-		                	    ,allowSeek: false
-		                	    ,playCallback: function(){		// 播放
-		                	    	playCode();
-		                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
-		                	    }
-		                	    ,pauseCallback: function(){		// 暂停	
-		                	    	GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
-		                	    	pauseCode();
-		                	    	GBCodePlayBack.firstPlay = 0;
-		                	    	GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
-		                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
-		                	    }
-		                	    ,seekedCallback: function(){}	// 拖拽
-		                	    ,endedCallback: function(){		// 结束播放
-		                	    	playEnd()
-		                	    }
-		                	});
-		                	var coderecords = coderecords.codeRecordList;
-
-		                }else{
-		                	$('.play-code').show();
-		                	var coderecords = coderecords.studentRecordList;
-		                }
-
-		                GBCodePlayBack.htmlplayereditor.setValue('');
-		        		GBCodePlayBack.cssplayereditor.setValue('');
-		        		GBCodePlayBack.jsplayereditor.setValue('');
-		        		
-		        		var starttime = 0;
-		        		console.log(coderecords);
-		        		for(var i=0;i<coderecords.length;i++){
-		        			if(!coderecords[i].trigger) coderecords[i].trigger = 0;
-		        			coderecords[i].changeobj = jQuery.parseJSON(coderecords[i].changeobj);
-		        		}
-
-		        		GBCodePlayBack.records = coderecords;
-				    },
-				    error: function(){
-				    	alert('错误')
-				    }
-				});
+			function initPlayerPage(){
+		        var langid = _languageid;
+		        var coderecords = coderecordsData;
+		        selectLang(langid);
+		        compileMode(langid);
+		        console.log(coderecords);
+                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
+                if (_languageid == 35) {
+                	$('#cmprun-tabs').hide();
+                }
+                if (_role ==0) {
+                	player.init({
+                	    container: '#audioWrap'
+                	    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
+                	    ,imagePath: 'js/audioPlayer/image'
+                	    ,debuggers: false
+                	    ,allowSeek: false
+                	    ,playCallback: function(){		// 播放
+                	    	playCode();
+                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
+                	    }
+                	    ,pauseCallback: function(){		// 暂停	
+                	    	GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
+                	    	pauseCode();
+                	    	GBCodePlayBack.firstPlay = 0;
+                	    	GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
+                	    	GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
+                	    }
+                	    ,seekedCallback: function(){}	// 拖拽
+                	    ,endedCallback: function(){		// 结束播放
+                	    	playEnd()
+                	    }
+                	});
+                	var coderecords = coderecords.codeRecordList;
+                }else{
+                	$('.play-code').show();
+                	var coderecords = coderecords.studentRecordList;
+                }
+
+                GBCodePlayBack.htmlplayereditor.setValue('');
+        		GBCodePlayBack.cssplayereditor.setValue('');
+        		GBCodePlayBack.jsplayereditor.setValue('');
+        		
+        		var starttime = 0;
+        		console.log(coderecords);
+        		for(var i=0;i<coderecords.length;i++){
+        			if(!coderecords[i].trigger) coderecords[i].trigger = 0;
+        			coderecords[i].changeobj = jQuery.parseJSON(coderecords[i].changeobj);
+        		}
+
+        		GBCodePlayBack.records = coderecords;
+        		player.play();
 			}
 			// 使编辑器满屏
@@ -418,6 +418,7 @@ button{
             line-height: 34px;
             padding: 0;
             border-radius: 21px;
+            color: #666;
         }
         .nav-tabs>li.active>a{
             background: #fff !important;