修复浏览器无法自动播放语音

商艳涛
1 parent 4795b643
Showing 3 changed files with 43 additions and 44 deletions
dist/gxb-ide/CodingEditer.js
dist/gxb-ide/Dir.js
dist/js/audioPlayer/jQuery.AudioPlayer.js
@@ -121,7 +121,7 @@
          * 播放代码
          * Created by Kira on 2017-02-08
          */
-        playCoding: function(){
+        playCoding: function(e){
             CodingEditer.editable(1);
             CodingEditer.flag = false;
             if (CodingEditer.firstPlay == 0) {
@@ -145,30 +145,36 @@
             var playTotalTime = 0;
  
             $('#recordertab a:eq(1)').tab('show');
+            // 处理浏览器无法自动播放语音时候，编辑器显示空内容
+            if (e && !e.status) {
+                var timeoutcontroller = null;
+                CodingEditer.recordtimeoutcontrolls.push(timeoutcontroller);
+            } else {
+                for (var i = 0; i < playbackrecord.length; i++) {
+                    if (playbackrecord[i].trigger === 1) {
+                        playTotalTime +=  parseInt(playbackrecord[i].intervaltime);
+                    }else if (playbackrecord[i].trigger === 0) {
+                        var timeoutcontroller = null;
+                        var replayinterval = playbackrecord[i].intervaltime;
+
+                        if (!CodingEditer.isPause) {
+                            starttime = replayinterval - (CodingEditer.audioTime - playTotalTime);
+                            CodingEditer.isPause = true;
+                        }else{
+                            // if (i == 0) {
+                            //     starttime = replayinterval;
+                            // }else{
+                            //     starttime = parseInt(starttime) + parseInt(replayinterval);
+                            // }
+                            starttime = parseInt(starttime) + parseInt(replayinterval);
+                        }
  
-            for (var i = 0; i < playbackrecord.length; i++) {
-                if (playbackrecord[i].trigger === 1) {
-                    playTotalTime +=  parseInt(playbackrecord[i].intervaltime);
-                }else if (playbackrecord[i].trigger === 0) {
-                    var timeoutcontroller = null;
-                    var replayinterval = playbackrecord[i].intervaltime;
-
-                    if (!CodingEditer.isPause) {
-                        starttime = replayinterval - (CodingEditer.audioTime - playTotalTime);
-                        CodingEditer.isPause = true;
-                    }else{
-                        // if (i == 0) {
-                        //     starttime = replayinterval;
-                        // }else{
-                        //     starttime = parseInt(starttime) + parseInt(replayinterval);
-                        // }
-                        starttime = parseInt(starttime) + parseInt(replayinterval);
+                        timeoutcontroller = setTimeout(changeValueCallback(playbackrecord[i]), starttime/CodingEditer.speed);
+                        CodingEditer.recordtimeoutcontrolls.push(timeoutcontroller);
                     }
-
-                    timeoutcontroller = setTimeout(changeValueCallback(playbackrecord[i]), starttime/CodingEditer.speed);
-                    CodingEditer.recordtimeoutcontrolls.push(timeoutcontroller);
                 }
             }
+            
             console.log(CodingEditer.recordtimeoutcontrolls)
         },
         pauseCode: function(){
@@ -782,23 +782,9 @@
                 imagePath: '../js/audioPlayer/image',
                 debuggers: false,
                 allowSeek: false,
-                canplayCallback: function(res){
-                    if (res.status == true && playTimes === 0 && !isAndroid) {
-                        CodingEditer.playCoding();
-                        playTimes++
-                        // alert('canplay !isAndroid ----------- ' + playTimes)
-                    }
-                    // alert('canplayCallback可以播放 ----------- ' + playTimes)
-                },
-                onwaitingCallback: function(){
-                    // alert('onwaitingCallback ----------- ' + playTimes)
-                },
-                playCallback: function() { // 播放
-                    if (playTimes != 0) {
-                        CodingEditer.playCoding();
-                        // alert('playCoding可以播放 ----------- ' + playTimes)
-                    }
-                    // alert('playCoding可以播放 ----------- ' + playTimes)
+                playCallback: function(e) { // 播放
+                    console.log('++++++++');
+                    CodingEditer.playCoding(e);
                 },
                 pauseCallback: function() { // 暂停
                     CodingEditer.audioTime = parseInt(player.elements.audioDom.currentTime*1000);
@@ -352,13 +352,20 @@
         // Set the playback / 设置播放
         ,play: function(o) {
             var _this = this;
-            _this.elements.audioDom.play();
-            if (typeof o == 'function') {
-                o({'status': _this.elements.audioDom.play});
-            }
+            var canPlay = _this.elements.audioDom.play();
+            // 处理浏览器无法自动播放语音
+            if (canPlay !== undefined) {
+              canPlay.then(_ => {
+                if (typeof o == 'function') {
+                    o({'status': true});
+                }
  
-            if(typeof _this.options.playCallback == 'function'){
-                _this.options.playCallback({'status': _this.elements.audioDom.play});
+                if(typeof _this.options.playCallback == 'function'){
+                    _this.options.playCallback({'status': true});
+                }
+              }).catch(error => {
+                  _this.options.playCallback({'status': false});
+              });
             }
         }
         // Set the suspend / 设置暂停