Merge branch 'dev_goback' into dev_winpc_touch

src/res/tpl/CLScene.tpl

@@ -21,4 +21,7 @@
             </div>
         </div>
     </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/CourseScene.tpl

@@ -15,4 +15,7 @@
 		</div>
 	</div>
 	<div class="main" id="course-main"></div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/DataBuildingScene.tpl

@@ -1,3 +1,6 @@
 <div id="DataBuildingScene" fe-role="Switch">
     <img id="building-pic-bg"  src="assets/img/default_bg.jpg" alt="">
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/DownloadScene.tpl

@@ -104,4 +104,7 @@
 			<div class="scroll-list scroll-lines-wrapper clearfix" id="download-status-table-wrapper"></div>
 		</div>
 	</div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/GlobalGoodDetail.tpl

@@ -23,4 +23,7 @@
             </ul>
         </div>
     </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/ImageWareFullScreen.tpl

@@ -1,5 +1,12 @@
 <div id="ImageWareFullScreen" fe-role="Switch">
     <img id="wareImg" src="./assets/img/default_bg.jpg" />
-    <img id="imgLeft" src="./assets/img/LessonScene/arrow_left.png" />
-    <img id="imgRight" src="./assets/img/LessonScene/arrow_right.png" />
+    <div id="imgLeft" fe-role="Widget">
+        <img src="./assets/img/backward.png" />
+    </div>
+    <div id="imgRight" fe-role="Widget">
+        <img src="./assets/img/forward.png" />
+    </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/LessonScene.tpl

@@ -8,4 +8,7 @@
 		<div id="view-content"></div>
 		<div id="view-bottom"></div>
 	</div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/ShopCartScene.tpl

@@ -10,4 +10,7 @@
 		<div class="scroll-list" id="shop-cart-wrapper"></div>
 	</div>
 	<div fe-role="Widget" class="send-msg" id="send-msg"></div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/TerminalScene.tpl

@@ -4,4 +4,7 @@
 	</div>
 	<ul fe-role="Switch" class="terminal-wrapper clearfix" id="terminal-wrapper"></ul>
 	<div class="terminal-quit" id="terminal-quit" fe-role="Widget" fe-cfg="default_focus:yes"></div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/stage/index/index.html

@@ -65,7 +65,7 @@
 		document.head.appendChild(appCss);
 
 		var appScript = document.createElement('script');
-		appScript.src = './index.min.js?t=' + ts;
+		appScript.src = './index.js?t=' + ts;
 		document.body.appendChild(appScript);
 	</script>
 	<script>

src/stage/index/scene/CLScene.js

