梁美英 / programming · Commits

Commit bfd4b8799ad6cdc0222c5a5d6d10d782072b58a3

Authored by ykxie
1 parent 72678f67

stash

Inline Side-by-side
Showing 2 changed files with 8 additions and 48 deletions
src/js/gbreplayer.js
  View file @bfd4b87
@@ -31,7 +31,7 @@ $(function(){ @@ -31,7 +31,7 @@ $(function(){
31 replay_enhancement:1, //是否优化播放，即匀速播放 31 replay_enhancement:1, //是否优化播放，即匀速播放
32 replay_enhancement_value: 250, 32 replay_enhancement_value: 250,
33 speed: 1, 33 speed: 1,
34 - playstatus: 0, 34 + playstatu: 0,
35 recordtimeoutcontrolls: [], 35 recordtimeoutcontrolls: [],
36 excercise_recordtimeoutcontrolls: [], 36 excercise_recordtimeoutcontrolls: [],
37 isgblibreplay: 0, 37 isgblibreplay: 0,
@@ -387,12 +387,12 @@ $(function(){ @@ -387,12 +387,12 @@ $(function(){
387 ,playCallback: function(){ 387 ,playCallback: function(){
388 // playCoder(); 388 // playCoder();
389 $('#play').trigger('click'); 389 $('#play').trigger('click');
390 - GBCodePlayBack.playstatus = 0; 390 + GBCodePlayBack.playstatu = 0;
391 } 391 }
392 ,pauseCallback: function(){ 392 ,pauseCallback: function(){
393 // playCoder(); 393 // playCoder();
394 $('#play').trigger('click'); 394 $('#play').trigger('click');
395 - GBCodePlayBack.playstatus = 0; 395 + GBCodePlayBack.playstatu = 0;
396 } 396 }
397 ,seekedCallback: function(){} 397 ,seekedCallback: function(){}
398 ,endedCallback: function(){ 398 ,endedCallback: function(){
@@ -449,11 +449,11 @@ $(function(){ @@ -449,11 +449,11 @@ $(function(){
449 $('#play').find('i').removeClass('icon-play').addClass('icon-playcopy').attr('data-original-title', '暂停'); 449 $('#play').find('i').removeClass('icon-play').addClass('icon-playcopy').attr('data-original-title', '暂停');
450 } 450 }
451 } 451 }
452 -  
453 - if(GBCodePlayBack.playstatus = 1){ 452 + console.log(GBCodePlayBack.playstatu);
  453 + if(GBCodePlayBack.playstatu = 1){
454 GBCodePlayBack.htmlplayereditor.setValue(''); 454 GBCodePlayBack.htmlplayereditor.setValue('');
455 } 455 }
456 - 456 + console.log(GBCodePlayBack.playstatu);
457 if(!playstatus){ 457 if(!playstatus){
458 var playbackrecord = GBCodePlayBack.records, 458 var playbackrecord = GBCodePlayBack.records,
459 currenteditor = ''; 459 currenteditor = '';
@@ -1972,7 +1972,7 @@ $(function(){ @@ -1972,7 +1972,7 @@ $(function(){
1972 1972
1973 GBCodePlayBack.triggertotal = 0; 1973 GBCodePlayBack.triggertotal = 0;
1974 1974
1975 - GBCodePlayBack.playstatus = 1; 1975 + GBCodePlayBack.playstatu = 1;
1976 1976
1977 /* 初始化播放 */ 1977 /* 初始化播放 */
1978 for (var i = 0; i < GBCodePlayBack.records.length; i++) { 1978 for (var i = 0; i < GBCodePlayBack.records.length; i++) {
src/player.html
  View file @bfd4b87
@@ -141,52 +141,12 @@ @@ -141,52 +141,12 @@
141 <button id="play" class="hidden" data-status='0' title="暂停"> 141 <button id="play" class="hidden" data-status='0' title="暂停">
142 <i class="icon iconfont icon-playcopy"></i> 142 <i class="icon iconfont icon-playcopy"></i>
143 </button> 143 </button>
144 -<!-- <div class="play-bar">  
145 - <button id="playrecord" data-status='0' title="播放">  
146 - <i class="icon iconfont icon-play"></i>  
147 - </button>  
148 - <button id="play" class="" style="display: none;" data-status='0' title="暂停">  
149 - <i class="icon iconfont icon-playcopy"></i>  
150 - </button>  
151 - <div class="f1 audio-wrap" style="line-height: 48px;">  
152 - <audio id="play_audio" controls></audio>  
153 - <div class="audio-disable"></div>  
154 - <div class="shadow"></div>  
155 - </div>  
156 -  
157 - </div> --> 144 +
158 </div> 145 </div>
159 146
160 147
161 <script type="text/javascript" src="js/audioPlayer/jQuery.AudioPlayer.js"></script> 148 <script type="text/javascript" src="js/audioPlayer/jQuery.AudioPlayer.js"></script>
162 149
163 -<script>  
164 -  
165 -  
166 - // var play_audio = $('#play_audio');  
167 - // var _role = getQuery('role');  
168 - // var _chapterId = getQuery('chapterId');  
169 - // var _userId = getQuery('userId');  
170 -  
171 - // // 结束播放事件  
172 - // play_audio.addEventListener("ended", function() {  
173 - // $('#play').hide();  
174 - // $('#playrecord').show();  
175 -  
176 - // if (_role == 0) {  
177 - // $.ajax({  
178 - // type: "PUT",  
179 - // url: gxb_api + "/programming/learn/chapter/" + _chapterId + "/user/" + _userId,  
180 - // success: function(data){  
181 - // },  
182 - // error: function(){  
183 - // console.log('')  
184 - // }  
185 - // });  
186 - // }  
187 -  
188 - // }, false);  
189 -</script>  
190 150
191 </body> 151 </body>
192 </html> 152 </html>