fixbug

ykxie
1 parent 98d1b521
Showing 4 changed files with 46 additions and 18 deletions
src/js/gb.js
src/js/gbreplayer.js
src/player.html
src/v1.1/index.html
@@ -689,13 +689,12 @@ $(function() {
                         selectLang(langid);
                         compileMode(langid);
-                        $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
+                        // $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
                         // $("#play_audio").attr('src', coderecords.audioUrl);
-
+                        console.log("http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl)
                         player.init({
                             container: '#audioWrap',
-                            source: "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl,
-                            source: coderecords.audioUrl,
+                            source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl,
                             imagePath: '../js/audioPlayer/image',
                             debuggers: false,
                             allowSeek: false,
@@ -738,6 +737,7 @@ $(function() {
                         for (var i = 0; i < coderecords.length; i++) {
                             if (!coderecords[i].trigger) coderecords[i].trigger = 0;
                             coderecords[i].changeobj = jQuery.parseJSON(coderecords[i].changeobj);
+                            coderecords[i].treefile = jQuery.parseJSON(coderecords[i].treefile);
                         }
                         GBCodePlayBack.records = coderecords;
@@ -1220,7 +1220,8 @@ $(function() {
                 // 单个文件路径及内容 数组
                 var programmingFileList = ZTREE.getTreeData();
                 for (var i = 0; i < GBCodePlayBack.records.length; i++) {
-                    GBCodePlayBack.records[i].changeobj = JSON.stringify(GBCodePlayBack.records[i].changeobj)
+                    GBCodePlayBack.records[i].changeobj = JSON.stringify(GBCodePlayBack.records[i].changeobj);
+                    GBCodePlayBack.records[i].treefile = JSON.stringify(GBCodePlayBack.records[i].treefile) || '';
                 }
                 var postData = {
@@ -1237,6 +1238,7 @@ $(function() {
                     "viewcount": "0",
                     "saveformat": saveformat,
                     "audioUrl": $('.audio-url').val(),
+                    "programmingScore": 1,
                     "programmingFileList": programmingFileList,
                     "codeRecordList": GBCodePlayBack.records
                 }
@@ -1249,7 +1251,7 @@ $(function() {
                 }else if (_role == 1) {
                     var roleUrl = gxb_api + "/programming/student/studentReplay/api"
                 }
-
+                var keepTimer = $('.recording-time').val()
                 $.ajax({
                     type: "post",
                     url: roleUrl,
@@ -1259,9 +1261,25 @@ $(function() {
                     success: function(data) {
                         console.log(data);
                         $('.upload-tip').hide();
+                        $(window).unbind('beforeunload');
+                        var _data = {
+                                "programId": data.codeReplayId,
+                                "programLanguageName": data.languageName,
+                                "programLanguageId": data.languageid,
+                                "programmingScore": data.programmingScore,
+                                "programAudioLength": keepTimer
+                        }
+                        $('.upload-tip').hide();
+
+                        $('#cancel').prop("disabled", false);
+
+                        window.opener.postMessage(_data, _source);
+                        window.close();
                     },
                     error: function() {
                         $('.upload-tip').hide();
+                        console.log(GBCodePlayBack.records)
+                        
                         alert('代码保存失败重新保存')
                     }
                 });
@@ -1680,7 +1698,6 @@ $(function() {
             var pausetatus = $('#pause').data('status');
             if (_role == 0 && pausetatus == 1) {
-                intervaltime = (currenttime - GBCodePlayBack.record_continue_time);
                 $('#pause').data('status', '0');
             }
@@ -1738,7 +1755,7 @@ $(function() {
                     error: record.error || '',
                     code: record.code || ''
                 };
-                compileResult(resultData, record.stdin);
+                compileResult(resultData, record.runtimeArgus);
                 // if (resultData.status) {
                 //     compileResult(resultData);
                 // }
@@ -2137,6 +2154,8 @@ $(function() {
         GBCodePlayBack.records[length].code = GBCodePlayBack.compileResultData.code;
         contrlPause();
+
+        GBCodePlayBack.record_startime = new Date().getTime();
     })
     // 不保存编译结果
@@ -2171,7 +2190,7 @@ $(function() {
                     line: 0,
                 }
             },
-            stdin: $(this).val(),
+            runtimeArgus: $(this).val(),
             trigger: 0,
             playTime: 0
         };
@@ -2187,7 +2206,6 @@ $(function() {
         Hourglass.pauseTimer();
         $("#CompileBtn").data('run', 1);
         GBCodePlayBack.record_startime = new Date().getTime();
-        GBCodePlayBack.record_continue_time = new Date().getTime();
     }
     // 切换自动/手动运行代码
@@ -2291,8 +2309,9 @@ $(function() {
     // 初始化页面
     function initRecoding() {
-        console.log('initRecoding')
+        console.log('initRecoding');
         GBCodePlayBack.recordinit();
+        GBCodePlayBack.resetCodeMirrorValue();
         $(".re-tips").hide();
         $("#re-recoding").hide();
         $(".audio-play").removeClass('show').addClass('hidden');
@@ -2301,6 +2320,7 @@ $(function() {
         $('#upload').removeClass('recording-finish').addClass('upload-teach').attr("disabled", true);
         var resultData = {
             status: 200,
+            compilerInfo: '',
             content: '',
             error: '',
             code: ''
@@ -2310,11 +2330,11 @@ $(function() {
     // 编译结果
     function compileResult(data, value) {
-        var stdinVlaue = value || '';
+        var runtimeArgus = value || '';
         console.log('********************************')
         if (value != '') {
             $('#cmprun-tabs a[href="#stdin"]').tab('show');
-            $('#stdin input').val(stdinVlaue);
+            $('#stdin input').val(runtimeArgus);
         }else{
             return;
         }
@@ -358,6 +358,7 @@ $(function(){
 			if(document.URL.indexOf('player.htm')>=0){
 				if (_role == 0) {
+					console.log('----========')
 					var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
 					initPlayerPage(apiUrl)
@@ -378,11 +379,11 @@ $(function(){
 				        var langid = parseInt(coderecords.languageid);
 				        selectLang(langid);
 				        compileMode(langid);
-
-		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
+				        console.log(coderecords);
+		                $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl);
 		                player.init({
 		                    container: '#audioWrap'
-		                    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl
+		                    ,source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl
 		                    ,imagePath: 'js/audioPlayer/image'
 		                    ,debuggers: false
 		                    ,allowSeek: false
@@ -413,6 +414,7 @@ $(function(){
 		        		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);
@@ -897,7 +899,9 @@ $(function(){
 					recorddatas.push(recorddata);
 				}
-				
+
+				// 区分新版旧版
+				recorddatas.programmingScore = 0;
 				//回放入库
 				recorddatas.deleteFlag = 1
@@ -912,10 +916,13 @@ $(function(){
 					    dataType: "json",
 					    contentType: "application/json",
 					    success: function(data){
+					    	console.log(data);
 					        $(window).unbind('beforeunload');
 	                        var _data = {
 	                                "programId": data.codeReplayId,
 	                                "programLanguageName": data.languageName,
+	                                "programLanguageId": data.languageid,
+	                                "programmingScore": data.programmingScore,
 	                                "programAudioLength": keepTimer
 	                        }
 	                        $('.upload-tip').hide();
@@ -16,7 +16,7 @@
     <link rel="stylesheet" href="js/audioPlayer/theme.default.css">
     <script>
-        var gxb_api = "https://restful.gaoxiaobang.com";
+        var gxb_api = "https://restful1.gaoxiaobang.com";
         // var gxb_api = "https://restful.gaoxiaobang.com"
     </script>
@@ -166,6 +166,7 @@
         </div>
         <div id="appFooter">
             <!-- 录音控制条 -->
+            <input type="hidden" class="audio-url" value="">
             <div class="recording-ctrl-bar">
                 <button id="start-recording" class="btn new-recording" type="button" data="1" title="开始录制"></button>
                 <button id="re-recoding" class="btn new-recording" type="button" data="1" title="重新录制" style="display: none;"></button>