@@ -238,6 +238,12 @@ class CLScene extends scene {
     // 在使用Atv时Id对应：e.target.id
     // 非使用Atv是Id对应：e.target.id
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+
         // 进入购物车场景
         if (e.target.con.classList.contains('shopping-cart-btn-frame')) {
             this.showScene(require('./ShopCartScene.js'), {});

src/stage/index/scene/CourseScene.js

@@ -346,6 +346,12 @@ class CourseScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		// 点击某一课
 		if (e.target.con.classList.contains('img-wrapper') || e.target.con.classList.contains('text-wrapper')) {
 			// 课件模版 COURSE_WARE_VIDEO（课视频模版）  COURSE_WARE_LIST（课列表）

src/stage/index/scene/DataBuildingScene.js

@@ -27,8 +27,11 @@ class DataBuildingScene extends scene {
 
     }
 
-    onOk() {
-
+    onOK(e) {
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
     }
 
     onActive() {

src/stage/index/scene/DownloadManagerScene.js

@@ -181,6 +181,11 @@ class DownloadManagerScene extends scene {
     }
 
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
         if(e.target.con.classList.contains('download-del-btn')){
             let lessonID = e.target.con.dataset.id;
             let title = this.lessonItems[lessonID].lessonName;

src/stage/index/scene/GlobalGoodDetailScene.js

@@ -156,6 +156,12 @@ class GlobalGoodDetailScene extends scene {
     // 在使用Atv时Id对应：e.target.id
     // 非使用Atv是Id对应：e.target.id
     onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+        
         if (e.target.con.classList.contains('item')) {
             let targetId = e.target.id.split('-')[2];
             // targetId = 6;

src/stage/index/scene/ImageWareFullScreenScene.js

@@ -112,8 +112,21 @@ class ImageWareFullScreenScene extends scene {
 
 	}
 
-	onOK() {
-
+	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+			this.hideScene({
+				curWareIndex: this.curWareIndex,
+				curImageList: this.curImageList,
+				curImageIndex: this.curImageIndex,
+			}, 'LessonScene');
+            return;
+        }
+		if (e.target.id === 'imgLeft') {
+			this.keyLeftHandler();
+		} else if (e.target.id === 'imgRight') {
+			this.keyRightHandler();
+		}
 	}
 
 	onBack() {

src/stage/index/scene/LessonScene.js

@@ -334,7 +334,12 @@ class LessonScene extends scene {
         this.isBack = true;
     }
 
-    onOK() {
+    onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({id: this.courseId}, 'CourseScene');
+            return;
+        }
     	const leaf = FocusEngine.getFocusedLeaf();
     	switch (leaf.id) {
     		case 'view-video-start':
@@ -361,13 +366,14 @@ class LessonScene extends scene {
                 } else if (this.curWareType === Consts.TYPE_VIDEO) {
                     let video = document.getElementById('hls-video');
                     if (video) {
-                        document.getElementById('view-content').removeChild(video);
+                        video.webkitEnterFullScreen();
+                        // document.getElementById('view-content').removeChild(video);
                     }
-                    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,
+                    // });
                 }
     			this.postPlayRecord(this.cur_item_id, this.courseId);
     			break;

src/stage/index/scene/ShopCartScene.js

@@ -163,6 +163,12 @@ class ShopCartScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		if (e.target.con.id == 'send-msg' && this.goodsArr.length) {
 			this.showScene(require('./ShopCartCheckScene.js'), { id: 0 });
 		} else if (e.target.con.classList.contains('del')) {

src/stage/index/scene/TerminalScene.js

@@ -60,6 +60,12 @@ class TerminalScene extends scene {
 	// 在使用Atv时Id对应：e.target.id
 	// 非使用Atv是Id对应：e.target.id
 	onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+            this.hideScene({});
+            return;
+        }
+		
 		if (e.target.con.classList.contains('terminal-quit')) {
 			APIClient.userLogoutAndUnbindDevice((isTrue, res) => {
 				if (!isTrue) { return; }

src/stage/index/scene/VideoWareFullScreenScene.js

@@ -104,8 +104,14 @@ class VideoWareFullScreenScene extends scene {
             window.efunbox.fullScreen();
             this.videoPlayer = window.efunbox;
         } else {
-    		const videoDom = `<video id="hls-full-video" controls>你的浏览器不支持视频播放</video>`;
+    		const videoDom = `
+                <video id="hls-full-video" controls>你的浏览器不支持视频播放</video>
+            	<div class="goback" fe-role="Widget">
+            		<img src="assets/img/goback.png" />
+            	</div>
+            `;
     		document.getElementById('VideoWareFullScreen').innerHTML = videoDom;
+            this.moye.root.reRender();
     		this.videoPlayer = new HlsVideoPlugin();
     		this.videoPlayer.initH5Player(playUrl, 'hls-full-video');
         }
@@ -145,7 +151,16 @@ class VideoWareFullScreenScene extends scene {
 
     }
 
-    onOK() {
+    onOK(e) {
+        // 后退
+        if (e.target.con.classList.contains('goback')) {
+			this.hideScene({
+				curWareIndex: this.curWareIndex,
+				curImageList: this.curImageList,
+				curImageIndex: this.curImageIndex,
+			}, 'LessonScene');
+            return;
+        }
         if (this.videoPlayer.playStatus()) {
             this.videoPlayer.pause();
         } else {

src/stage/index/style/ImageWareFullScreen.less

@@ -10,16 +10,36 @@
 	background-repeat: no-repeat;
 }
 #imgLeft {
-  position: absolute;
-  top: 5rem;
-  left: 0.5rem;
-  display: none;
-  z-index: 2;
+	position: absolute;
+	top: 5rem;
+	left: 0.15rem;
+	width: .77rem;
+	height: .78rem;
+	z-index: 2;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
 }
 #imgRight {
-  position: absolute;
-  top: 5rem;
-  right: 0.5rem;
-  display: none;
-  z-index: 2;
+	position: absolute;
+	top: 5rem;
+	right: 0.15rem;
+	z-index: 2;
+	width: .87rem;
+	height: .88rem;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
 }

src/stage/index/style/LessonScene.less

@@ -24,7 +24,7 @@
 
 	#list {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 0.7rem;
 		width: 7.2rem;
 		height: 8.15rem;
@@ -94,7 +94,7 @@
 
 	#view {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 7.9rem;
 		width: 10.72rem;
 		height: 8.15rem;

src/stage/index/style/Mixins.less

@@ -29,3 +29,21 @@
 	box-shadow: .03rem .03rem unit(@boxShadowSize, rem) @boxShadowColor;
 	z-index: 9999;
 }
+
+.goback {
+	z-index: 99999;
+	position: absolute;
+	width: .93rem;
+	height: .94rem;
+	bottom: .1rem;
+	right: .15rem;
+	border: solid unit(@borderSize, rem) transparent;
+	border-radius: 50%;
+	img {
+		width: 100%;
+		height: 100%;
+	}
+	&.fe-focus {
+		border: solid unit(@borderSize, rem) #ffe100;
+	}
+}

src/util/API/AJAXHelper.js

@@ -64,6 +64,7 @@ class AJAXHelper {
 		xmlHttpReq.setRequestHeader('merchant', 'baby');
 		xmlHttpReq.setRequestHeader('terminal', platform);
 		xmlHttpReq.setRequestHeader('requestId', requestId);
+		xmlHttpReq.setRequestHeader('merchant', 'baby');
 		xmlHttpReq.setRequestHeader('Authentication', sign); //header中增加Authentication以兼容老版本
 		xmlHttpReq.setRequestHeader('Content-Type', 'application/' + (method == 'POST' || method == 'PUT' ? 'json' : 'text'));
 		//构造请求体