梁美英 / programming · Commits

Commit 0171a1b6f0efe6b1fb27a3fcf2cd2f8ea1fec4bd

Authored by ykxie
1 parent 1286686d

fix bug

Inline Side-by-side
Showing 3 changed files with 47 additions and 45 deletions
package.json
  View file @0171a1b
... ... @@ -18,9 +18,10 @@
18 18 "homepage": "https://github.com/xieyankun/layout#readme",
19 19 "devDependencies": {
20 20 "gulp": "^3.9.1",
21   - "gulp-less": "^3.1.0",
  21 + "gulp-less": "^3.3.0",
  22 + "gulp-notify": "^3.0.0",
22 23 "gulp-sass": "^2.3.2",
23   - "gulp-uglify": "^2.0.0",
  24 + "gulp-uglify": "^2.0.1",
24 25 "gulp-watch": "^4.3.10",
25 26 "pump": "^1.0.1",
26 27 "require-dir": "^0.3.1"
... ...
src/js/gb.js
  View file @0171a1b
... ... @@ -54,7 +54,10 @@ $(function() {
54 54 m = 0,
55 55 l = 0;
56 56 var datalist = arr;
57   - datalist.length = 10;
  57 +
  58 + if(datalist.length > 10){
  59 + datalist.length = 10;
  60 + }
58 61 for (var i = 0; i < datalist.length; i++) {
59 62 var temArr = datalist[i].path.split('/');
60 63 if(temArr[0] != "undefined" && temArr[1] != "undefined"){
... ... @@ -510,11 +513,12 @@ $(function() {
510 513  
511 514 if(document.URL.indexOf('player') >= 0){
512 515 isReplayPage = true;
513   - if (_role == 0) {
514   - playUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
515   - } else if (_role == 1) {
516   - playUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
517   - }
  516 + // if (_role == 0) {
  517 + // playUrl = gxb_api + "/programming/codeReplay/" + _codeReplayId + "/api";
  518 + // } else if (_role == 1) {
  519 + // playUrl = gxb_api + "/programming/student/studentReplay/" + _codeReplayId + "/api";
  520 + // }
  521 + playUrl = "https://restful.gaoxiaobang.com/gxb-web/programming/codeReplay/285526/api"
518 522 $.ajax({
519 523 type: "get",
520 524 url: playUrl,
... ... @@ -962,36 +966,25 @@ $(function() {
962 966 selectLang(langid);
963 967 compileMode(langid);
964 968  
965   - console.log("http://gxb-file.oss-cn-beijing.aliyuncs.com" + playData.audioUrl)
  969 + console.log("https://gxb-file.oss-cn-beijing.aliyuncs.com" + playData.audioUrl)
966 970 player.init({
967 971 container: '#audioWrap',
968   - source: "http://gxb-file.oss-cn-beijing.aliyuncs.com" + playData.audioUrl,
  972 + source: "https://gxb-file.oss-cn-beijing.aliyuncs.com" + playData.audioUrl,
969 973 imagePath: '../js/audioPlayer/image',
970 974 debuggers: false,
971 975 allowSeek: false,
972 976 playCallback: function() { // 播放
973 977 console.log('++++++++');
974 978 playCode();
975   - GBCodePlayBack.editable(1);
976   - // if(flag){
977   - // playCode();
978   - // }
979   -
980   - // $('#play').trigger('click');
981   - // GBCodePlayBack.htmlplayereditor.setOption('readOnly', true);
  979 + GBCodePlayBack.editable(0);
982 980 },
983 981 pauseCallback: function() { // 暂停
984   - // flag = false;
985   - // player.play();
986   - GBCodePlayBack.editable(0);
  982 + GBCodePlayBack.editable(1);
987 983 GBCodePlayBack.audioTime = parseInt(player.elements.audioDom.currentTime*1000)
988 984 GBCodePlayBack.treeSelectNode = treeObj.getSelectedNodes()[0];
989 985 pauseCode();
990 986 GBCodePlayBack.firstPlay = 0;
991 987 GBCodePlayBack.getCodeMirrorValue();
992   -
993   - // GBCodePlayBack.pauseValue = GBCodePlayBack.htmlplayereditor.getValue();
994   - // GBCodePlayBack.htmlplayereditor.setOption('readOnly', false);
995 988 },
996 989 seekedCallback: function() { // 拖拽
997 990  
... ... @@ -1218,7 +1211,7 @@ $(function() {
1218 1211 type: "get",
1219 1212 url: apiUrl,
1220 1213 success: function(coderecords) {
1221   - $("#play_audio").attr('src', "http://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
  1214 + $("#play_audio").attr('src', "https://gxb-file.oss-cn-beijing.aliyuncs.com/" + coderecords.audioUrl);
1222 1215 if (_role == 0) {
1223 1216 var coderecords = coderecords.codeRecordList;
1224 1217 } else if (_role == 1) {
... ... @@ -1942,7 +1935,7 @@ $(function() {
1942 1935 record.trigger = 1; //标记已运行
1943 1936 record.playTime = new Date().getTime(); // 播放开始时间
1944 1937 GBCodePlayBack.codeTimes = 1; //
1945   -
  1938 + console.log(record)
1946 1939 var resultData = {
1947 1940 status: record.status || 200,
1948 1941 compilerInfo: record.compilerInfo || '',
... ...
src/v1.1/index.html
  View file @0171a1b
... ... @@ -73,34 +73,41 @@
73 73 #replayzone.active{
74 74 display: block;
75 75 }
  76 + .editor{
  77 + height: 100%;
  78 + float: left;
  79 + position: relative;
  80 + }
76 81 </style>
77 82 </head>
78 83 <body>
79 84 <div id="app" class="wrapper">
80 85 <div id="appContainer">
81   - <div id="appLeft">
82   - <div class="tree-header">目录</div>
83   - <ul id="folder" class="ztree"></ul>
84   - <div id="handleLM"></div>
85   - </div>
86   - <div id="appMian">
87   - <div id="appMainHeader">
88   - <ul id="recordertab" class="nav nav-tabs pull-left">
89   - <li class="active"><a href="#recordzone" data-toggle="tab"><i class="icon iconfont icon-suspend"></i>课程录制区</a></li>
90   - <li><a href="#replayzone" data-toggle="tab"><i class="icon iconfont icon-yulan"></i>课程预览区</a></li>
91   - </ul>
92   - <div id="editorwrapper" class="pull-right">
93   - <div class="btn-group">
94   - <div id="htmlbutton" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="bottom" data-original-title="当前课程环境：Java" data-editorname="html">JAVA</div>
95   - <div class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="bottom" data-original-title="JDK版本">JDK 7</div>
  86 + <div class="editor">
  87 + <div id="appLeft">
  88 + <div class="tree-header">目录</div>
  89 + <ul id="folder" class="ztree"></ul>
  90 + <div id="handleLM"></div>
  91 + </div>
  92 + <div id="appMian">
  93 + <div id="appMainHeader">
  94 + <ul id="recordertab" class="nav nav-tabs pull-left">
  95 + <li class="active"><a href="#recordzone" data-toggle="tab"><i class="icon iconfont icon-suspend"></i>课程录制区</a></li>
  96 + <li><a href="#replayzone" data-toggle="tab"><i class="icon iconfont icon-yulan"></i>课程预览区</a></li>
  97 + </ul>
  98 + <div id="editorwrapper" class="pull-right">
  99 + <div class="btn-group">
  100 + <div id="htmlbutton" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="bottom" data-original-title="当前课程环境：Java" data-editorname="html">JAVA</div>
  101 + <div class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="bottom" data-original-title="JDK版本">JDK 7</div>
  102 + </div>
96 103 </div>
97 104 </div>
  105 + <div id="textarea">
  106 + <div id="recordzone" class="active"></div>
  107 + <div id="replayzone"></div>
  108 + </div>
  109 + <div id="handleMR"></div>
98 110 </div>
99   - <div id="textarea">
100   - <div id="recordzone" class="active"></div>
101   - <div id="replayzone"></div>
102   - </div>
103   - <div id="handleMR"></div>
104 111 <div class="pause-shodow hidden">
105 112 <div class="compile-loading">
106 113 <img src="../img/loading.png" alt="">
... ... @@ -119,6 +126,7 @@
119 126 </div>
120 127 </div>
121 128 </div>
  129 +
122 130 <div id="appRight">
123 131 <div id="resultpanel" class="panel panel-default editor-result">
124 132 <div class="panel-heading result-header">
... ...