fix bug

ykxie
1 parent d8870822
Showing 9 changed files with 428 additions and 15 deletions
kkb@192.168.30.25
src/gxb-ide/CodingEditer.js
src/gxb-ide/Dir.js
src/gxb-ide/Iterm.js
src/index.html
src/js/gbreplayer.js
src/js/player.js
src/js/recorder1/Myna.js
src/js/recorder1/recorder.js
 ;(function(window){
-    var isReplayPage = false;
     var CodingEditer = {
         records: [],                    // 存储录入的操作
@@ -271,7 +270,9 @@
             console.log(status + '##########################')
             if (status == 0 || status == 1) {
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-                    treeLinkEditor[i].CodeMirrorRecord.setOption('readOnly', status);
+                    if(!Dir.isReplayPage){
+                        treeLinkEditor[i].CodeMirrorRecord.setOption('readOnly', status);
+                    }
                     treeLinkEditor[i].CodeMirrorReplay.setOption('readOnly', status);
                 }
             }else{
@@ -289,7 +290,7 @@
         // 生成 CodeMirror
         for (var i = 0; i < treeLinkEditor.length; i++) {
             // 判断是否是播放页面，如果是则不显示录制区相关dom
-            if(!isReplayPage){
+            if(!Dir.isReplayPage){
                 treeLinkEditor[i].CodeMirrorRecord = CodeMirror.fromTextArea($('#' + treeLinkEditor[i].record)[0], {
                     value: '',
                     mode: modeName,
@@ -50,6 +50,7 @@
         treeLinkEditor: [], // 缓存整个目录树结构和代码编辑器的关系
         mainPath: null,     // 运行编译时候需要知道当前是哪个文件
         treeObj: null,
+        isReplayPage: false,
         init: function(){
             console.log('=======================');
         },
@@ -94,6 +95,7 @@
                     getCodeData(playUrl, el)
                 }
+
                 // if (role == 0) {
                 //     playUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
                 // } else if (role == 1) {
@@ -219,7 +221,7 @@
             var _arr = [];
             var treeLinkEditor = Dir.treeLinkEditor;
             console.log(treeLinkEditor);
-            if(!isReplayPage){
+            if(!Dir.isReplayPage){
                 // 判断是否是需要返回单文件结果
                 if(name){
                     for (var i = 0; i < treeLinkEditor.length; i++) {
@@ -487,7 +489,7 @@
                     "replay": _name + 'Replay'
                 });
                 // 判断是否是播放页面，如果是则不显示录制区相关dom
-                if(!isReplayPage){
+                if(!Dir.isReplayPage){
                     recordTemplate += '<div class="coding" id="'+ _name +'RecordWrap"><textarea id="'+ _name + 'Record" title="'+ _name +'" style="display: none;">'+defaultValue+'</textarea></div>'
                 }
@@ -495,7 +497,7 @@
             }
         }
         // 判断是否是播放页面，如果是则不显示录制区相关dom
-        if(!isReplayPage){
+        if(!Dir.isReplayPage){
             $('#recordzone').append(recordTemplate);
         }
         $('#replayzone').append(replayTemplate);
@@ -587,16 +589,19 @@
             dataType: "json",
             contentType: "application/json",
             success: function(res) {
-                console.log('0000--------------------')
                 console.log(res)
-                setTitle(res.languageid);
+                $('.button.edit').hide();
+                setTitle(res.languageid);
+                Dir.languageid = res.languageid;
                 var coderecords = res.codeRecordList || res.studentRecordList;
                 var audioUrl = res.audioUrl;
                 var treeArr = res.programmingFileList;
                 Dir.treeData = programFileListToTreeJson(treeArr);
                 Dir.treeObj = $.fn.zTree.init($(el), setting, Dir.treeData);
+                Dir.treeObj.setting.edit.showRenameBtn = false;
+                Dir.treeObj.setting.edit.enable = false;
                 addTextareaPage(Dir.treeData);
                 CodingEditer.initCodeMirror(treeLinkEditor);
@@ -31,7 +31,8 @@
             var _this = this;
             var el = document.querySelector('#CompileBtn');
             var userId = _this.options.userId;
-            var languageId = _this.options.languageId;
+            // var languageId = _this.options.languageId;
+            var languageId = _this.options.languageId || Dir.languageid;
             var role = getQuery('role');
             // 判断是否录制走不同的逻辑
             if (!CodingEditer.isRcording) {
@@ -52,9 +53,8 @@
                     CodingEditer.addRecord(treeNode, check_tree_time);
                     _this.compileStatus = false;
-                    console.log('******************************' + this.compileStatus)
                 }
-                
+                console.log('******************************' + languageId)
                 compileMode(el, userId, languageId)
                 $('.contrl-shodow').show();
             }
@@ -205,7 +205,7 @@
     </div>
-    <script src="js/recorder/Myna.js"></script>
+    <script src="js/recorder1/Myna.js"></script>
     <script src="js/recording/recording.js"></script>
     <script>
@@ -1429,9 +1429,12 @@ $(function(){
         	var runStatus = $("#comprun").data('run');
         	if (runStatus == 1) {
         	    Hourglass.pauseTimer(); // 暂停计时器
-        	    recorder.pause(); // 音频暂停
+        	    if (_role == 0) {
+        	    	recorder.pause(); // 音频暂停
+        	    }
         	}
         	$("#comprun").data('run', 0);
+        	$('.pause-shodow').show();
         	$('.compile-loading').show();
         	// 暂停录制
         	var pauseState = $('#pause').data('pause');
@@ -18,13 +18,13 @@ $(function(){
     // 编译控制台
     var iterm = new Iterm({
-        userId: _userId,
-        languageId: _languageid
+        userId: _userId
     });
     console.log(_role)
     CodingEditer.isRecordPage = 0;
+    Dir.isReplayPage = true;
     $('.play-code').on('click', function(){ 
         console.log('=================')
+(function(window) {
+    //兼容
+    window.URL = window.URL || window.webkitURL;
+    navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
+
+    var HZRecorder = function(stream, config) {
+        config = config || {};
+        config.sampleBits = config.sampleBits || 16; //采样数位 8, 16
+        config.sampleRate = config.sampleRate || 11025; //采样率(1/6 44100)
+
+        var context = new(window.webkitAudioContext || window.AudioContext)();
+        var audioInput = context.createMediaStreamSource(stream);
+        var createScript = context.createScriptProcessor || context.createJavaScriptNode;
+        var recorder = createScript.apply(context, [4096, 1, 1]);
+
+        var audioData = {
+            size: 0,   //录音文件长度
+            buffer: [],  //录音缓存
+            inputSampleRate: context.sampleRate, //输入采样率
+            inputSampleBits: 16, //输入采样数位 8, 16
+            outputSampleRate: config.sampleRate, //输出采样率
+            oututSampleBits: config.sampleBits, //输出采样数位 8, 16
+            input: function(data) {
+                this.buffer.push(new Float32Array(data));
+                this.size += data.length;
+            },
+            compress: function() { //合并压缩
+                //合并
+                var data = new Float32Array(this.size);
+                var offset = 0;
+                for (var i = 0; i < this.buffer.length; i++) {
+                    data.set(this.buffer[i], offset);
+                    offset += this.buffer[i].length;
+                }
+                //压缩
+                var compression = parseInt(this.inputSampleRate / this.outputSampleRate);
+                var length = data.length / compression;
+                var result = new Float32Array(length);
+                var index = 0,
+                    j = 0;
+                while (index < length) {
+                    result[index] = data[j];
+                    j += compression;
+                    index++;
+                }
+                return result;
+            },
+            encodeWAV: function() {
+                var sampleRate = Math.min(this.inputSampleRate, this.outputSampleRate);
+                var sampleBits = Math.min(this.inputSampleBits, this.oututSampleBits);
+                var bytes = this.compress();
+                var dataLength = bytes.length * (sampleBits / 8);
+                var buffer = new ArrayBuffer(44 + dataLength);
+                var data = new DataView(buffer);
+
+                var channelCount = 1; //单声道
+                var offset = 0;
+
+                var writeString = function(str) {
+                    for (var i = 0; i < str.length; i++) {
+                        data.setUint8(offset + i, str.charCodeAt(i));
+                    }
+                }
+
+                // 资源交换文件标识符 
+                writeString('RIFF');
+                offset += 4;
+                // 下个地址开始到文件尾总字节数,即文件大小-8 
+                data.setUint32(offset, 36 + dataLength, true);
+                offset += 4;
+                // WAV文件标志
+                writeString('WAVE');
+                offset += 4;
+                // 波形格式标志 
+                writeString('fmt ');
+                offset += 4;
+                // 过滤字节,一般为 0x10 = 16 
+                data.setUint32(offset, 16, true);
+                offset += 4;
+                // 格式类别 (PCM形式采样数据) 
+                data.setUint16(offset, 1, true);
+                offset += 2;
+                // 通道数 
+                data.setUint16(offset, channelCount, true);
+                offset += 2;
+                // 采样率,每秒样本数,表示每个通道的播放速度 
+                data.setUint32(offset, sampleRate, true);
+                offset += 4;
+                // 波形数据传输率 (每秒平均字节数) 单声道×每秒数据位数×每样本数据位/8 
+                data.setUint32(offset, channelCount * sampleRate * (sampleBits / 8), true);
+                offset += 4;
+                // 快数据调整数 采样一次占用字节数 单声道×每样本的数据位数/8 
+                data.setUint16(offset, channelCount * (sampleBits / 8), true);
+                offset += 2;
+                // 每样本数据位数 
+                data.setUint16(offset, sampleBits, true);
+                offset += 2;
+                // 数据标识符 
+                writeString('data');
+                offset += 4;
+                // 采样数据总数,即数据总大小-44 
+                data.setUint32(offset, dataLength, true);
+                offset += 4;
+                // 写入采样数据 
+                if (sampleBits === 8) {
+                    for (var i = 0; i < bytes.length; i++, offset++) {
+                        var s = Math.max(-1, Math.min(1, bytes[i]));
+                        var val = s < 0 ? s * 0x8000 : s * 0x7FFF;
+                        val = parseInt(255 / (65535 / (val + 32768)));
+                        data.setInt8(offset, val, true);
+                    }
+                } else {
+                    for (var i = 0; i < bytes.length; i++, offset += 2) {
+                        var s = Math.max(-1, Math.min(1, bytes[i]));
+                        data.setInt16(offset, s < 0 ? s * 0x8000 : s * 0x7FFF, true);
+                    }
+                }
+
+                return new Blob([data], { type: 'audio/wav' });
+            }
+        };
+
+        //开始录音
+        this.start = function() {
+            audioInput.connect(recorder);
+            recorder.connect(context.destination);
+        }
+
+        // 暂停继续
+        this.pause = function() {
+            console.log(context.state);
+            if (context.state === 'running') {
+                context.suspend().then(function() {
+                });
+            } else if (context.state === 'suspended') {
+                context.resume().then(function() {
+                });
+            }
+        }
+
+        //停止
+        this.stop = function() {
+            context.close().then(function(){
+                recorder.disconnect();
+            });
+            
+            console.log(this.getBlob);
+        }
+
+        //获取音频文件
+        this.getBlob = function() {
+            this.stop();
+            return audioData.encodeWAV();
+        }
+
+        // 获取音频文件
+        this.getBlobData = function(){
+            console.log(audioData.encodeWAV());
+            // return audioData.encodeWAV();
+            $('#audio').attr('src', window.URL.createObjectURL(this.getBlob()));
+        }
+
+        //回放
+        this.play = function(audio) {
+            console.log(window.URL.createObjectURL(this.getBlob()))
+            audio.src = window.URL.createObjectURL(this.getBlob());
+        }
+
+        this.download = function(saveAudio) {
+            var url = window.URL.createObjectURL(this.getBlob());
+            console.log(url);
+            saveAudio.href = url;
+            saveAudio.download = 'output.wav';
+        }
+
+        //上传
+        this.upload = function(url, callback) {
+            var file = audioData.encodeWAV();
+            var $this = $(this);
+            console.log(file);
+            var megabyte = 1024 * 1024;
+            var defaultChnkSize = 5 * megabyte;
+
+            var date = new Date();
+            var year = date.getFullYear();
+            var month = date.getMonth() + 1;
+            var today = date.getDate();
+            var path = "uploads/programming_audio/link/" + String(year).substr(2) + "/" + (String(month).length == 1?"0" + month:month)+ "/" + today + "/";
+
+            var parameterConfig = {
+                filename: 'asdfas', 
+                filesize: file.size,
+                filetype: file.type,
+                isPart: false,
+                uploadId: "",
+                isCompleted: false,
+                prefix: path, // "uploads/programming_audio/link"
+                bucket: "gxb-file", ///“gxb-file”
+                defaultChunkSize: defaultChnkSize || 0,
+                isVideoConvert: false,
+                isClassCover: false
+            };
+            var parameter = JSON.stringify(parameterConfig);
+            console.log(parameter);
+            gxb._.ajax(gxb_api + '/s3', {
+                type: 'POST',
+                contentType: "application/json",
+                // async:false,
+                data: parameter,
+                crossDomain: true,
+                success: function(res) {
+                    console.log(res);
+                    successUrl = res;
+                    var queue = [];
+                    if (parameterConfig.isPart === true) {
+                        var partsArr = [];
+                        var parts = utils.toJsonObj(res)[0];
+                        parameterConfig.uploadId = parts.upload_id;
+                        var obj = {
+                            md5: parameterConfig.md5, //文件的md5
+                            loadedNum: "0", //目前上传大小
+                            total: parts.multi_list[parts.multi_list.length - 1].part_end, //总大小
+                            partsLen: parts.multi_list.length, //分片个数
+                            successNum: parts.successNum, //成功的个数
+                            succesUrl: successUrl,
+                            file: file,
+                            max_size: 5,
+                            coment_size: 0,
+                            errorNum: 0
+                        }
+                        console.log(obj);
+                        uploadArr.push(obj)
+                        for (var partIndex = 0; partIndex < parts.total_num; partIndex++) {
+                            var partItem = parts.multi_list[partIndex];
+                            console.log(partItem.part_url)
+                            console.log(partItem.part_begin + ' -> ' + partItem.part_end);
+                            var loadedNum = 0;
+                            if (partItem && partItem.isSuccess != 1) {
+                                queue.push(partItem);
+                                loadedNum = 0;
+                            } else {
+                                loadedNum = partItem.upload_len;
+                            }
+                            var partOne = {
+                                loaded: loadedNum,
+                                part_idx: partItem.part_idx
+                            }
+                            partsArr.push(partOne);
+                        }
+                        partsArr.reverse();
+                        queue.reverse();
+                    } else {
+                        uploadFileHandler(false, $this, file, file, res, successUrl, parameterConfig)
+                    }
+                }
+            });
+        }
+
+        //音频采集
+        recorder.onaudioprocess = function(e) {
+            audioData.input(e.inputBuffer.getChannelData(0));
+            //record(e.inputBuffer.getChannelData(0));
+        }
+
+    };
+
+    var uploadFileHandler = function(isMultiPart, $this, file, data, url, successUrl, parameter, partItem, queue, obj, partsArr) {
+
+            var headers = { 'x-amz-acl': 'public-read' }
+            if (isMultiPart == true) {
+                headers = { 'Access-Control-Allow-Origin': "https://" + window.location.host }
+            } else {
+                headers = { 'x-amz-acl': 'public-read' }
+            }
+            console.log(url);
+
+            url = 'https' + url.split('https')[1];
+            $.ajax({
+                url: url,
+                type: 'PUT',
+                data: data,
+                headers: headers,
+                contentType: file.type,
+                processData: false,
+                crossDomain: true,
+                beforeSend: function(){
+                    // $('#uploading').css('dispaly', 'block')
+                },
+                success: function(data) {
+                    console.log(data)
+                    $('#uploading').css('display', 'none')
+                    var audioUrl = getCDNFile(url)
+                    console.log(audioUrl)
+                    $(".audio-url").val(audioUrl)
+
+                    $('#savecorde').trigger('click');
+
+                },
+                error: function(res){
+                    $('.upload-tip').hide();
+                    alert('音频保存失败...')
+                    console.log(res)
+                }
+            });
+        }
+        //抛出异常
+    HZRecorder.throwError = function(message) {
+            alert(message);
+            throw new function() { this.toString = function() {
+                    return message; } }
+        }
+        //是否支持录音
+    HZRecorder.canRecording = (navigator.getUserMedia != null);
+    //获取录音机
+    HZRecorder.get = function(callback, config) {
+        if (callback) {
+            if (navigator.getUserMedia) {
+                navigator.getUserMedia({ audio: true } //只启用音频
+                    ,
+                    function(stream) {
+                        var rec = new HZRecorder(stream, config);
+                        callback(rec);
+                    },
+                    function(error) {
+                        $('.error').css('display', 'block');
+                        $('.error-btn').click(function(){
+                            $('.error').hide();
+                        })
+                        switch (error.code || error.name) {
+                            case 'PERMISSION_DENIED':
+                            case 'PermissionDeniedError':
+                                HZRecorder.throwError('用户拒绝提供信息。');
+                                break;
+                            case 'NOT_SUPPORTED_ERROR':
+                            case 'NotSupportedError':
+                                HZRecorder.throwError('浏览器不支持硬件设备。');
+                                break;
+                            case 'MANDATORY_UNSATISFIED_ERROR':
+                            case 'MandatoryUnsatisfiedError':
+                                HZRecorder.throwError('无法发现指定的硬件设备。');
+                                break;
+                            default:
+                                HZRecorder.throwError('无法打开麦克风。异常信息:' + (error.code || error.name));
+                                break;
+                        }
+                    });
+            } else {
+                HZRecorder.throwErr('当前浏览器不支持录音功能。');
+                return;
+            }
+        }
+    }
+
+    window.HZRecorder = HZRecorder;
+
+})(window);
+
+$(function(){
+
+    var recorder;
+
+    var audio = document.querySelector('audio');
+    // var audio = document.getElementById('audio');
+
+    function startRecording() {
+       
+    }
+
+    function stopRecording() {
+       recorder.stop();
+    }
+
+    function playRecording() {
+
+       recorder.play(audio);
+    }
+
+
+    // $("#startRec").trigger('click');
+
+    function uploadAudio() {
+        recorder.upload("", function (state, e) {
+            switch (state) {
+                case 'uploading':
+                    //var percentComplete = Math.round(e.loaded * 100 / e.total) + '%';
+                    break;
+                case 'ok':
+                    console.log(e.target.responseText);
+                    alert("上传成功");
+                    break;
+                case 'error':
+                    alert("上传失败");
+                    break;
+                case 'cancel':
+                    alert("上传被取消");
+                    break;
+            }
+        });
+    }
+
+
+});
+
+