修改播放暂停

ykxie
1 parent 5bc76a25
Showing 2 changed files with 82 additions and 45 deletions
kkb@192.168.30.25
src/js/gb.js
@@ -82,6 +82,11 @@ $(function() {
                     // console.log('点击了 ' + treeNode.name);
                     // console.log(treeNode);
                     // 判断是否点击了文件夹
+
+                    console.log('==========================================')
+                    console.log(treeNode)
+                    console.log('==========================================')
+
                     if (treeNode.isParent) {
                         return false;
                     }
@@ -214,7 +219,7 @@ $(function() {
  
             for (var i = 0; i < treeLinkEditor.length; i++) {
                 if(treeLinkEditor[i].CodeMirrorRecordId == _id){
-                    console.log(treeLinkEditor[i]);
+                    // console.log(treeLinkEditor[i]);
                     _name = treeLinkEditor[i].name;
                 }
             }
@@ -318,6 +323,7 @@ $(function() {
  
     var GBCodePlayBack = {
         records: [],
+        initRecodes: [],
         excercise_records: [],
         autorun: 1,
         triggertotal: 0,
@@ -689,7 +695,8 @@ $(function() {
                     contentType: "application/json",
                     success: function(coderecords) {
                         console.log(coderecords);
-                        var langid = parseInt(coderecords.languageid);
+                        GBCodePlayBack.langid = parseInt(coderecords.languageid);
+                        var langid = GBCodePlayBack.langid;
                         selectLang(langid);
                         compileMode(langid);
  
@@ -704,8 +711,9 @@ $(function() {
                             debuggers: false,
                             allowSeek: false,
                             playCallback: function() { // 播放
-                                console.log('++++++++')
+                                console.log('++++++++');
                                 playCode();
+
                                 // if(flag){
                                 //     playCode();
                                 // }
@@ -718,15 +726,11 @@ $(function() {
                                 // player.play();
  
                                 GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
-
+                                GBCodePlayBack.treeSelectNode = treeObj.getSelectedNodes()[0];
                                 pauseCode();
                                 GBCodePlayBack.firstPlay = 0;
                                 GBCodePlayBack.getCodeMirrorValue();
  
-                                console.log('---------------------------------------');
-                                console.log(GBCodePlayBack.pauseValue);
-                                console.log('---------------------------------------');
-
                                 // GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
                                 // GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
                             },
@@ -1722,8 +1726,10 @@ $(function() {
             // 根据不同的身份设置录制代码的时间间隔，当学生端输入的时候，重置间隔为100毫秒
             if (_role == 0 && GBCodePlayBack.record_startime) {
                 intervaltime = currenttime - GBCodePlayBack.record_startime;
-            }else{
+            }else if (_role == 1){
                 intervaltime = 100;
+            }else{
+                intervaltime = 0;
             }
  
             var pausetatus = $('#pause').data('status');
@@ -1917,41 +1923,39 @@ $(function() {
             var _thisNum = num;
             if (_thisNum == 0) {
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-                    if (treeLinkEditor[i].CodeMirrorRecord.getValue()) {
-                        ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
-                        treeLinkEditor[i].CodeMirrorRecord.setValue("");
-                    }
-                }
-            } else if (_thisNum == 1) {
-                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    // if (treeLinkEditor[i].CodeMirrorRecord.getValue()) {
+                    //     ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
+                    //     treeLinkEditor[i].CodeMirrorRecord.setValue("");
+                    // }
                     var _path = treeLinkEditor[i].filePath;
                     var defaultValue;
                         defaultValue = 'package '+ _path.split('/')[0] +';\n';
+                    console.log(treeLinkEditor)
                     ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
-                    treeLinkEditor[i].CodeMirrorReplay.setValue(defaultValue);
-                    // if (treeLinkEditor[i].CodeMirrorReplay.getValue()) {
-                    //     ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}, 'replay': true});
-                    //     treeLinkEditor[i].CodeMirrorReplay.setValue("");
-                    // }
+                    treeLinkEditor[i].CodeMirrorRecord.setValue(defaultValue);
+                }
+            } else if (_thisNum == 1) {
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    // var _path = treeLinkEditor[i].filePath;
+                    // var defaultValue;
+                    //     defaultValue = 'package '+ _path.split('/')[0] +';\n';
+                    // ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
+                    // treeLinkEditor[i].CodeMirrorReplay.setValue(defaultValue);
+                    if (treeLinkEditor[i].CodeMirrorReplay.getValue()) {
+                        ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}, 'replay': true});
+                        treeLinkEditor[i].CodeMirrorReplay.setValue("");
+                    }
                 }
             } else {
                 console.log(treeLinkEditor)
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-                    var _path = treeLinkEditor[i].filePath;
-                    var defaultValue;
-                        defaultValue = 'package '+ _path.split('/')[0] +';\n';
-                    console.log(treeLinkEditor)
-                    ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
-                    treeLinkEditor[i].CodeMirrorRecord.setValue(defaultValue);
-                    ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
-                    treeLinkEditor[i].CodeMirrorReplay.setValue(defaultValue);
-                    // if(treeLinkEditor[i].CodeMirrorRecord){
-                    //     ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
-                    //     treeLinkEditor[i].CodeMirrorRecord.setValue('');
-                    // }else if(treeLinkEditor[i].CodeMirrorReplay.getValue()){
-                    //     ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}, 'replay': true});
-                    //     treeLinkEditor[i].CodeMirrorReplay.setValue("");
-                    // }
+                    if(treeLinkEditor[i].CodeMirrorRecord){
+                        ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
+                        treeLinkEditor[i].CodeMirrorRecord.setValue('');
+                    }else if(treeLinkEditor[i].CodeMirrorReplay.getValue()){
+                        ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}, 'replay': true});
+                        treeLinkEditor[i].CodeMirrorReplay.setValue("");
+                    }
                 }
             }
             ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[0].file}});
@@ -1962,12 +1966,38 @@ $(function() {
          */
         getCodeMirrorValue: function(){
             GBCodePlayBack.pauseValue = [];
+
             for (var i = 0; i < treeLinkEditor.length; i++) {
                 console.log(treeLinkEditor[i].CodeMirrorReplay.getValue())
                 // ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[i].file}});
                 GBCodePlayBack.pauseValue.push(treeLinkEditor[i].CodeMirrorReplay.getValue());
             }
         },
+        initRecodesValue: function(){
+            GBCodePlayBack.records = [];
+            for (var i = treeLinkEditor.length-1; i >= 0; i--) {
+                console.log(treeLinkEditor[i].CodeMirrorRecord.getValue());
+                var recordobj = {
+                    intervaltime: 0,
+                    editor: treeLinkEditor[i].name,
+                    changeobj: {
+                        from: {
+                            ch: 0,
+                            line: 0,
+                        },
+                        text: [treeLinkEditor[i].CodeMirrorRecord.getValue()],
+                        to: {
+                            ch: 0,
+                            line: 0,
+                        }
+                    },
+                    trigger: 0,
+                    playTime: 0
+                };
+                GBCodePlayBack.records.push(recordobj);
+            }
+            console.log(GBCodePlayBack.records);
+        },
         setCodeMirrorValue: function(){
             GBCodePlayBack.resetCodeMirrorValue(1);
             var codeLength = GBCodePlayBack.pauseValue;
@@ -2062,7 +2092,7 @@ $(function() {
  
     // 开始录制
     $('#start-recording').click(function() {
-        console.log('-=======------------log');
+        console.log('-=======------------log')
         // 切换到录制区域
         $('#recordertab a:eq(0)').tab('show');
  
@@ -2082,7 +2112,7 @@ $(function() {
  
         if (data == 1) {
             console.log('开始录制');
-            GBCodePlayBack.resetCodeMirrorValue();
+            GBCodePlayBack.resetCodeMirrorValue(0);
             compileResult(resultData);
             GBCodePlayBack.isRcording = 1;
             $("#countdown").find('img').attr('src', '../img/ready-go.gif');
@@ -2092,6 +2122,11 @@ $(function() {
                     if (seconds == 2) {
                         $("#countdown").hide();
                         startReacoder();
+                        console.log('-============================================')
+                        // GBCodePlayBack.records.push(GBCodePlayBack.getCodeMirrorValue);
+                        GBCodePlayBack.initRecodesValue();
+                        console.log(GBCodePlayBack.records);
+                        console.log('-============================================')
                     }
                 }, 1000);
             })
@@ -2304,7 +2339,7 @@ $(function() {
         }
         var compileData = {
             "userId": _userId,
-            "langId": _languageid,
+            "langId": GBCodePlayBack.langid,
             "mainPath": mainPath,
             "mainArgus": "",
             "runtimeArgus": runtimeArgus,
@@ -2449,7 +2484,7 @@ $(function() {
             recorder.start();
  
             // GBCodePlayBack.resetCodeMirrorValue(0);
-            GBCodePlayBack.records = [];
+            // GBCodePlayBack.records = [];
             GBCodePlayBack.record_startime = new Date().getTime();
  
             $('#start-recording').removeClass('new-recording').addClass('recording').attr('data', '0').attr('data-original-title', '结束录制');
@@ -2503,7 +2538,7 @@ $(function() {
                 var _file = _datalist[i].name;
                 var _name = ZTREE.manageName(_file);
                 var defaultValue;
-                defaultValue = 'package '+ ZTREE.getTreePath(_file).split('/')[0] +';';
+                defaultValue = 'package '+ ZTREE.getTreePath(_file).split('/')[0] +';\n';
                 treeLinkEditor.push({
                     "name": _name, 
                     "file": _file,
@@ -2635,15 +2670,17 @@ $(function() {
     }
  
     // 播发代码
-    function playCode(){
-        GBCodePlayBack.resetCodeMirrorValue(1);
+    function playCode(){  
         if (GBCodePlayBack.firstPlay == 0) {
             $('#readonly').trigger('click');
-            // GBCodePlayBack.htmlplayereditor.setValue(GBCodePlayBack.pauseValue)
             GBCodePlayBack.setCodeMirrorValue();
+            console.log('---------------------------------------');
+            console.log(GBCodePlayBack.treeSelectNode);
+            console.log('---------------------------------------');
+            ZTREE.showEdite({'treeNode': GBCodePlayBack.treeSelectNode}); 
  
         }else{
-            // GBCodePlayBack.htmlplayereditor.setValue('')
+            GBCodePlayBack.resetCodeMirrorValue(1);
             var resultData = {
                 status: 200,
                 compilerInfo: '',