fix bug

ykxie
1 parent f1455930
Showing 9 changed files with 47 additions and 27 deletions
example/disable.html
src/css/ide.css
src/css/main.css
src/gxb-ide/CodingEditer.js
src/gxb-ide/Iterm.js
src/gxb-ide/ToolBox.js
src/scss/main.scss
src/v1.1/index.html
src/v1.1/player.html
@@ -178,15 +178,16 @@ html, body {
   .record-toolbox #resultoutput {
     height: 164px;
     overflow-y: scroll; }
-  .record-toolbox #CompileBtn {
-    background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
-    background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
-    -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
-    transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+  .record-toolbox .btn {
     border: none;
     color: #fff;
     padding-top: 5px;
     padding-bottom: 5px; }
+  .record-toolbox .compile-btn {
+    background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
+    background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
+    -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+    transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; }
   .record-toolbox .record-ctrl {
     height: 60px;
     width: 100%;
@@ -100,15 +100,16 @@ html, body {
   .record-toolbox #resultoutput {
     height: 164px;
     overflow-y: scroll; }
-  .record-toolbox #CompileBtn {
-    background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
-    background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
-    -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
-    transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+  .record-toolbox .btn {
     border: none;
     color: #fff;
     padding-top: 5px;
     padding-bottom: 5px; }
+  .record-toolbox .compile-btn {
+    background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
+    background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
+    -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+    transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important; }
   .record-toolbox .record-ctrl {
     height: 60px;
     width: 100%;
@@ -451,16 +451,11 @@
             if (CodingEditer.triggertotal === CodingEditer.records.length && !replay_type) {
                 CodingEditer.editable(0);
                 CodingEditer.flag = true
-                if (CodingEditer.isRecordPage) {
-                    $('#recordertab a:first').tab('show');
-                }
                 for (var i = 0; i < CodingEditer.records.length; i++) {
                     CodingEditer.records[i].trigger = 0;
                 }
-                Hourglass.stopTimer();
-
                 CodingEditer.triggertotal = 0;
             }
@@ -4,6 +4,8 @@
         this.initIterm.apply(this, arguments);
     } 
+    var isCompile = false;
+
     Iterm.prototype = {
         constructor: Iterm,
         compileStatus: true,
@@ -34,11 +36,16 @@
             // var languageId = _this.options.languageId;
             var languageId = _this.options.languageId || Dir.languageid;
             var role = getQuery('role');
+
+            
+
             // 判断是否录制走不同的逻辑
             if (!CodingEditer.isRcording) {
                 compileMode(el, userId, languageId)
             }else{
-                if (_this.compileStatus) {
+                
+                if (_this.compileStatus && !_this.isCompile) {
+                    $('#CompileBtn').removeClass('compile-btn');
                     Hourglass.pauseTimer();     // 暂停计时器
                     if (role == 0) {
                        recorder.pause();        // 音频暂停 
@@ -53,10 +60,13 @@
                     CodingEditer.addRecord(treeNode, check_tree_time);
                     _this.compileStatus = false;
+                    isCompile = true;
+
+                    compileMode(el, userId, languageId)
+                    $('.contrl-shodow').show();
                 }
                 console.log('******************************' + languageId)
-                compileMode(el, userId, languageId)
-                $('.contrl-shodow').show();
+                
             }
         },
         compileResult: function(data, value){
@@ -121,6 +131,9 @@
             recorder.pause();
         }
         CodingEditer.record_startime = new Date().getTime();
+
+        $('#CompileBtn').addClass('compile-btn');
+        isCompile = false;
     } 
     // 编译
@@ -173,6 +173,14 @@
                 $('#audio')[0].play();
                 Hourglass.init()
                 CodingEditer.playCoding()
+                $('#audio')[0].addEventListener('ended', function () {  
+                    console.log('over');
+                    if (CodingEditer.isRecordPage) {
+                        $('#recordertab a:first').tab('show');
+                    }
+                    Hourglass.stopTimer();
+
+                }, false);
             }else{
                 console.log('播放代码=-------------------------');
                 return false;
@@ -135,17 +135,19 @@ html, body{
         height: 164px;
         overflow-y: scroll;
     }
-
-    #CompileBtn{
-        background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
-        background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
-        -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
-        transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+    
+    .btn{
         border: none;
         color: #fff;
         padding-top: 5px;
         padding-bottom: 5px;
     }
+    .compile-btn{
+        background-image: -webkit-linear-gradient(left, #1FB6FF 0%, #62DCF5 100%);
+        background-image: linear-gradient(to right, #1FB6FF 0%, #62DCF5 100%);
+        -webkit-transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+        transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275) all !important;
+    }
     .record-ctrl{
         height: 60px;
@@ -102,9 +102,9 @@
                         <li><a href="#output" role="tab" data-toggle="tab" class="text">结果</a></li>
                     </ul>
                     <div class="pull-right func">
-                        <a class="btn btn-success" id="CompileBtn">
+                        <button class="btn compile-btn" id="CompileBtn">
                             <span class="ladda-label">编译运行</span>
-                        </a>
+                        </button>
                         <a id="full-screen" class=""><i class="icon iconfont icon-quanping1"></i></a>
                         <a id="back-screen" class="" style="display: none;"><i class="icon iconfont icon-quanping1"></i></a>
                     </div>
@@ -104,7 +104,7 @@
                         <li><a href="#output" role="tab" data-toggle="tab" class="text">结果</a></li>
                     </ul>
                     <div class="pull-right func">
-                        <a class="btn btn-success" id="CompileBtn">
+                        <a class="btn btn-success compile-btn" id="CompileBtn">
                             <span class="ladda-label">编译运行</span>
                         </a>
                         <a id="full-screen" class=""><i class="icon iconfont icon-quanping1"></i></a>