冲突解决

src/stage/index/scene/LessonScene.js

@@ -150,7 +150,6 @@ class LessonScene extends scene {
     			}
           /*
     			let videoViewDom =
-<<<<<<< HEAD
                 `
                   <div id="view-full-screen" fe-role="Widget" class="view-full-screen-video">
                   </div>
@@ -158,17 +157,8 @@ class LessonScene extends scene {
                     <div class="transparent-btn">暂停</div>
                   </div>
                 `;
-=======
-            `
-              <div id="view-full-screen" fe-role="Widget" class="view-full-screen-video">
-              </div>
-              <div id="view-video-start" fe-role="Widget">
-                <div class="transparent-btn">播放</div>
-              </div>
-            `;
           */
           let videoViewDom = '';
->>>>>>> dev_winpc_touch
     			document.getElementById('view-bottom').innerHTML = videoViewDom;
     			this.moye.root.reRender();
     			this.renderVideoView(title, playUrl, type);
@@ -193,7 +183,7 @@ class LessonScene extends scene {
     				this.renderImageView();
     			}
     			break;
-            case Consts.TYPE_AUDIOBOOK:
+        case Consts.TYPE_AUDIOBOOK:
     			let audioViewDom =
     			`
     				<div id="view-full-screen" fe-role="Widget" class="view-full-screen-img"></div>
@@ -212,9 +202,9 @@ class LessonScene extends scene {
     				this.curAudioIndex = 0;
     				this.renderAudioView();
     			}
-                break;
-            default:
-                break;
+          break;
+        default:
+          break;
     	}
     }
 
@@ -518,35 +508,11 @@ class LessonScene extends scene {
                         video.webkitEnterFullScreen();
                         // document.getElementById('view-content').removeChild(video);
                     }
-//<<<<<<< HEAD
                     // this.showScene(require('./VideoWareFullScreenScene.js'), {
                     //     isFull: true,
                     //     wareList: this.wareList,
                     //     curWareIndex: this.curWareIndex,
                     // });
-//=======
-                    this.showScene(require('./VideoWareFullScreenScene.js'), {
-                        isFull: true,
-                        wareList: this.wareList,
-                        curWareIndex: this.curWareIndex,
-                    });
-                } else if (this.curWareType === Consts.TYPE_AUDIOBOOK) {
-                    // 全屏前移除audio标签
-                    let audio = document.getElementById('courseware-audio');
-                    let controls = document.querySelector('.audio-controls');
-                    if (audio) {
-                        document.getElementById('view-content').removeChild(audio);
-                    }
-                    if (controls) {
-                        document.getElementById('view-content').removeChild(controls);
-                    }
-                    this.showScene(require('./AudioWareFullScreenScene.js'), {
-            			wareList: this.wareList,
-            			curWareIndex: this.curWareIndex,
-            			curAudioList: this.curAudioList,
-            			curAudioIndex: this.curAudioIndex,
-                    });
-//>>>>>>> d5e875c37ec87209fd4b2af78511367bc689d7f4
                 }
     			this.postPlayRecord(this.cur_item_id, this.courseId);
     			break;