修改不同步问题

ykxie
1 parent 87e44f0d
Showing 3 changed files with 51 additions and 35 deletions
gulp/config.js
src/js/gb.js
src/js/tree.json
@@ -24,7 +24,7 @@ module.exports = {
         }
     },
     html: {
-        src: src + "/*.html",
+        src: src + "/**/*.html",
         dest: dest
     },
     css: {
@@ -87,31 +87,32 @@ $(function() {
                     }
                     treeObj = $.fn.zTree.getZTreeObj("folder");
                     treeObj.expandNode(treeNode);
-
-                    GBCodePlayBack.check_tree_time = new Date().getTime(); // 获取焦点的时间
-
-                    var recordobj = {
-                        intervaltime: GBCodePlayBack.check_tree_time - GBCodePlayBack.record_startime,
-                        editor: 'tab',
-                        changeobj: {
-                            from: {
-                                ch: 0,
-                                line: 0,
+                    if (GBCodePlayBack.isRecordPlay == 1) {
+                        GBCodePlayBack.check_tree_time = new Date().getTime(); // 获取焦点的时间
+                        var recordobj = {
+                            intervaltime: GBCodePlayBack.check_tree_time - GBCodePlayBack.record_startime,
+                            editor: 'tab',
+                            changeobj: {
+                                from: {
+                                    ch: 0,
+                                    line: 0,
+                                },
+                                text: '',
+                                to: {
+                                    ch: 0,
+                                    line: 0,
+                                }
                             },
-                            text: '',
-                            to: {
-                                ch: 0,
-                                line: 0,
-                            }
-                        },
-                        treefile: treeNode,
-                        trigger: 0,
-                        playTime: 0
-                    };
-                    GBCodePlayBack.records.push(recordobj);
+                            treefile: treeNode,
+                            trigger: 0,
+                            playTime: 0
+                        };
+                        GBCodePlayBack.records.push(recordobj);
+                        console.log(GBCodePlayBack.records);
+                        GBCodePlayBack.record_startime = GBCodePlayBack.check_tree_time;
+                    }
+                    
                     console.log(GBCodePlayBack.records);
-                    GBCodePlayBack.record_startime = GBCodePlayBack.check_tree_time;
-
                     // 处理显示目录树对应的编辑器目录
                     ZTREE.showEdite({'treeNode': treeNode});
                 }
@@ -332,6 +333,7 @@ $(function() {
         continue_recording: 0, //是否继续自动保`存的录制
         recording_status: 1, //当前是否在录制
         times: 0,   // 播放次数
+        isRecordPlay: 1,    // 录制时播放：1:录制中，0：播放中
         isPause: 1,     // 是否暂停 1:不暂停，0:暂停
         isRcording: 0,  // 是否录制 1:录制中，0:暂停中
         recordinit: function(codereplaytype, preload) {
@@ -693,6 +695,7 @@ $(function() {
                         // $("#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)
+                        var flag = true;
                         player.init({
                             container: '#audioWrap',
                             source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + coderecords.audioUrl,
@@ -701,15 +704,21 @@ $(function() {
                             allowSeek: false,
                             playCallback: function() { // 播放
                                 console.log('++++++++')
-                                playCode();
+                                if(flag){
+                                    playCode();
+                                }
+                                
                                 // $('#play').trigger('click');
                                 // GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
                             },
                             pauseCallback: function() { // 暂停
-                                GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
-                                pauseCode();
-                                GBCodePlayBack.firstPlay = 0;
-                                GBCodePlayBack.getCodeMirrorValue();
+                                flag = false;
+                                player.play();
+                                // GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
+                                // pauseCode();
+                                // GBCodePlayBack.firstPlay = 0;
+                                // GBCodePlayBack.getCodeMirrorValue();
+
                                 // GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
                                 // GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
@@ -1224,7 +1233,7 @@ $(function() {
                     GBCodePlayBack.records[i].changeobj = JSON.stringify(GBCodePlayBack.records[i].changeobj);
                     GBCodePlayBack.records[i].treefile = JSON.stringify(GBCodePlayBack.records[i].treefile) || '';
                 }
-
+                var keepTimer = $('.recording-time').val()
                 var postData = {
                     "mainPath": mainPath,
                     "mainArgus": "lixxx",
@@ -1241,7 +1250,8 @@ $(function() {
                     "audioUrl": $('.audio-url').val(),
                     "programmingSource": 1,
                     "programmingFileList": programmingFileList,
-                    "codeRecordList": GBCodePlayBack.records
+                    "codeRecordList": GBCodePlayBack.records,
+                    "totaltime": keepTimer
                 }
                 console.log('============');
@@ -1252,7 +1262,7 @@ $(function() {
                 }else if (_role == 1) {
                     var roleUrl = gxb_api + "/programming/student/studentReplay/api"
                 }
-                var keepTimer = $('.recording-time').val()
+                
                 $.ajax({
                     type: "post",
                     url: roleUrl,
@@ -2164,6 +2174,7 @@ $(function() {
         console.info('$(\'#cancel_compile\').unbind(\'click\')');
         recodingConf();
         contrlPause();
+        GBCodePlayBack.record_startime = new Date().getTime();
     })
     // 插入标准输入
@@ -2176,7 +2187,6 @@ $(function() {
         console.log('blur');
         console.log('blur');
         console.log('blur');
-
         var recordobj = {
             intervaltime: GBCodePlayBack.input_focus_time - GBCodePlayBack.record_startime,
             editor: 'runtimeArgus',
@@ -2195,6 +2205,8 @@ $(function() {
             trigger: 0,
             playTime: 0
         };
+
+        GBCodePlayBack.record_startime = GBCodePlayBack.input_focus_time; // 获取焦点的时间
         GBCodePlayBack.records.push(recordobj);
         console.log(GBCodePlayBack.records);
     })
@@ -2374,6 +2386,9 @@ $(function() {
             // }else{
             //     $('#cmpinfo').prepend('<p class="alert alert-success"><i class="glyphicon glyphicon-ok-sign"></i> 等待编译 </p>');
             // }
+        }else if(data.status == 500){
+            $('#cmprun-tabs a[href="#stderr"]').tab('show');
+            $('#stderr').html('<p class="text-danger">' + data.error.replace(/\n/g, "<br />") + "</p>");
         }else{
             $('#cmpinfo').html('<p class="alert alert-danger"><i class="glyphicon glyphicon-exclamation-sign"></i> 请求失败 </p>');
             $('#cmprun-tabs a[href="#cmpinfo"]').tab('show');
@@ -2402,6 +2417,7 @@ $(function() {
     // 结束录制
     function stopReacoder() {
         console.info('stopReacoder');
+        GBCodePlayBack.isRecordPlay = 0;
         console.log(GBCodePlayBack.records);
         $('#start-recording').removeClass('recording').addClass('new-recording').attr('data', '1').attr('data-original-title', '重新录制');
 {
     "tree": [
-        { "id": 1, "pId": 0, "name": "Package1", "open": true, "isParent": true, "collapse": false },
+        { "id": 1, "pId": 0, "name": "package1", "open": true, "isParent": true, "collapse": false },
         { "id": 11, "pId": 1, "name": "Class1.java", "type": "java" },
         { "id": 12, "pId": 1, "name": "Class2.java", "type": "java" },
         { "id": 13, "pId": 1, "name": "Class3.java", "type": "java" },
         { "id": 14, "pId": 1, "name": "Class4.java", "type": "java" },
         { "id": 15, "pId": 1, "name": "Class5.java", "type": "java" },
-        { "id": 2, "pId": 0, "name": "Package2", "open": true, "isParent": true, "expand": true },
+        { "id": 2, "pId": 0, "name": "package2", "open": true, "isParent": true, "expand": true },
         { "id": 21, "pId": 2, "name": "ClassA.java", "type": "java" },
         { "id": 22, "pId": 2, "name": "ClassB.java", "type": "java" },
         { "id": 23, "pId": 2, "name": "ClassC.java", "type": "java" },