fix bug

ykxie
1 parent 1ddd2900
Showing 8 changed files with 110 additions and 124 deletions
src/gxb-ide/CodingEditer.js
src/gxb-ide/Dir.js
src/gxb-ide/Iterm.js
src/gxb-ide/ToolBox.js
src/js/c.js
src/js/player.js
src/v1.1/index.html
src/v1.1/player.html
@@ -13,6 +13,7 @@
         firstPlay: 1,                   // 第一次播放
         pauseValue: [],
         isRecordPage: 1,
+        flag: true,                     // 解决多次点击
         init: function(){
             console.log('CodingEditer');
         },
@@ -95,7 +96,7 @@
          */
         playCoding: function(){
             CodingEditer.editable(1);
-
+            CodingEditer.flag = false;
             if (CodingEditer.firstPlay == 0) {
                 CodingEditer.setCodeMirrorValue();
                 Dir.showEdite({'treeNode': CodingEditer.treeSelectNode}); 
@@ -360,7 +361,7 @@
         };
  
         CodingEditer.records.push(recordobj);       // 添加每次输入对象
-
+        console.log(CodingEditer.records)
         CodingEditer.record_startime = currenttime; //设定起始时间
     }
  
@@ -384,7 +385,7 @@
             record.playTime = new Date().getTime(); // 播放开始时间
  
             console.log("==================++======================");
-            console.log(record);
+            console.log(record.runtimeArgus);
  
             if (record.code == 0 || record.code == 1) {
                 var iterm = new Iterm();
@@ -395,13 +396,20 @@
                     error: record.error || '',
                     code: record.code || ''
                 };
-                iterm.compileResult(resultData)
+                iterm.compileResult(resultData, record.runtimeArgus)
+            }else if (record.runtimeArgus){
+                 var iterm = new Iterm();
+                 iterm.compileResult(resultData, record.runtimeArgus)
             }
  
+
+
+
             CodingEditer.triggertotal += 1;
  
             if (CodingEditer.triggertotal === CodingEditer.records.length && !replay_type) {
                 CodingEditer.editable(0);
+                CodingEditer.flag = true
                 if (CodingEditer.isRecordPage) {
                     $('#recordertab a:first').tab('show');
                 }
@@ -55,7 +55,7 @@
         },
         initIdePage: function(el, id, isPlayPage, role){
             var _url = "../data/" + id + ".json";
-            var _lang = getLangName(id);
+            var _lang = Dir.getLangName(id);
  
             console.log('=======================');
             console.log('isPlayPage ----- ' + isPlayPage);
@@ -69,6 +69,7 @@
                     contentType: "application/json",
                     success: function(res) {
                         console.log(res);
+                        setTitle(res.languageid);
                         Dir.treeData = res[_lang];
                         Dir.treeObj = $.fn.zTree.init($(el), setting, Dir.treeData);
                         addTextareaPage(Dir.treeData);
@@ -293,10 +294,43 @@
             // $('.CodeMirror').height(recordHeight);
             // $('.CodeMirror-lines').height(recordHeight);
             // $('.CodeMirror-gutter').height(recordHeight);
+        },
+        getLangName: function(langid){
+            var langid = parseInt(langid);
+            var _langName;
+            switch (langid) {
+                case 10:
+                    _langName = "java";
+                    break;
+                case 35:
+                    _langName = "html";
+                    break;
+                case 43:
+                    _langName = "Objective-C";
+                    break;
+                case 11:
+                    _langName = "C";
+                    break;
+                case 82:
+                    _langName = "C++";
+                    break;
+                case 29:
+                    _langName = "php";
+                    break;
+                case 4:
+                    _langName = "python";
+                    break;
+                case 40:
+                    _langName = "SQL";
+                    break;
+                case 117:
+                    _langName = "R";
+                    break;
+                default:
+                    break;
+            }
  
-
-
-
+            return _langName;
         }
     }
  
@@ -468,43 +502,7 @@
  
     }
  
