fix finish compile

ykxie
1 parent 798e71cb
Showing 4 changed files with 77 additions and 11 deletions
src/css/recording.css
src/index.html
src/js/gbreplayer.js
src/scss/recording.scss
@@ -346,7 +346,7 @@ button {
   top: 0;
   width: 100%;
   height: 100%;
-  z-index: 888;
+  z-index: 9999;
   background-color: rgba(0, 0, 0, 0.6); }
   #countdown img {
     position: absolute;
@@ -482,7 +482,15 @@ button {
     left: 50%;
     transform: translate(-50%, -50%); }
  
-.compile-reslut {
+.re-tips {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.6);
+  z-index: 999; }
+
+.compile-reslut, .re-reslut {
   position: absolute;
   height: 200px;
   width: 400px;
@@ -490,14 +498,14 @@ button {
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%); }
-  .compile-reslut .tip-header, .compile-reslut .tip-footer {
+  .compile-reslut .tip-header, .compile-reslut .tip-footer, .re-reslut .tip-header, .re-reslut .tip-footer {
     width: 100%;
     padding: 8px 16px;
     background-color: #F5F6FA; }
-  .compile-reslut .tip-content {
+  .compile-reslut .tip-content, .re-reslut .tip-content {
     padding: 40px;
     line-height: 1.7; }
-  .compile-reslut .tip-footer {
+  .compile-reslut .tip-footer, .re-reslut .tip-footer {
     position: absolute;
     bottom: 0;
     text-align: right; }
@@ -154,6 +154,7 @@
     <!-- 录音控制条 -->
     <div class="recording-ctrl-bar">
         <button id="start-recording" class="btn new-recording" type="button" data="1" title="开始录制"></button>
+        <button id="re-recoding" class="btn new-recording" type="button" data="1" title="重新录制" style="display: none;"></button>
         <button class="btn pause-recording hidden" id="pause" data-status='0' title="录制暂停中">
             <img src="img/pause.svg" alt="">
         </button>
@@ -177,11 +178,29 @@
     </div>
  
  
-    <!-- 倒计时 -->
+    <!-- 准备开始 -->
     <div id="countdown" style="display: none;">
         <img src="" alt="">
     </div>
  
+    <!-- 重新开始 -->
+    <div class="re-tips" style="display: none;">
+        <div class="re-reslut">
+            <div class="tip-header">
+                <span>提示</span>
+            </div>
+            <div class="tip-content">
+                <p>你确定要重新录制吗?</p>
+            </div>
+            <div class="tip-footer">
+                <button class="btn btn-success btn-sm" id="re-sure">确定</button>
+                <button class="btn btn-danger btn-sm" id="re-cancel">取消</button>
+            </div>
+        </div>
+    </div>
+    
+
+
  
     <script src="js/recorder/Myna.js"></script>
     <script src="js/recording/recording.js"></script>
@@ -1021,12 +1021,13 @@ $(function(){
 	 			// 暂停录制
 	 			var pauseState = $('#pause').data('pause');
  
+	 			console.log('------------' + pauseState + '----------------');
 	 			if(pauseState == 1 && _role == 0){
 	 				GBCodePlayBack.record_pause_time = new Date().getTime();  // 暂停的时间
  
 	 				Hourglass.pauseTimer();	// 暂停计时器
  
-	 				$('#pause').data('status', '1');
+	 				// $('#pause').data('status', '1');
 	 				$('#pause').removeClass('hidden').addClass('show');
 	 				$('#start-recording').hide();
 	 				recorder.pause();
@@ -1357,6 +1358,7 @@ $(function(){
 			}
  
 			var pausetatus = $('#pause').data('status');
+
 			console.log(pausetatus)
  
 			if(_role == 0 && pausetatus == 1){
@@ -1535,7 +1537,7 @@ $(function(){
  
 	// 开始录制
 	$('#start-recording').click(function(){
-	    $('#pause').data('pause', '1');		// 
+	    	// 编译状态
 	    var data = $(this).attr('data');
 	    var seconds = 0;
 	    $("#countdown").show();
@@ -1545,12 +1547,16 @@ $(function(){
 			    seconds += 1;
 			    if(seconds == 2){
 			    	$("#countdown").hide();
-			    	$("#countdown").find('img').hide()
 			    	startReacoder();
 			    }
 			},1000);
 	    }else{
 	    	$("#countdown").hide();
+	    	$("#re-recoding").show();
+	    	$("#start-recording").hide();
+	    	$("#countdown").find('img').attr('src', '');
+
+	    	console.log()
 	    	stopReacoder();
 	    }
 	})
@@ -1560,9 +1566,32 @@ $(function(){
 	    // recorder.pause();
 	})
  
+	$('#re-recoding').click(function(){
+		$('.re-tips').show();
+	})
+
+	$('#re-sure').click(function(){
+		console.log('sdkddd')
+		initRecoding()
+	})
+
+	$('#re-cancel').click(function(){
+		$(".re-tips").hide();
+	})
  
  
  
+	// 初始化页面
+	function initRecoding(){
+		GBCodePlayBack.recordinit();
+		$(".re-tips").hide();
+		$("#re-recoding").hide();
+		$(".audio-play").removeClass('show').addClass('hidden');
+		$("#start-recording").show();
+		$('.recording-time').html('00:00:00');
+		$('#upload').removeClass('recording-finish').addClass('upload-teach').attr("disabled", true);
+		GBCodePlayBack.htmleditor.setValue('');
+	}
  
 	// 编译结果
 	function compileResult(data){
@@ -1638,6 +1667,7 @@ $(function(){
 			$('.recording-time').addClass('twinkle');
 			Hourglass.init();
 			$('.audio-play').removeClass('show').addClass('hidden');
+			$('#pause').data('pause', '1');	
 	    });
 	}
  
@@ -1650,6 +1680,7 @@ $(function(){
 		$('#upload').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false);
         $('#savecorde').removeClass('upload-teach').addClass('recording-finish').removeAttr('disabled').prop("disabled",false);
         $('.audio-play').removeClass('hidden').addClass('show');
+        $('#pause').data('pause', '0');
         if (_role == 0) {
             recorder.stop();
             $('#upload').show();
@@ -447,7 +447,7 @@ button{
     top: 0;
     width: 100%;
     height: 100%;
-    z-index: 888;
+    z-index: 9999;
     background-color: rgba(0, 0, 0, 0.6);
  
     img{
@@ -630,7 +630,15 @@ button{
     }
 }
 // ti
-.compile-reslut{
+.re-tips{
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.6);
+    z-index: 999;
+}
+.compile-reslut, .re-reslut{
     position: absolute;
     height: 200px;
     width: 400px;