发布线上

# Conflicts: # src/js/util/util.js

发布线上
# Conflicts: # src/js/util/util.js
ykxie
2 parents ad883575 a34e130f
Showing 4 changed files with 73 additions and 35 deletions
src/js/gb.js
src/js/recorder/Myna.js
src/js/util/util.js
src/v1.1/index.html
@@ -87,6 +87,7 @@ $(function() {
                     }
                     treeObj = $.fn.zTree.getZTreeObj("folder");
                     treeObj.expandNode(treeNode);
+                    console.log(GBCodePlayBack.isRecordPlay);
                     if (GBCodePlayBack.isRecordPlay == 1) {
                         GBCodePlayBack.check_tree_time = new Date().getTime(); // 获取焦点的时间
                         var recordobj = {
@@ -875,7 +876,8 @@ $(function() {
                 var data = $(this).attr('data');
                 if (_role == 0) {
                     $('.audio-play').attr('disabled', true);
-                    recorder.play(audio);
+                    $('#audio')[0].play();
+                    // recorder.play(audio);
                 }
                 $(this).attr('data', 0).attr('data-original-title', '播放录音');
@@ -1229,11 +1231,11 @@ $(function() {
                 // 单个文件路径及内容 数组
                 var programmingFileList = ZTREE.getTreeData();
-                for (var i = 0; i < GBCodePlayBack.records.length; i++) {
-                    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 timeLength = $('#audio')[0].duration;
+                var keepTimer = Math.round(timeLength);
+                console.log(timeLength);
+
                 var postData = {
                     "mainPath": mainPath,
                     "mainArgus": "lixxx",
@@ -1250,19 +1252,30 @@ $(function() {
                     "audioUrl": $('.audio-url').val(),
                     "programmingSource": 1,
                     "programmingFileList": programmingFileList,
-                    "codeRecordList": GBCodePlayBack.records,
                     "totaltime": keepTimer
                 }
-
-                console.log('============');
-                console.log(postData);
-
+                var temp_record = JSON.parse(JSON.stringify(GBCodePlayBack.records)) 
+                var codeRecordLists = [];
+                for (var i = 0; i < temp_record.length; i++) {
+                    var temp_record_item = temp_record[i];
+                    if(temp_record_item){    
+                        temp_record_item.changeobj=JSON.stringify(temp_record_item.changeobj);
+                        if(temp_record_item.treefile){
+                            temp_record_item.treefile=JSON.stringify(temp_record_item.treefile);
+                        }
+                    }
+                    codeRecordLists.push(temp_record_item);
+                }
                 if (_role == 0) {
+                    postData.codeRecordList = codeRecordLists;
                     var roleUrl = gxb_api + "/programming/codeReplay/api"
                 }else if (_role == 1) {
+                    postData.codeRecordList = codeRecordLists;
                     var roleUrl = gxb_api + "/programming/student/studentReplay/api"
                 }
-                
+                console.log('============');
+                console.log(postData);
+                console.log(keepTimer);
                 $.ajax({
                     type: "post",
                     url: roleUrl,
@@ -1698,12 +1711,14 @@ $(function() {
         },
         onChange: function(editor, changeobj) { // 监听输入事件 editor: 输入语言；changeobj：输入内容{from,text,to}
             // console.info('GBCodePlayBack.onChange');
-            var intervaltime = 100,
+            var intervaltime,
                 currenttime = new Date().getTime();
             // if(!GBCodePlayBack.record_startime) GBCodePlayBack.record_startime = currenttime;
             // 根据不同的身份设置录制代码的时间间隔，当学生端输入的时候，重置间隔为100毫秒
             if (_role == 0 && GBCodePlayBack.record_startime) {
                 intervaltime = currenttime - GBCodePlayBack.record_startime;
+            }else{
+                intervaltime = 100;
             }
             var pausetatus = $('#pause').data('status');
@@ -1892,30 +1907,49 @@ $(function() {
          * @return {[type]}     [description]
          */
         resetCodeMirrorValue: function(num) {
+            console.info('GBCodePlayBack.resetCodeMirrorValue');
             var _this = this;
             var _thisNum = num;
             if (_thisNum == 0) {
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-                    if (treeLinkEditor[i].CodeMirrorRecord.getValue() != undefined) {
+                    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].CodeMirrorReplay.getValue() != undefined) {
-                        treeLinkEditor[i].CodeMirrorReplay.setValue("");
-                    }
+                    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++) {
-                    if (treeLinkEditor[i].CodeMirrorRecord.getValue() != undefined) {
-                        treeLinkEditor[i].CodeMirrorRecord.setValue("");
-                    }
-                    if (treeLinkEditor[i].CodeMirrorReplay.getValue() != undefined) {
-                        treeLinkEditor[i].CodeMirrorReplay.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].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("");
+                    // }
                 }
             }
+            ZTREE.showEdite({'treeNode': {'name': treeLinkEditor[0].file}});
         },
         /**
          * 获取各个文件中的代码
@@ -2005,7 +2039,7 @@ $(function() {
     $(document).on('click', '#full-screen', function(event) {
         event.preventDefault();
         var fullData = $(this).data('full');
-        launchFullScreen(document.getElementById("app")); 
+        launchFullScreen(document.body); 
         $('#back-screen').show();
         $('#full-screen').hide();
     });
@@ -2037,7 +2071,8 @@ $(function() {
         if (data == 1) {
             console.log('开始录制');
-
+            GBCodePlayBack.resetCodeMirrorValue();
+            compileResult(resultData);
             GBCodePlayBack.isRcording = 1;
             $("#countdown").find('img').attr('src', '../img/ready-go.gif');
             $("#countdown").find('img').load(function() {
@@ -2046,8 +2081,6 @@ $(function() {
                     if (seconds == 2) {
                         $("#countdown").hide();
                         startReacoder();
-                        GBCodePlayBack.resetCodeMirrorValue(0);
-                        compileResult(resultData);
                     }
                 }, 1000);
             })
@@ -2076,7 +2109,8 @@ $(function() {
     })
     $('#re-sure').click(function() {
-        initRecoding()
+        initRecoding();
+        GBCodePlayBack.isRecordPlay = 1;
         $('#start-recording').trigger('click');
     })
@@ -2430,6 +2464,7 @@ $(function() {
         $('#pause').data('pause', '0');
         if (_role == 0) {
             recorder.stop();
+            recorder.getBlobData();
             $('#upload').show();
         } else if (_role == 1) {
@@ -2455,6 +2490,8 @@ $(function() {
             if(!_datalist[i].isParent){
                 var _file = _datalist[i].name;
                 var _name = ZTREE.manageName(_file);
+                var defaultValue;
+                defaultValue = 'package '+ ZTREE.getTreePath(_file).split('/')[0] +';';
                 treeLinkEditor.push({
                     "name": _name, 
                     "file": _file,
@@ -2464,7 +2501,7 @@ $(function() {
                 });
                 // 判断是否是播放页面，如果是则不显示录制区相关dom
                 if(!isReplayPage){
-                    recordTemplate += '<div id="'+ _name +'RecordWrap"><textarea id="'+ _name + 'Record" title="'+ _name +'" style="display: none;"></textarea></div>'
+                    recordTemplate += '<div id="'+ _name +'RecordWrap"><textarea id="'+ _name + 'Record" title="'+ _name +'" style="display: none;">'+defaultValue+'</textarea></div>'
                 }
                 replayTemplate += '<div id="'+ _name +'ReplayWrap"><textarea id="'+ _name + 'Replay" title="'+ _name +'" style="display: none;"></textarea></div>'
@@ -143,6 +143,7 @@
             context.close().then(function(){
                 recorder.disconnect();
             });
+            
             console.log(this.getBlob);
         }
@@ -154,7 +155,9 @@
         // 获取音频文件
         this.getBlobData = function(){
-            return audioData.encodeWAV();
+            console.log(audioData.encodeWAV());
+            // return audioData.encodeWAV();
+            $('#audio').attr('src', window.URL.createObjectURL(this.getBlob()));
         }
         //回放
@@ -41,9 +41,7 @@ getCDNFile = function (cdnUrl) {
     $w.utils = $w.utils || utils;
 })(window, jQuery)
+// window.console.log = function(){}
+// window.console.info = function(){}
-window.console.log = function(){
-}
-window.console.info = function(){
-}
@@ -179,7 +179,7 @@
                 </button>
                 <div class="recording-time" id="timer" value="">00:00:00</div>
                 <div class="audio-view" style="display: none;">
-                    <audio id="audio" autoplay></audio>
+                    <audio id="audio"></audio>
                 </div>
                 <div class="save-wrap">
                     <input type="button" id="upload" class="upload-teach" disabled="disabled" value="保存">