Commit 1d6ba9daa7f2250ff9550c6dd1556abdb2cbc037
1 parent
52865f48
优化框架重新录制bug、修改文件
Showing
6 changed files
with
78 additions
and
49 deletions
src/gxb-ide/CodingEditer.js
| @@ -133,10 +133,12 @@ | @@ -133,10 +133,12 @@ | ||
| 133 | CodingEditer.record_startime = check_tree_time; | 133 | CodingEditer.record_startime = check_tree_time; |
| 134 | }, | 134 | }, |
| 135 | initRecodesValue: function(){ | 135 | initRecodesValue: function(){ |
| 136 | + var treeLinkEditor = Dir.treeLinkEditor; | ||
| 136 | CodingEditer.resetCodeMirrorValue(); | 137 | CodingEditer.resetCodeMirrorValue(); |
| 137 | CodingEditer.record_startime = new Date().getTime(); // 设置开始录制的时间 | 138 | CodingEditer.record_startime = new Date().getTime(); // 设置开始录制的时间 |
| 138 | - var treeLinkEditor = Dir.treeLinkEditor; | ||
| 139 | CodingEditer.recording_status = true; | 139 | CodingEditer.recording_status = true; |
| 140 | + CodingEditer.records = []; | ||
| 141 | + console.log(CodingEditer.records); | ||
| 140 | for (var i = treeLinkEditor.length-1; i >= 0; i--) { | 142 | for (var i = treeLinkEditor.length-1; i >= 0; i--) { |
| 141 | console.log(treeLinkEditor[i].CodeMirrorRecord.getValue()); | 143 | console.log(treeLinkEditor[i].CodeMirrorRecord.getValue()); |
| 142 | var recordobj = { | 144 | var recordobj = { |
src/gxb-ide/Dir.js
| @@ -318,8 +318,47 @@ | @@ -318,8 +318,47 @@ | ||
| 318 | if (newName.length == 0) { | 318 | if (newName.length == 0) { |
| 319 | renameAlert("文件名名称不能为空.", treeNode); | 319 | renameAlert("文件名名称不能为空.", treeNode); |
| 320 | return false; | 320 | return false; |
| 321 | - } | ||
| 322 | - if(newName != treeNode.name){ | 321 | + }else if(newName != treeNode.name){ |
| 322 | + for (var i = 0; i < treeLinkEditor.length; i++) { | ||
| 323 | + if(treeLinkEditor[i].file === treeNode.name){ | ||
| 324 | + var _temName = treeLinkEditor[i].name; | ||
| 325 | + var _name = Dir.manageName(newName); | ||
| 326 | + | ||
| 327 | + // 缓存值得更新 | ||
| 328 | + treeLinkEditor[i].name = _name; | ||
| 329 | + treeLinkEditor[i].file = newName; | ||
| 330 | + treeLinkEditor[i].filePath = Dir.getTreePath(treeNode.name, newName); | ||
| 331 | + treeLinkEditor[i].record = _name + 'Record'; | ||
| 332 | + treeLinkEditor[i].replay = _name + 'Replay'; | ||
| 333 | + treeLinkEditor[i].CodeMirrorRecordId = treeLinkEditor[i].record + 'CodeMirror'; | ||
| 334 | + treeLinkEditor[i].CodeMirrorReplayId = treeLinkEditor[i].replay + 'CodeMirror'; | ||
| 335 | + | ||
| 336 | + Dir.mainPath = treeLinkEditor[i].filePath; | ||
| 337 | + // 更新DOM相关 | ||
| 338 | + $('#'+ _temName +'RecordWrap').attr({ | ||
| 339 | + id: _name +'RecordWrap' | ||
| 340 | + }); | ||
| 341 | + $('#'+ _temName + 'Record').attr({ | ||
| 342 | + id: _name + 'Record', | ||
| 343 | + title: _name | ||
| 344 | + }); | ||
| 345 | + $('#'+ _temName + 'RecordCodeMirror').attr({ | ||
| 346 | + id: _name + 'RecordCodeMirror' | ||
| 347 | + }); | ||
| 348 | + | ||
| 349 | + $('#'+ _temName +'ReplayWrap').attr({ | ||
| 350 | + id: _name +'ReplayWrap' | ||
| 351 | + }); | ||
| 352 | + $('#'+ _temName + 'Replay').attr({ | ||
| 353 | + id: _name + 'Replay', | ||
| 354 | + title: _name | ||
| 355 | + }); | ||
| 356 | + $('#'+ _temName + 'ReplayCodeMirror').attr({ | ||
| 357 | + id: _name + 'ReplayCodeMirror' | ||
| 358 | + }); | ||
| 359 | + // treeLinkEditor[i].CodeMirrorRecord.setValue(treeLinkEditor[i].CodeMirrorRecord.getValue() + '\n\n'+ _name); | ||
| 360 | + } | ||
| 361 | + } | ||
| 323 | } | 362 | } |
| 324 | return true; | 363 | return true; |
| 325 | } | 364 | } |
| @@ -337,7 +376,7 @@ | @@ -337,7 +376,7 @@ | ||
| 337 | // 编辑错误提示 | 376 | // 编辑错误提示 |
| 338 | function renameAlert(str, treeNode){ | 377 | function renameAlert(str, treeNode){ |
| 339 | setTimeout(function() { | 378 | setTimeout(function() { |
| 340 | - // var zTree = $.fn.zTree.getZTreeObj("folder"); | 379 | + // var Dir = $.fn.zTree.getZTreeObj("folder"); |
| 341 | // cancelEditName(); | 380 | // cancelEditName(); |
| 342 | alert(str); | 381 | alert(str); |
| 343 | }, 0); | 382 | }, 0); |
src/gxb-ide/ToolBox.js
| @@ -98,7 +98,7 @@ | @@ -98,7 +98,7 @@ | ||
| 98 | console.log('重新录制代码'); | 98 | console.log('重新录制代码'); |
| 99 | var _this = this; | 99 | var _this = this; |
| 100 | $('#recordertab a:first').tab('show'); | 100 | $('#recordertab a:first').tab('show'); |
| 101 | - CodingEditer.records = []; | 101 | + // CodingEditer.records = []; |
| 102 | _this.readOnly(0) | 102 | _this.readOnly(0) |
| 103 | recordAudio() | 103 | recordAudio() |
| 104 | }, | 104 | }, |
| @@ -139,7 +139,7 @@ | @@ -139,7 +139,7 @@ | ||
| 139 | console.log(rec); | 139 | console.log(rec); |
| 140 | recorder = rec; | 140 | recorder = rec; |
| 141 | recorder.start(); | 141 | recorder.start(); |
| 142 | - CodingEditer.initRecodesValue(); | 142 | + CodingEditer.initRecodesValue() |
| 143 | 143 | ||
| 144 | }); | 144 | }); |
| 145 | } | 145 | } |
src/gxb-ide/util.js
| 1 | +// 修改代码状态 | ||
| 2 | +function readOnly(status){ | ||
| 3 | + // status: 1 禁止修改,0 允许修改 | ||
| 4 | + var treeLinkEditor = Dir.treeLinkEditor; | ||
| 5 | + | ||
| 6 | + if (status == 0 && status == 1) { | ||
| 7 | + for (var i = 0; i < treeLinkEditor.length; i++) { | ||
| 8 | + treeLinkEditor[i].CodeMirrorRecord.setOption('readOnly', status); | ||
| 9 | + treeLinkEditor[i].CodeMirrorReplay.setOption('readOnly', status); | ||
| 10 | + } | ||
| 11 | + }else{ | ||
| 12 | + console.log('status undefind'); | ||
| 13 | + } | ||
| 14 | + | ||
| 15 | +} | ||
| 0 | \ No newline at end of file | 16 | \ No newline at end of file |
src/js/c.js
| 1 | $(function(){ | 1 | $(function(){ |
| 2 | - var languageid = 11; | ||
| 3 | var _languageid = getQuery('languageid'); | 2 | var _languageid = getQuery('languageid'); |
| 3 | + var _userId = getQuery('userId'); | ||
| 4 | 4 | ||
| 5 | $("title").html("C 语言"); | 5 | $("title").html("C 语言"); |
| 6 | - | ||
| 7 | - var userId = 826920; | ||
| 8 | - console.log(languageid); | ||
| 9 | - console.log(_languageid); | ||
| 10 | - | 6 | + // new一个基本IDE结构 |
| 11 | var ide = new GxbIde({ | 7 | var ide = new GxbIde({ |
| 12 | el: '#folder', | 8 | el: '#folder', |
| 13 | languageid: parseInt(_languageid) | 9 | languageid: parseInt(_languageid) |
| 14 | }); | 10 | }); |
| 15 | 11 | ||
| 16 | - console.log(ide); | ||
| 17 | - | ||
| 18 | - $('.getValue').click(function(){ | ||
| 19 | - // var treeLinkEditor = Dir.treeLinkEditor; | ||
| 20 | - console.log(CodingEditer.records); | ||
| 21 | - CodingEditer.getCodeMirrorValue(); | ||
| 22 | - CodingEditer.playCoding(); | ||
| 23 | - }) | ||
| 24 | - | ||
| 25 | - // $('#compileBtn').click(function(){ | ||
| 26 | - // ToolBox.compileMode(userId, languageid); | ||
| 27 | - // }) | 12 | + // new一个老师录制的控制条工具 |
| 13 | + var techTool = new ToolBox({ | ||
| 14 | + el: '#toolBox', | ||
| 15 | + startCallback: function(){ | ||
| 16 | + | ||
| 17 | + } | ||
| 18 | + }); | ||
| 28 | 19 | ||
| 29 | - // 录制代码 | 20 | + // 编译控制台 |
| 21 | + var iterm = new Iterm({ | ||
| 22 | + userId: _userId, | ||
| 23 | + languageId: _languageid | ||
| 24 | + }); | ||
| 30 | 25 | ||
| 31 | - // 播放代码 | ||
| 32 | - $('.audio-play').click(function() { | ||
| 33 | - $('#audio')[0].play(); | ||
| 34 | - }) | 26 | + console.log(ide); |
| 35 | 27 | ||
| 36 | }) | 28 | }) |
| 37 | 29 |
src/v1.1/c.html
| @@ -29,8 +29,8 @@ | @@ -29,8 +29,8 @@ | ||
| 29 | <script src="../gxb-ide/Dir.js"></script> | 29 | <script src="../gxb-ide/Dir.js"></script> |
| 30 | <script src="../gxb-ide/CodingEditer.js"></script> | 30 | <script src="../gxb-ide/CodingEditer.js"></script> |
| 31 | <script src="../gxb-ide/Iterm.js"></script> | 31 | <script src="../gxb-ide/Iterm.js"></script> |
| 32 | - <script src="../gxb-ide/ToolBox.js"></script> | ||
| 33 | <script src="../gxb-ide/Ide.js"></script> | 32 | <script src="../gxb-ide/Ide.js"></script> |
| 33 | + <script src="../gxb-ide/ToolBox.js"></script> | ||
| 34 | 34 | ||
| 35 | <script src="../js/c.js"></script> | 35 | <script src="../js/c.js"></script> |
| 36 | 36 | ||
| @@ -43,25 +43,6 @@ | @@ -43,25 +43,6 @@ | ||
| 43 | <script> | 43 | <script> |
| 44 | var gxb_api = "https://restful1.gaoxiaobang.com"; | 44 | var gxb_api = "https://restful1.gaoxiaobang.com"; |
| 45 | // var gxb_api = "http://192.168.80.223:8080" | 45 | // var gxb_api = "http://192.168.80.223:8080" |
| 46 | - $(function(){ | ||
| 47 | - var _languageid = getQuery('languageid'); | ||
| 48 | - var _userId = getQuery('userId'); | ||
| 49 | - | ||
| 50 | - | ||
| 51 | - var techTool = new ToolBox({ | ||
| 52 | - el: '#toolBox', | ||
| 53 | - startCallback: function(){ | ||
| 54 | - | ||
| 55 | - } | ||
| 56 | - }); | ||
| 57 | - | ||
| 58 | - var iterm = new Iterm({ | ||
| 59 | - userId: _userId, | ||
| 60 | - languageId: _languageid | ||
| 61 | - }); | ||
| 62 | - | ||
| 63 | - | ||
| 64 | - }) | ||
| 65 | </script> | 46 | </script> |
| 66 | 47 | ||
| 67 | 48 |