解决输入显示和tab切换

ykxie
1 parent 8686c152
Showing 6 changed files with 155 additions and 48 deletions
src/js/codedata.json
src/js/gb.js
src/js/recorder/Myna.js
src/js/tree.json
src/v1.1/index.html
src/v1.1/player.html
@@ -25,6 +25,6 @@
     "unitPosition": null,
     "average": null,
     "programmingFileList":[{"path":"package1/Class1.java","content":"12345"}],
-    "codeRecordMultiList":[{"intervaltime":1621,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":0},\"to\":{\"line\":0,\"ch\":0},\"text\":[\"1\"]}","trigger":0,"playTime":0,"currenttime":1486462520945},{"intervaltime":553,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":1},\"to\":{\"line\":0,\"ch\":1},\"text\":[\"2\"]}","trigger":0,"playTime":0,"currenttime":1486462521498},{"intervaltime":710,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":2},\"to\":{\"line\":0,\"ch\":2},\"text\":[\"3\"]}","trigger":0,"playTime":0,"currenttime":1486462522208},{"intervaltime":681,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":3},\"to\":{\"line\":0,\"ch\":3},\"text\":[\"4\"]}","trigger":0,"playTime":0,"currenttime":1486462522889},{"intervaltime":837,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":4},\"to\":{\"line\":0,\"ch\":4},\"text\":[\"5\"]}","trigger":0,"playTime":0,"currenttime":1486462523726}]
+    "codeRecordMultiList":[{"intervaltime":1621,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":0},\"to\":{\"line\":0,\"ch\":0},\"text\":[\"1\"]}","trigger":0,"playTime":0,"currenttime":1486462520945},{"intervaltime":553,"editor":"Class2","changeobj":"{\"from\":{\"line\":0,\"ch\":1},\"to\":{\"line\":0,\"ch\":1},\"text\":[\"2\"]}","trigger":0,"playTime":0,"currenttime":1486462521498},{"intervaltime":710,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":2},\"to\":{\"line\":0,\"ch\":2},\"text\":[\"3\"]}","trigger":0,"playTime":0,"currenttime":1486462522208},{"intervaltime":681,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":3},\"to\":{\"line\":0,\"ch\":3},\"text\":[\"4\"]}","trigger":0,"playTime":0,"currenttime":1486462522889},{"intervaltime":837,"editor":"Class1","changeobj":"{\"from\":{\"line\":0,\"ch\":4},\"to\":{\"line\":0,\"ch\":4},\"text\":[\"5\"]}","trigger":0,"playTime":0,"currenttime":1486462523726}]
 }
  
@@ -87,6 +87,30 @@ $(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,
+                            },
+                            text: '',
+                            to: {
+                                ch: 0,
+                                line: 0,
+                            }
+                        },
+                        treefile: treeNode,
+                        trigger: 0,
+                        playTime: 0
+                    };
+                    GBCodePlayBack.records.push(recordobj);
+                    console.log(GBCodePlayBack.records);
+                    GBCodePlayBack.record_startime = GBCodePlayBack.check_tree_time;
+
                     // 处理显示目录树对应的编辑器目录
                     ZTREE.showEdite({'treeNode': treeNode});
                 }