-    // 获取编程语言
-    function getLangName(langid){
-        var _langName;
-        switch (langid) {
-            case 10:
-                _langName = "java";
-                break;
-            case 35:
-                _langName = "html";
-                break;
-            case 43:
-                _langName = "Objective-C";
-                break;
-            case 11:
-                _langName = "C";
-                break;
-            case 82:
-                _langName = "C++";
-                break;
-            case 29:
-                _langName = "php";
-                break;
-            case 4:
-                _langName = "python";
-                break;
-            case 40:
-                _langName = "SQL";
-                break;
-            case 117:
-                _langName = "R";
-                break;
-            default:
-                break;
-        }
  
-        return _langName;
-    }
  
     var isPlayDataError = false;
     function programFileListToTreeJson(arr, lang){
@@ -587,8 +585,8 @@
             dataType: "json",
             contentType: "application/json",
             success: function(res) {
-                console.log('++++++++--------');
                 console.log(res)
+                setTitle(res.languageid);
  
                 var coderecords = res.codeRecordList
                 var audioUrl = res.audioUrl;
@@ -645,6 +643,12 @@
         });
     }
  
+    // 设置 title
+    function setTitle(languageid){
+        var languageName = Dir.getLangName(languageid);
+        $("title").html(languageName);
+    }
+
  
     $(window).resize(function() {
         console.log('重置屏幕')
@@ -25,6 +25,7 @@
             $('#cancel_compile').on('click', function(){ _this.cancelCompile(); })
             $('#full-screen').on('click', function(){ _this.fullScreen(); })
             $('#back-screen').on('click', function(){ _this.exitFullscreen(); })
+            $(document).on('focus', '#runtimeArgus', function(){  })
         },
         compile: function(){
             var _this = this;
@@ -68,7 +69,6 @@
             }
  
             compileResult(data, value)
-
         },
         saveCompile: function(){
             console.log(this.compileStatus)
@@ -85,7 +85,6 @@
             CodingEditer.records[length].error = CodingEditer.compileResultData.error;
             CodingEditer.records[length].compilerInfo = CodingEditer.compileResultData.compilerInfo;
             CodingEditer.records[length].code = CodingEditer.compileResultData.code;
-
         },
         cancelCompile: function(){
             console.log(this.compileStatus)
@@ -110,6 +109,7 @@
         $('.pause-shodow').hide()
         $('.compile-reslut').hide();
         $('.contrl-shodow').hide();
+        $('.contrl-shodow').hide();
  
         Hourglass.pauseTimer();
         recorder.pause();
@@ -75,7 +75,7 @@
             $('#stop-recording').show()
             var _this = this;
             _this.readOnly(0)
-            
+
             setTimeout(function(){
                 Dir.treeObj.setting.edit.showRenameBtn = false;
                 Dir.treeObj.setting.edit.enable = false;
@@ -166,10 +166,14 @@
         },
         playCode: function(){
             console.log('播放代码=-------------------------');
-            $('#audio')[0].play();
-            Hourglass.init()
-            CodingEditer.playCoding()
-            console.log('播放代码=-------------------------');
+            if (CodingEditer.flag) {
+                $('#audio')[0].play();
+                Hourglass.init()
+                CodingEditer.playCoding()
+            }else{
+                console.log('播放代码=-------------------------');
+                return false;
+            }
         },
         uploadAudio: function(){
             console.log('uploadAudio');
@@ -5,8 +5,6 @@ $(function(){
     var _languageid = getQuery('languageid');
     var _userId = getQuery('userId');
     var _role = getQuery('role');
-
-    // $("title").html("C 语言");
  
     // new一个基本IDE结构
     var ide = new GxbIde({
@@ -58,6 +56,42 @@ $(function(){
         $('#studentCompileBtn').show();
     }
  
+
+    // 插入标准输入
+    $(document).on('focus', '#runtimeArgus', function(){
+        console.log('focus');
+        CodingEditer.input_focus_time = new Date().getTime(); // 获取焦点的时间
+        console.log(CodingEditer.records);
+    })
+    $(document).on('blur', '#runtimeArgus', function(){
+        console.log('blur');
+        console.log('blur');
+        console.log('blur');
+        var recordobj = {
+            intervaltime: CodingEditer.input_focus_time - CodingEditer.record_startime,
+            editor: 'runtimeArgus',
+            changeobj: {
+                from: {
+                    ch: 0,
+                    line: 0,
+                },
+                text: '',
+                to: {
+                    ch: 0,
+                    line: 0,
+                }
+            },
+            runtimeArgus: $(this).val(),
+            trigger: 0,
+            playTime: 0
+        };
+
+        CodingEditer.record_startime = CodingEditer.input_focus_time; // 获取焦点的时间
+        CodingEditer.records.push(recordobj);
+        console.log(CodingEditer.records);
+    })
+
+
     function recordReady(){
         var seconds = 0;
         var countdown = setInterval(function() {
@@ -5,7 +5,9 @@ $(function(){
     var _codeReplayId = getQuery('codeReplayId');
     var player = $.AudioPlayer;
  
-    $("title").html("C 语言");
+    var languageName = Dir.getLangName(_languageid);
+    $("title").html(languageName);
+
     // new一个基本IDE结构
     var ide = new GxbIde({
         el: '#folder',
@@ -21,73 +23,9 @@ $(function(){
     });
  
     console.log(_role)
-    // if (_role == 0) {
-    //     playUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
-    //     getCodeData(playUrl)
-    // } else if (_role == 1) {
-    //     playUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
-    //     getCodeData(playUrl)
-    // }
-    
-    CodingEditer.isRecordPage = 0;
-
-    // // 获取code
-    // function getCodeData(url){
-    //     console.log(url)
-    //     $.ajax({
-    //         type: "get",
-    //         url: url,
-    //         dataType: "json",
-    //         contentType: "application/json",
-    //         success: function(res) {
-    //             console.log('++++++++--------');
-    //             console.log(res)
-    //             var coderecords = res.codeRecordList
-    //             var audioUrl = res.audioUrl;
  
-    //             initTrigger(coderecords)
-    //             AudioPlayer(audioUrl)
-    //         },
-    //         error: function(error) {
-    //             console.log(error)
-    //         }
-    //     });
-    // }
-
-    // // 初始化tigger
-    // function initTrigger(records){
-    //     var records = records
-    //     for (var i = 0, leg = records.length; i < leg; i++) {
-    //         if (!records[i].trigger) records[i].trigger = 0;
-    //         records[i].changeobj = jQuery.parseJSON(records[i].changeobj);
-    //         records[i].treefile = jQuery.parseJSON(records[i].treefile);
-    //     }
-    //     CodingEditer.records = records;
-    // }
+    CodingEditer.isRecordPage = 0;
  
-    // // 初始化播放音频控制条
-    // function AudioPlayer(audioUrl){
-    //     player.init({
-    //         container: '#audioWrap',
-    //         source: "https://gxb-file.oss-cn-beijing.aliyuncs.com" + audioUrl,
-    //         imagePath: '../js/audioPlayer/image',
-    //         debuggers: false,
-    //         allowSeek: false,
-    //         playCallback: function() { // 播放
-    //             console.log('++++++++');
-    //             CodingEditer.playCoding();
-    //         },
-    //         pauseCallback: function() { // 暂停
-    //             CodingEditer.audioTime = parseInt(player.elements.audioDom.currentTime*1000);
-    //             CodingEditer.pauseCode();
-    //         },
-    //         seekedCallback: function() { // 拖拽
-    //         }, 
-    //         endedCallback: function() { // 结束播放
-    //             playEnd()
-    //         }
-    //     });
-    // }
  
  
 })
 \ No newline at end of file
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>JAVA</title>
+    <title></title>
     <link rel="stylesheet" href="../css/responsive/css/bootstrap.min.css">
     <link href="../css/codemirror.css" rel="stylesheet">
     <link href="../css/reset.css" rel="stylesheet">
@@ -25,9 +25,7 @@
         //     $('.my-button').click(function(){
         //         var l = Ladda.create(this);
         //         l.start();
-
         //     })
-            
         // })
     </script>
  
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>JAVA</title>
+    <title></title>
     <link rel="stylesheet" href="../css/responsive/css/bootstrap.min.css">
     <link href="../css/codemirror.css" rel="stylesheet">
     <link href="../css/reset.css" rel="stylesheet">