@@ -295,7 +319,7 @@ $(function() {
         autorun: 1,
         triggertotal: 0,
         firstPlay: 1,       // 第一次播放
-        pauseValue: '',     // 存储暂停时内容
+        pauseValue: [],     // 存储暂停时内容
         triggeroffset: 0, //判断拖动进度条的偏移量
         excercise_triggertotal: 0,
         replay_enhancement:1, //是否优化播放，即匀速播放
@@ -634,16 +658,16 @@ $(function() {
  
             if (document.URL.indexOf('player.htm') >= 0) {
                 if (_role == 0) {
-                    // var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
+                    var apiUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
                     // var apiUrl = gxb_api + "/gxb-web/programmingMulti/" + _codeReplayId + "/api";
-                    var apiUrl = "../js/codedata.json";
+                    // var apiUrl = "../js/codedata.json";
  
                     initPlayerPage(apiUrl)
  
                 } else if (_role == 1) {
-                    // var apiUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
+                    var apiUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
                     // var apiUrl = gxb_api + "/gxb-web/programmingMulti/" + _codeReplayId + "/api";
-                    var apiUrl = "../js/codedata.json";
+                    // var apiUrl = "../js/codedata.json";
  
                     initPlayerPage(apiUrl)
                 }
@@ -665,12 +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', coderecords.audioUrl);
+                        $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
+                        // $("#play_audio").attr('src', 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,
                             source: coderecords.audioUrl,
                             imagePath: '../js/audioPlayer/image',
                             debuggers: false,
@@ -685,8 +709,11 @@ $(function() {
                                 GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
                                 pauseCode();
                                 GBCodePlayBack.firstPlay = 0;
-                                GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
-                                GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
+                                GBCodePlayBack.getCodeMirrorValue();
+                                // GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
+                                // GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
+
+                                console.log(GBCodePlayBack.pauseValue);
                             },
                             seekedCallback: function() { // 拖拽
  
@@ -696,7 +723,7 @@ $(function() {
                             }
                         });
  
-                        var coderecords = coderecords.codeRecordMultiList;
+                        var coderecords = coderecords.codeRecordList;
                         console.log(coderecords);
                         // if (_role == 0) {
                         //     var coderecords = coderecords.codeRecordList;
@@ -1142,10 +1169,8 @@ $(function() {
                 })
                 // 保存代码
             $('#savecorde').unbind('click').click(function() {
-                console.info('$(\'#savecorde\').unbind(\'click\')');
-                
                 $('#savemsg').addClass('hidden');
-                $('.upload-tip').show();
+                // $('.upload-tip').show();
  
                 $('#uploading2').css('display', 'inline-block')
  
@@ -1213,15 +1238,21 @@ $(function() {
                     "saveformat": saveformat,
                     "audioUrl": $('.audio-url').val(),
                     "programmingFileList": programmingFileList,
-                    "codeRecordMultiList": GBCodePlayBack.records
+                    "codeRecordList": GBCodePlayBack.records
                 }
  
                 console.log('============');
                 console.log(postData);
  
+                if (_role == 0) {
+                    var roleUrl = gxb_api + "/programming/codeReplay/api"
+                }else if (_role == 1) {
+                    var roleUrl = gxb_api + "/programming/student/studentReplay/api"
+                }
+
                 $.ajax({
                     type: "post",
-                    url: gxb_api + "/gxb-web/programmingMulti/api",
+                    url: roleUrl,
                     data: JSON.stringify(postData),
                     dataType: "json",
                     contentType: "application/json",
@@ -1679,9 +1710,12 @@ $(function() {
                     GBCodePlayBack.active_editor = editor;
                 }
  
+                // 播放
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-                    if(editor == treeLinkEditor[i].name){
+                    if(editor == treeLinkEditor[i].name){ // 播放代码
                         processChangeObject(treeLinkEditor[i].CodeMirrorReplay, obj);
+                    }else if(record.treefile){ // 切换tree目录
+                        ZTREE.showEdite({'treeNode': record.treefile, 'replay': true});
                     }
                 }
  
@@ -1704,10 +1738,10 @@ $(function() {
                     error: record.error || '',
                     code: record.code || ''
                 };
-
-                if (resultData.compilerInfo) {
-                    compileResult(resultData);
-                }
+                compileResult(resultData, record.stdin);
+                // if (resultData.status) {
+                //     compileResult(resultData);
+                // }
  
                 if (replay_type) {
                     GBCodePlayBack.excercise_triggertotal += 1;
@@ -1825,35 +1859,67 @@ $(function() {
         },
         /**
          * 重置编辑器值
-         * @Author syantao
          * Created by Keystion on 2017-02-06
-         * @param  {[type]} num 0: 重置所有录制CodeMirror的值； 0: 重置所有播放CodeMirror的值；
+         * @param  {[type]} num 0: 重置所有录制CodeMirror的值； 1: 重置所有播放CodeMirror的值；
          * @return {[type]}     [description]
          */
         resetCodeMirrorValue: function(num) {
-            // console.info('GBCodePlayBack.resetCodeMirrorValue');
             var _this = this;
-            var _thisNum = num || -1;
-            // console.log(_this.records);
+            var _thisNum = num;
             if (_thisNum == 0) {
-                // _this.resetRecordCodeMirrorValue();
                 for (var i = 0; i < treeLinkEditor.length; i++) {
                     if (treeLinkEditor[i].CodeMirrorRecord.getValue() != undefined) {
                         treeLinkEditor[i].CodeMirrorRecord.setValue("");
                     }
                 }
             } else if (_thisNum == 1) {
-                // _this.resetReplayCodeMirrorValue();
                 for (var i = 0; i < treeLinkEditor.length; i++) {
                     if (treeLinkEditor[i].CodeMirrorReplay.getValue() != undefined) {
                         treeLinkEditor[i].CodeMirrorReplay.setValue("");
                     }
                 }
             } else {
-                return false;
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    if (treeLinkEditor[i].CodeMirrorRecord.getValue() != undefined) {
+                        treeLinkEditor[i].CodeMirrorRecord.setValue("");
+                    }
+                    if (treeLinkEditor[i].CodeMirrorReplay.getValue() != undefined) {
+                        treeLinkEditor[i].CodeMirrorReplay.setValue("");
+                    }
+                }
+            }
+        },
+        /**
+         * 获取各个文件中的代码
+         * Created by Kira on 2017-02-08
+         */
+        getCodeMirrorValue: function(){
+            for (var i = 0; i < treeLinkEditor.length; i++) {
+                console.log(treeLinkEditor[i].CodeMirrorReplay.getValue())
+                GBCodePlayBack.pauseValue.push(treeLinkEditor[i].CodeMirrorReplay.getValue());
+            }
+        },
+        setCodeMirrorValue: function(){
+            for (var i = 0; i < treeLinkEditor.length; i++) {
+                reeLinkEditor[i].CodeMirrorReplay.setValue(GBCodePlayBack.pauseValue[i]);
+            }
+        },
+        /**
+         * 设置编辑器读写状态
+         * Created by Kira on 2017-02-08
+         * status=0 只读；status=1 可编辑
+         */
+        editable: function(status){
+            if (status == 1) {
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    reeLinkEditor[i].CodeMirrorReplay.setOption('readOnly', false);
+                }
+            }else{
+                for (var i = 0; i < treeLinkEditor.length; i++) {
+                    reeLinkEditor[i].CodeMirrorReplay.setOption('readOnly', true);
+                }
             }
         }
-
     }
  
     $('.record-before').hide();
@@ -1923,8 +1989,7 @@ $(function() {
  
     // 开始录制
     $('#start-recording').click(function() {
-        console.info('$(\'#start-recording\').click(');
-
+        console.log('-=======------------log');
         // 切换到录制区域
         $('#recordertab a:eq(0)').tab('show');
  
@@ -1953,6 +2018,7 @@ $(function() {
                     if (seconds == 2) {
                         $("#countdown").hide();
                         startReacoder();
+                        GBCodePlayBack.resetCodeMirrorValue(0);
                         compileResult(resultData);
                     }
                 }, 1000);
@@ -1965,7 +2031,6 @@ $(function() {
                 treeLinkEditor[i].CodeMirrorRecord.setOption('readOnly', true);
                 treeLinkEditor[i].CodeMirrorReplay.setOption('readOnly', true);
             }
-            // GBCodePlayBack.htmleditor.setOption('readOnly', true);
             $("#countdown").hide();
             $("#re-recoding").show();
             $("#start-recording").hide();
@@ -2029,7 +2094,7 @@ $(function() {
                 GBCodePlayBack.record_pause_time = new Date().getTime(); // 暂停的时间
                 var recordobj = {
                     intervaltime: GBCodePlayBack.record_pause_time - GBCodePlayBack.record_startime,
-                    // editor: 'Class1',
+                    editor: 'compiler',
                     changeobj: {
                         from: {
                             ch: 0,
@@ -2081,6 +2146,41 @@ $(function() {
         contrlPause();
     })
  
+    // 插入标准输入
+    $(document).on('focus', '#runtimeArgus', function(){
+        console.log('focus');
+        GBCodePlayBack.input_focus_time = new Date().getTime(); // 获取焦点的时间
+        console.log(GBCodePlayBack.records);
+    })
+    $(document).on('blur', '#runtimeArgus', function(){
+        console.log('blur');
+        console.log('blur');
+        console.log('blur');
+
+        var recordobj = {
+            intervaltime: GBCodePlayBack.input_focus_time - GBCodePlayBack.record_startime,
+            editor: 'runtimeArgus',
+            changeobj: {
+                from: {
+                    ch: 0,
+                    line: 0,
+                },
+                text: '',
+                to: {
+                    ch: 0,
+                    line: 0,
+                }
+            },
+            stdin: $(this).val(),
+            trigger: 0,
+            playTime: 0
+        };
+        GBCodePlayBack.records.push(recordobj);
+        console.log(GBCodePlayBack.records);
+    })
+
+
+
     // 继续录制配置
     function recodingConf(){
         console.info('recodingConf')
@@ -2199,7 +2299,6 @@ $(function() {
         $("#start-recording").show();
         $('.recording-time').html('00:00:00');
         $('#upload').removeClass('recording-finish').addClass('upload-teach').attr("disabled", true);
-        GBCodePlayBack.htmleditor.setValue('');
         var resultData = {
             status: 200,
             content: '',
@@ -2210,7 +2309,16 @@ $(function() {
     }
  
     // 编译结果
-    function compileResult(data) {
+    function compileResult(data, value) {
+        var stdinVlaue = value || '';
+        console.log('********************************')
+        if (value != '') {
+            $('#cmprun-tabs a[href="#stdin"]').tab('show');
+            $('#stdin input').val(stdinVlaue);
+        }else{
+            return;
+        }
+
         if (data.status == 200) {
  
             $('#cmpinfo').html('<p class="text-warning">' + data.compilerInfo.replace(/\n/g, "<br />") + "</p>");        
@@ -2258,7 +2366,7 @@ $(function() {
             recorder = rec;
             recorder.start();
  
-            GBCodePlayBack.resetCodeMirrorValue(0);
+            // GBCodePlayBack.resetCodeMirrorValue(0);
             GBCodePlayBack.records = [];
             GBCodePlayBack.record_startime = new Date().getTime();
  
@@ -294,7 +294,7 @@
  
                 },
                 error: function(res){
-                    $('.upload-tip').hide();
+                    // $('.upload-tip').hide();
                     alert('音频保存失败...')
                     console.log(res)
                 }
 {
     "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" },
@@ -19,7 +19,7 @@
     <link rel="stylesheet" href="../js/zTree_v3-3.5.27/css/zTreeStyle/zTreeStyle.css">
  
     <script>
-        var gxb_api = "https://restful.gaoxiaobang.com";
+        var gxb_api = "https://restful1.gaoxiaobang.com";
         // var gxb_api = "http://192.168.80.223:8080"
  
     </script>
@@ -181,9 +181,9 @@
                     <audio id="audio" autoplay></audio>
                 </div>
                 <div class="save-wrap">
-                    <input type="button" id="upload" class="upload-teach" disabled="disabled" value="保存 - upload">
-                    <input type="button" id="savecorde" class="upload-stud" style="display: none;" disabled="disabled" value="保存 - savecorde">
-                    <input type="button" id="cancel" value="关闭 - cancel">
+                    <input type="button" id="upload" class="upload-teach" disabled="disabled" value="保存">
+                    <input type="button" id="savecorde" class="upload-stud" style="display: none;" disabled="disabled" value="保存">
+                    <input type="button" id="cancel" value="关闭">
                 </div>
             </div>
         </div>
@@ -245,10 +245,9 @@
         uploadAudio()
     })
  
-    function uploadAudio(ob) {
+    function uploadAudio() {
         $('.upload-tip').show();
         recorder.upload();
-        $('#savecorde').trigger('click');
     }
     </script>
 </body>
@@ -20,7 +20,7 @@
     <link rel="stylesheet" href="../js/zTree_v3-3.5.27/css/zTreeStyle/zTreeStyle.css">
  
     <script>
-        // var gxb_api = "https://restful.gaoxiaobang.com";
+        var gxb_api = "https://restful1.gaoxiaobang.com";
         // var gxb_api = "http://192.168.80.223:8080"
  
     </script>