贝尔安亲windows客户端专用版本

src/lib/js/FocusEngine.js

@@ -52,7 +52,7 @@
 
 	// webpack入口，用于打包标签引用的build文件，引入页面后会创建全局的FocusEngine对象。
 
-	
+
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -68,7 +68,7 @@
 /* 1 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -326,7 +326,7 @@
 /* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -690,14 +690,21 @@
 	              e.preventDefault();
 	            }
 	            if (!w.disabled && w.getDOMNode().style.visibility != 'hidden') {
-	              if (w.focused) {
-	                w.fire(new _event2['default']('ok', w, { isClick: true }));
-	              } else {
-	                var canFocus = w.getDOMNode().getAttribute('can-focus');
-	                if (canFocus != 'no') {
-	                  w.focus();
-	                }
-	              }
+                var canFocus = w.getDOMNode().getAttribute('can-focus');
+                if (canFocus != 'no') {
+                  w.focus();
+                }
+								setTimeout(function() {
+	              	w.fire(new _event2['default']('ok', w, { isClick: true }));
+								}, 50);
+	              // if (w.focused) {
+	              //   w.fire(new _event2['default']('ok', w, { isClick: true }));
+	              // } else {
+	              //   var canFocus = w.getDOMNode().getAttribute('can-focus');
+	              //   if (canFocus != 'no') {
+	              //     w.focus();
+	              //   }
+	              // }
 	            }
 	            return;
 	            // 如果找到的第一个组件不是叶子组件，则不进行操作
@@ -1265,7 +1272,7 @@
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -1535,7 +1542,7 @@
 /* 5 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -2019,7 +2026,7 @@
 /***/ function(module, exports, __webpack_require__) {
 
 	// requestAnimationFrame shim for Blitz
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -2248,7 +2255,7 @@
 	 */
 
 	// These values are established by empiricism with tests (tradeoff: performance VS precision)
-	
+
 
 	var NEWTON_ITERATIONS = 4;
 	var NEWTON_MIN_SLOPE = 0.001;
@@ -2364,7 +2371,7 @@
 /* 8 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -3390,7 +3397,7 @@
 /* 9 */
 /***/ function(module, exports, __webpack_require__) {
 
-	
+
 
 	Object.defineProperty(exports, '__esModule', {
 	  value: true
@@ -3641,11 +3648,11 @@
 	    }
 	    if (this.isSetData) {
 	      this.listDom.style.transition = '';
-	      this.listDom.style.transform = 'translateY(' + (offset + this.rect.height) + 'px)';
+	      // this.listDom.style.transform = 'translateY(' + (offset + this.rect.height) + 'px)';
 	      this.offset = offset + this.rect.height;
 	      setTimeout(function () {
 	        _this4.listDom.style.transition = 'transform ' + _this4.duration + 's ' + _this4.easing;
-	        _this4.listDom.style.transform = 'translateY(' + offset + 'px)';
+	        // _this4.listDom.style.transform = 'translateY(' + offset + 'px)';
 	        var des = -_this4.rect.height / 3;
 	        _this4.offset = offset;
 	        !_this4.isScrolling && _this4.fire(new _event2['default']('scrollstart', _this4, { des: des }));
@@ -3653,7 +3660,7 @@
 	      }, 300);
 	    } else {
 	      this.listDom.style.transition = 'transform ' + this.duration + 's ' + this.easing;
-	      this.listDom.style.transform = 'translateY(' + offset + 'px)';
+	      // this.listDom.style.transform = 'translateY(' + offset + 'px)';
 	      var des = offset - this.offset;
 	      this.offset = offset;
 	      !this.isScrolling && this.fire(new _event2['default']('scrollstart', this, { des: des }));
@@ -3707,7 +3714,7 @@
 	    for (var i = 0; i < this.childWidgets.length; i++) {
 	      var widget = this.childWidgets[i];
 	      var delay = -Math.abs(widget.col - curWidget.col) * e.des * this.delay;
-	      widget.con.style.transform = 'translateY(' + delay + 'px)';
+	      // widget.con.style.transform = 'translateY(' + delay + 'px)';
 	    }
 	  };
 
@@ -3760,4 +3767,4 @@
 	module.exports = exports['default'];
 
 /***/ }
-/******/ ]);
+/******/ ]);

src/lib/js/ckplayer/language.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+	<language>
+		<adCountdown>[$second]</adCountdown><!--广告播放结束倒计时-->
+		<skipDelay>[$second]</skipDelay>
+		<buttonOver>
+			<play>点击播放</play>
+			<pause>暂停播放</pause>
+			<mute>静音</mute>
+			<escMute>恢复音量</escMute>
+			<full>全屏</full>
+			<escFull>退出全屏</escFull>
+			<previousPage>上一集</previousPage>
+			<nextPage>下一集</nextPage>
+			<definition>点击选择清晰度</definition>
+		</buttonOver>
+		<volumeSliderOver>
+			音量：[$volume]%
+		</volumeSliderOver>
+		<buffer>[$percentage]%</buffer>
+		<timeSliderOver><!--鼠标经过进度条显示的时间格式-->
+			[$timeh]:[$timei]:[$times]
+		</timeSliderOver>
+		<liveAndVod>
+			[$timeh]:[$timei]:[$times]
+		</liveAndVod>
+		<live>
+			直播中 [$liveTimeY]-[$liveTimem]-[$liveTimed] [$liveTimeh]:[$liveTimei]:[$liveTimes]
+		</live>
+		<m3u8Definition>
+			<name>流畅</name>
+			<name>低清</name>
+			<name>标清</name>
+			<name>高清</name>
+			<name>超清</name>
+			<name>蓝光</name>
+			<name>未知</name>
+		</m3u8Definition>
+		<error>
+			<cannotFindUrl>视频地址不存在</cannotFindUrl>
+			<streamNotFound>加载失败</streamNotFound>
+			<formatError>视频格式错误</formatError>
+		</error>
+		<definition>自动</definition>
+	</language>

src/res/tpl/CLScene.tpl

@@ -1,5 +1,5 @@
 <div id="CLScene" fe-role="Switch">
-	<div class="cl-bg"><img id="CLSceneBG" src="assets/img/CLScene/background.jpg" alt=""></div>
+
     <div id="cl-left-panel">
         <div id="name-text"></div>
         <div id="cl-left-tab-scroll" fe-role="Scroll" fe-cfg="scroll_dir:v">
@@ -16,4 +16,7 @@
             </div>
         </div>
     </div>
+	<div class="goback" fe-role="Widget">
+		<img src="assets/img/goback.png" />
+	</div>
 </div>

src/res/tpl/CourseList.tpl

@@ -0,0 +1,17 @@
+<div id="CourseList" fe-role="Switch">
+    <!--左侧标签栏-->
+    <div id="cl-left-panel">
+        <div class="title">导学</div>
+        <div id="tag-type-list" class="tag-type-list" fe-role="Scroll">
+            <ul class="scroll-list">
+                <li class="class-item" fe-role="Widget">测试标签1</li>
+                <li class="class-item" fe-role="Widget">测试标签2</li>
+                <li class="class-item" fe-role="Widget">测试标签3</li>
+            </ul>
+        </div>
+    </div>
+    <!--右侧课表展示栏-->
+    <div id="cl-right-panel" fe-role="Grille" fe-cfg="bottom_padding:50">
+
+    </div>
+</div>

src/res/tpl/CourseScene.tpl

@@ -13,4 +13,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/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/LoginScene.tpl

@@ -1,5 +1,8 @@
 <div id="LoginScene" fe-role="Switch">
+
+	<!--左侧的输入栏目-->
 	<div class="formBox" fe-role="Switch">
+
 		<div class="form-sid">
 			<div class="form-sid-label">
 				学&nbsp;&nbsp;号
@@ -8,6 +11,7 @@
 				<input id="sid-input" class="form-item" name="sid" type="text" readonly fe-role="Widget"/>
 			</div>
 		</div>
+
 		<div class="form-password">
 			<div class="form-password-label">
 				密&nbsp;&nbsp;码
@@ -16,10 +20,13 @@
 				<input id="password-input" class="form-item" name="password" type="text" readonly fe-role="Widget"/>
 			</div>
 		</div>
+
 		<div class="form-submit">
 			<input class="form-item" type="submit" id="submit-input" value="登  录" fe-role="Widget"/>
 		</div>
 	</div>
+
+	<!--右侧的键盘输入-->
 	<div class="keyborad" fe-role="Switch">
 		<div id="key-1" class="keyborad-item" fe-role="Widget">
 			<div class="key-icon one"></div>
@@ -58,4 +65,5 @@
 			<div class="key-icon enter"></div>
 		</div>
 	</div>
+
 </div>

src/res/tpl/ShopCartScene.tpl

@@ -1,13 +1,16 @@
 <div id="ShopCartScene" fe-role="Switch">
-	<div class="cart-bg"><img id="cart-bg" src="assets/img/ShopCartScene/shop_cart_bg.jpg" alt=""></div>
+
+
 	<p class="cart-name" fe-role="Widget" id="cart-name">购物车</p>
+
 	<div id="cart-empty" class="cart-empty">
 		<p class="empty-text">还没有添加商品</p>
-		<div class="back-icon">
-		<img src="assets/img/ShopCartScene/backText.png" alt=""></div>
 	</div>
 	<div class="shop-cart-wrapper clearfix" fe-role="Scroll" fe-cfg="scroll_dir:h, auto_list_width:yes, scroll_right_padding: 3rem">
 		<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/stage/index/index.html

@@ -3,7 +3,7 @@
 
 <head>
 	<meta charset="UTF-8">
-	<meta name="viewport" content="width=1920">
+	<meta name="viewport" content="width=1920,user-scalable=0">
 	<title>双师教学标准平台</title>
 	<link rel="stylesheet" href="../../lib/css/base.css" />
 </head>
@@ -19,7 +19,7 @@
 		    var user_webset_font = getComputedStyle(doc.documentElement, false)['fontSize'];
 		  }
 			//取整后与默认16px的比例系数
-		  var xs = parseFloat(user_webset_font) / 16;
+		  // var xs = parseFloat(user_webset_font) / 16;
 			var docEl = doc.documentElement, //根元素html
 			//判断窗口有没有orientationchange这个方法，有就赋值给一个变量，没有就返回resize方法。
 			resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
@@ -27,7 +27,7 @@
 				var clientWidth = docEl.clientWidth;
 				if (!clientWidth) return;
 				if (clientWidth < 1920) {
-					docEl.style.fontSize = 100 * (clientWidth / 1920) / xs + 'px';
+					docEl.style.fontSize = 100 * (clientWidth / 1920) + 'px';
 				} else {
 					docEl.style.fontSize = 100 + 'px';
 				}
@@ -48,15 +48,16 @@
 		}
 	</script>
 	<!-- <script src="../../lib/js/alitv-debug.min.js"></script> -->
-	<script src="../../lib/js/FocusEngine.min.js"></script>
+	<script src="../../lib/js/FocusEngine.js"></script>
 	<script src="../../lib/js/blitz.js"></script>
 	<script src="../../lib/js/moye.min.js"></script>
 	<script src="../../lib/js/TVUtil.min.js"></script>
 	<script src="../../lib/js/core.min.js"></script>
 	<script src="../../lib/js/sha1.min.js"></script>
 	<script src="../../lib/js/md5.min.js"></script>
-	<script src="../../lib/js/hls.js"></script>
 	<script src="../../lib/js/swiper.min.js"></script>
+	<script src="../../lib/js/ckplayer/hls.min.js"></script>
+	<script src="../../lib/js/ckplayer/ckplayer.js"></script>
 	<script>
 		var ts = '201807071350';
 
@@ -86,5 +87,4 @@
 		}
 	</script>
 </body>
-
 </html>

src/stage/index/index.less

@@ -2,6 +2,8 @@
 
 @borderSize: 0.05;
 @borderRadius: 0.2;
+@designWidth: 19.2;
+@designHeight: 10.8;
 
 body {
     width: 100%;

src/stage/index/scene/CLScene.js

@@ -185,6 +185,7 @@ class CLScene extends scene {
       });
     }
 
+    //当前无意义
     loadPeripheryList(tagId, index) {
       APIClient.getProductListByTagId(tagId, index, (isTrue, res) => {
         if (!isTrue) { return; }
@@ -216,7 +217,6 @@ class CLScene extends scene {
             training: 'TRAINING',
             guidance: 'GUIDANCE',
         }[this.sceneType] || 'RESOURCE';
-
         APIClient.getTagListByGroupCode(type, (isTrue, res) => {
             if (!isTrue) { return; }
             if (!res.success) {
@@ -226,7 +226,11 @@ class CLScene extends scene {
             }
 
             // 设置顶部名称
-            document.getElementById('name-text').textContent = res.data.name || '未知';
+            let sceneName = res.data.name || '';
+            if (this.sceneType === 'collection') {
+              sceneName = '课程收藏';
+            }
+            document.getElementById('name-text').textContent = sceneName;
 
             // 渲染标签列表
             if (!res.data || !res.data.list || res.data.list.length < 1) {
@@ -249,7 +253,7 @@ class CLScene extends scene {
             }
         });
     }
-
+    //收藏
     collectionObserver() {
         if (this.sceneType == 'collection') {
             this.loadCourseList(this.selectedTagId, 1);
@@ -258,7 +262,6 @@ class CLScene extends scene {
 
     onCreate(data) {
         this.setContentView(require('../../../res/tpl/CLScene.tpl'), {}, 'CLScene', {}, () => {
-            // 页面渲染完成异步回调
             this.sceneType = data.type;
             this.loadTagList();
             this.initLeftTabOnFocus();

src/stage/index/scene/CourseScene.js

@@ -364,6 +364,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/GlobalGoodDetailScene.js

@@ -125,6 +125,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];
             this.loadGood(targetId);

src/stage/index/scene/ImageWareFullScreenScene.js

@@ -49,46 +49,66 @@ class ImageWareFullScreenScene extends scene {
 		const hasNextWare = this.curWareIndex < this.wareList.length - 1 ? true : false;
 		//当前图片是该图片课件最后一张图片，且后边还有课件则切换课件
 		if (this.curImageIndex === this.curImageList.length - 1 && hasNextWare) {
-			const nextWareIndex = this.curWareIndex + 1;
-			this.dynamicChangeWare(nextWareIndex, 'NEXT')
+			// const nextWareIndex = this.curWareIndex + 1;
+			// this.dynamicChangeWare(nextWareIndex, 'NEXT')
+			return;
 		//当前图片是该图片课件最后一张图片，且后边没有课件，给出提示
 		} else if (this.curImageIndex === this.curImageList.length - 1 && !hasNextWare) {
-			TVUtil.Toast.show('已经是最后一个课件了', 2000);
+			// TVUtil.Toast.show('已经是最后一个课件了', 2000);
+			return;
 		//当前图片不是该图片课件的最后一张图片
-    	} else {
+  	} else {
 			this.curImageIndex += 1;
 			this.renderImageView();
-    	}
+			if (this.curImageIndex === this.curImageList.length - 1) {
+				document.getElementById('imgRight').style.display = 'none';
+			}
+			if (this.curImageIndex === 1) {
+				document.getElementById('imgLeft').style.display = 'block';
+			}
+  	}
 	}
 
 	keyLeftHandler() {
 		const hasPreviousWare = this.curWareIndex === 0 ? false : true;
 		//当前图片是该图片课件的第一张图片，且前边还有课件
-	    if (this.curImageIndex == 0 && hasPreviousWare) {
-			const previousWareIndex = this.curWareIndex - 1;
-			this.dynamicChangeWare(previousWareIndex, 'BACK');
+	  if (this.curImageIndex == 0 && hasPreviousWare) {
+			// const previousWareIndex = this.curWareIndex - 1;
+			// this.dynamicChangeWare(previousWareIndex, 'BACK');
+			return;
 		//当前图片是该图片课件的第一张图片，且前边没有课件，则给出提示
 		} else if (this.curImageIndex === 0 && !hasPreviousWare) {
-			TVUtil.Toast.show('已经是第一个课件了', 2000);
+			// TVUtil.Toast.show('已经是第一个课件了', 2000);
+			return;
 		//当前图片不是该图片课件的第一张图片
 		} else {
 			this.curImageIndex -= 1;
 			this.renderImageView();
+			if (this.curImageIndex === 0) {
+				document.getElementById('imgLeft').style.display = 'none';
+			}
+			if (this.curImageIndex === this.curImageList.length - 2) {
+				document.getElementById('imgRight').style.display = 'block';
+			}
 		}
 	}
 
 	onCreate(data) {
-	    this.wareList = data.wareList;
-	    this.curWareIndex = data.curWareIndex;
-	    if (data.curImageList) {
+    this.wareList = data.wareList;
+    this.curWareIndex = data.curWareIndex;
+    if (data.curImageList) {
 			this.curImageList = data.curImageList;
-	    }
-	    if (data.curImageIndex) {
+    }
+    if (data.curImageIndex) {
 			this.curImageIndex = data.curImageIndex;
-	    }
-	    this.curWareType = this.wareList[this.curWareIndex].type;
+    }
+    this.curWareType = this.wareList[this.curWareIndex].type;
 		this.setContentView(require('../../../res/tpl/ImageWareFullScreen.tpl'), {}, 'ImageWareFullScreen', {}, () => {
 			this.renderImageView();
+			document.getElementById('imgLeft').style.display = 'none';
+			if (this.curImageList.length === 1) {
+				document.getElementById('imgRight').style.display = 'none';
+			}
 		});
 	}
 
@@ -112,8 +132,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

@@ -1,7 +1,7 @@
 import APIClient from '../../../util/API/APIClient';
 import Consts from '../../../util/Consts';
 import Utils from '../../../util/Utils';
-import HlsVideoPlugin from '../../../util/HlsVideoPlugin';
+import EfunVideoPlayer from '../../../util/EfunVideoPlayer';
 import {CommandBus, CMD_TYPE} from '../../../util/CommandBus';
 
 function matchWare(wareList, wareId) {
@@ -144,6 +144,7 @@ class LessonScene extends scene {
     			if (list && list.length >= 1) {
     				playUrl = Utils.videoUrlFormat(list[0].url);
     			}
+          /*
     			let videoViewDom =
                 `
                   <div id="view-full-screen" fe-role="Widget" class="view-full-screen-video">
@@ -161,12 +162,12 @@ class LessonScene extends scene {
     			`
     				<div id="view-full-screen" fe-role="Widget" class="view-full-screen-img"></div>
     				<div id="view-previous" fe-role="Widget">
-                        <div class="transparent-btn">上一页</div>
-                    </div>
+              <div class="transparent-btn">上一页</div>
+            </div>
     				<div id="view-page">1/1</div>
-                        <div id="view-next" fe-role="Widget">
-                        <div class="transparent-btn">下一页</div>
-                    </div>
+              <div id="view-next" fe-role="Widget">
+              <div class="transparent-btn">下一页</div>
+            </div>
     			`;
     			document.getElementById('view-bottom').innerHTML = imageViewDom;
     			this.moye.root.reRender();
@@ -194,25 +195,25 @@ class LessonScene extends scene {
     * 渲染视频视图
     */
     renderVideoView(name, url, type) {
-        if (window.efunbox) {
-            window.efunbox.initAndroidPlayer(
-            	name,
-            	url,
-            	1, //与android里的音视频类型定义有关，这里写死为type=1
-            	this.videoPosition.top,
-            	this.videoPosition.left,
-            	this.videoPosition.width,
-            	this.videoPosition.height,
-            	false
-            );
-            window.efunbox.start();
-            this.videoPlayer = window.efunbox;
-        } else {
-            const videoDom = `<video id="hls-video" controls autoplay>你的浏览器不支持视频播放</video>`;
-            document.getElementById('view-content').innerHTML = videoDom;
-            this.videoPlayer = new HlsVideoPlugin();
-            this.videoPlayer.initH5Player(url, 'hls-video');
-        }
+      if (window.efunbox) {
+          window.efunbox.initAndroidPlayer(
+          	name,
+          	url,
+          	1, //与android里的音视频类型定义有关，这里写死为type=1
+          	this.videoPosition.top,
+          	this.videoPosition.left,
+          	this.videoPosition.width,
+          	this.videoPosition.height,
+          	false
+          );
+          window.efunbox.start();
+          this.videoPlayer = window.efunbox;
+      } else {
+          const videoDom = `<div id="hls-video"></div>`;
+          document.getElementById('view-content').innerHTML = videoDom;
+          this.videoPlayer = new EfunVideoPlayer();
+          this.videoPlayer.initPlayer(url, 'hls-video');
+      }
     	// 监控到初始化视频成功后暂停画面
     	this.timer = window.setInterval(() => {
     		if (this.videoPlayer.playStatus()) {
@@ -235,29 +236,31 @@ class LessonScene extends scene {
     			if (list && list.length >= 1) {
     				playUrl = Utils.videoUrlFormat(list[0].url);
     			}
-                let playText = '播放';
-                if (this.videoPlayer && this.videoPlayer.playStatus()) {
-                    playText = '暂停';
-                }
+          /*
+          let playText = '播放';
+          if (this.videoPlayer && this.videoPlayer.playStatus()) {
+              playText = '暂停';
+          }
     			let videoViewDom =
-                `
-                  <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">${playText}</div>
-                  </div>
-                `;
-    			document.getElementById('view-bottom').innerHTML = videoViewDom;
+            `
+              <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">${playText}</div>
+              </div>
+            `;
+          */
+    			document.getElementById('view-bottom').innerHTML = '';
     			this.moye.root.reRender();
-                //如果是H5播放器，则重新创建video标签
-                if (window.efunbox) {
-                    window.efunbox.customScreen(270, 790, 1072, 603);
-                } else {
-                    const videoDom = `<video id="hls-video" controls>你的浏览器不支持视频播放</video>`;
-                    document.getElementById('view-content').innerHTML = videoDom;
-                    this.videoPlayer = new HlsVideoPlugin();
-                    this.videoPlayer.initH5Player(playUrl, 'hls-video');
-                }
+          //如果是H5播放器，则重新创建video标签
+          if (window.efunbox) {
+              window.efunbox.customScreen(270, 790, 1072, 603);
+          } else {
+            const videoDom = `<div id="hls-video"></div>`;
+            document.getElementById('view-content').innerHTML = videoDom;
+            this.videoPlayer = new EfunVideoPlayer();
+            this.videoPlayer.initPlayer(playUrl, 'hls-video');
+          }
     			break;
     		case Consts.TYPE_IMAGE:
     			let imageViewDom =
@@ -275,8 +278,8 @@ class LessonScene extends scene {
     			this.moye.root.reRender();
     			this.renderImageView();
     			break;
-            default:
-                break;
+        default:
+          break;
     	}
     }
 
@@ -334,7 +337,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 +369,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/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/BuyConfirmScene.less

@@ -48,7 +48,7 @@
 			font-size: 0.48rem;
 
 			&.fe-focus {
-				.after-focus(@borderSize; #ff5050);
+				//.after-focus(@borderSize; #ff5050);
 			}
 		}
 

src/stage/index/style/CLScene.less

@@ -5,28 +5,19 @@
 #CLScene {
     position: absolute;
     width: 100%;
-    height: 100%;
-
-  	.cl-bg {
-  		position: absolute;
-  		top: 0;
-  		left: 0;
-  		z-index: -1;
-  		width: 100%;
-  		height: 100%;
-  		img {
-  			position: absolute;
-  			top: 0;
-  			left: 0;
-  			width: 100%;
-  			height: 100%;
-  		}
-  	}
+    height: 10.9rem;
+    background-image: url('assets/img/IndexScene/index_bg.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
 
     #cl-left-panel {
         float: left;
         width: 3.7rem;
-        height: 100%;
+        height: 10.9rem;
+        background-image: url('assets/img/CLScene/cl_left.png');
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+
         #name-text {
             color: #fff;
             font-size: 0.6rem;
@@ -35,6 +26,9 @@
             padding-top: 0.58rem;
             padding-bottom: 0.33rem;
             text-align: center;
+            background-image: url('assets/img/CLScene/name_text.png');
+            background-size: 100% 100%;
+            background-repeat: no-repeat;
         }
         #cl-left-tab-scroll{
             position: relative;
@@ -66,7 +60,7 @@
 
     #cl-right-panel {
         float: right;
-        width: 15.5rem;
+        width: 15.3rem;
         height: 100%;
     }
 
@@ -134,7 +128,7 @@
             //自定义周边商品item在当前scene的focus样式
             &.fe-focus .course-item-frame,
             &.fe-focus .goods-item-frame {
-                .after-focus(@borderSize; #ffe100);
+               // .after-focus(@borderSize; #ffe100);
             }
         }
 

src/stage/index/style/CourseScene.less

@@ -1,4 +1,6 @@
 @import './component/GoodsItem.less';
+@import './IndexScene.less';
+
 
 .lesson-selected {
 	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
@@ -9,7 +11,7 @@
 	top: 0;
 	left: 0;
 	width: 100%;
-	height: 100%;
+	height: 10.9rem;
 	overflow: hidden;
 
 	.course-bg {
@@ -91,7 +93,7 @@
 					}
 
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 
@@ -107,7 +109,7 @@
 					}
 
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 
@@ -123,7 +125,7 @@
 					}
 
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 
@@ -143,7 +145,7 @@
 					}
 
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 
@@ -157,9 +159,8 @@
 					&::after {
 						content: '购买';
 					}
-
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 			}
@@ -176,7 +177,7 @@
 			width: 100%;
 			padding: 0.28rem 1.43rem 0;
 			margin-top: .5rem;
-			overflow: hidden;
+			overflow: scroll;
 			height: 8.8rem;
 
 			.scroll-list {
@@ -221,7 +222,7 @@
 					background-repeat: no-repeat;
 					background-size: cover;
 					&.fe-focus {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+					//	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 
@@ -267,7 +268,7 @@
 						}
 
 						&.fe-focus {
-							.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 						}
 					}
 
@@ -285,7 +286,7 @@
 						background-repeat: no-repeat;
 						background-size: cover;
 						&.fe-focus {
-							.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+						//	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 						}
 					}
 
@@ -361,7 +362,7 @@
 				background-size: cover;
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+				//	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 				}
 
 				&.renewal-fee {
@@ -404,7 +405,7 @@
 					}
 
 					&.fe-focus .goods-item-frame {
-						.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
+					//	.after-focus(@borderSize; #ff5050; .1rem; rgba(0,0,0,0.5));
 					}
 				}
 			}

src/stage/index/style/DelConfirmScene.less

@@ -49,7 +49,7 @@
 			font-size: 0.48rem;
 
 			&.fe-focus {
-				.after-focus(@borderSize; #ff5050);
+				//.after-focus(@borderSize; #ff5050);
 			}
 		}
 
@@ -67,7 +67,7 @@
 			font-size: 0.48rem;
 
 			&.fe-focus {
-				.after-focus(@borderSize; #ff5050);
+				//.after-focus(@borderSize; #ff5050);
 			}
 		}
 	}

src/stage/index/style/GlobalGoodDetail.less

@@ -18,7 +18,7 @@
             border: solid unit(@borderSize, rem) transparent;
             border-radius: 0.5rem;
             &.fe-focus {
-                .after-focus(@borderSize; #ffe100);
+               // .after-focus(@borderSize; #ffe100);
             }
             img {
                 width: 0.78rem;
@@ -127,7 +127,7 @@
                 margin: 0.16rem 0.5rem 0 0;
                 padding: 0.03rem;
                 &.fe-focus {
-                    .after-focus(@borderSize; #ffe100);
+                   // .after-focus(@borderSize; #ffe100);
                 }
                 img {
                     position: inherit;

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/IndexScene.less

@@ -0,0 +1,187 @@
+@import './component/CourseItem.less';
+
+@keyframes circle-opacity{
+	0% {
+		background: -webkit-radial-gradient(rgba(207,209,209,.3) 10%, rgba(207,209,209,.35) 20%,rgba(0,0,0,0) 20%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	25% {
+		background: -webkit-radial-gradient(rgba(207,209,209,.4) 20%, rgba(207,209,209,.45) 40%,rgba(0,0,0,0) 40%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	50% {
+		background: -webkit-radial-gradient(rgba(207,209,209,.4) 30%, rgba(207,209,209,.4) 60%,rgba(0,0,0,0) 60%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	70% {
+		background: -webkit-radial-gradient(rgba(186,188,188,.3) 60%, rgba(186,188,188,.35) 70%,rgba(0,0,0,0) 70%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	100% {
+		background: -webkit-radial-gradient(rgba(186,188,188,.3) 70%, rgba(186,188,188,.35) 100%,rgba(0,0,0,0) 100%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+}
+
+@keyframes circle-opacity-fun{
+	0% {
+		background: -webkit-radial-gradient(rgba(0,0,0,.3) 10%, rgba(0,0,0,.35) 20%,rgba(0,0,0,0) 20%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	25% {
+		background: -webkit-radial-gradient(rgba(0,0,0,.4) 20%, rgba(0,0,0,.45) 40%,rgba(0,0,0,0) 40%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	50% {
+		background: -webkit-radial-gradient(rgba(0,0,0,.4) 30%, rgba(0,0,0,.4) 60%,rgba(0,0,0,0) 60%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	70% {
+		background: -webkit-radial-gradient(rgba(0,0,0,.3) 60%, rgba(0,0,0,.35) 70%,rgba(0,0,0,0) 70%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+	100% {
+		background: -webkit-radial-gradient(rgba(0,0,0,.3) 70%, rgba(0,0,0,.35) 100%,rgba(0,0,0,0) 100%); /* Safari 5.1 - 6.0 */
+		//background: radial-gradient(rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,.2),rgba(0,0,0,.3),rgba(0,0,0,.4),rgba(0,0,0,.5)); /* 标准的语法（必须放在最后） */
+	}
+}
+
+#IndexScene {
+	position: absolute;
+	width: unit(@designWidth, rem);
+	height: unit(@designHeight, rem);
+	padding: 0.05rem 1.2rem .5rem;
+	background-image: url('assets/img/IndexScene/index_bg.png');
+	background-size: cover;
+	background-repeat: no-repeat;
+
+	.m-logo{
+		position: absolute;
+		top: 1rem;
+		width: 3.62rem;
+		height: 1.30rem;
+		background-image: url('assets/img/IndexScene/logo.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
+	.m-header-user{
+		height: 0.96rem;
+		margin-top: 1rem;
+		.user-info {
+			float: right;
+			width: auto;
+			height: auto;
+			margin-left: 0.2rem;
+			border-radius: 0.55rem;
+			padding-left: 0.2rem;
+			padding-right: 0.3rem;
+			padding-top: 0.1rem;
+			padding-bottom: 0.1rem;
+			margin-right: -0.3rem;
+			text-align: right;
+
+			.user-info-text {
+				float: left;
+				width: auto;
+				height: 100%;
+				color: #ffffff;
+				padding-top: 0.01rem;
+				filter:alpha(Opacity=60);-moz-opacity:0.6;opacity: 0.6;
+
+				.terminal-name {
+					width: 100%;
+					height: .4rem;
+					line-height: .4rem;
+					font-size: 0.48rem;
+				}
+
+				.terminal-id {
+					width: 100%;
+					height: .3rem;
+					margin-top: .1rem;
+					line-height: .3rem;
+					font-size: 0.36rem;
+				}
+			}
+		}
+	}
+	.m-main {
+		width: 100%;
+		height: 7.8rem;
+		margin-top: 0.3rem;
+		padding: .2rem 0rem 0rem 0rem;
+		overflow-y: hidden;
+		.scroll-list {
+			width: 100%;
+			padding-bottom: 0.3rem;
+
+			.history-wrapper {
+				font-size: 0;
+				width: 100%;
+				height: 4.98rem;
+				padding: 0.2rem 0.09rem 0.2rem;
+				overflow: hidden;
+
+				.history-item {
+					position: relative;
+					display: inline-block;
+					width: 20%;
+					height: 100%;
+					padding: 0 .06rem;
+					.course-item-frame {
+						color: #303030;
+						.course-item-frame;
+					}
+				}
+			}
+			.fun-wrapper {
+				width: 100%;
+				height: 1.8rem;
+				padding: 0 0.09rem;
+				margin-top: .02rem;
+				margin-bottom: .65rem;
+				font-size: 0;
+				.fun-item {
+					position: relative;
+					display: inline-block;
+					width: 20%;
+					height: 1.8rem + 2 * unit(@borderSize, rem);
+					padding: 0 0.11rem - unit(@borderSize, rem);
+					overflow: hidden;
+					img {
+						margin-left: .22rem;
+						height: 1.8rem;
+						width: 3.1rem;
+						border: solid unit(@borderSize, rem) transparent;
+						border-radius: 0.24rem;
+						&:first-child {
+							margin-left: 0;
+						}
+					}
+					//点击触摸反馈样式 响应
+					&::after {
+						content: " ";
+						display: block;
+						position: absolute;
+						left: 0;
+						top: -100%;
+						margin-left: .11rem;
+						width: 3.1rem;
+						height: 300%;
+						background-color: transparent;
+					}
+					&:active::after {
+						animation: circle-opacity .3s;
+					}
+
+				}
+			}
+		}
+	}
+	.index_msg {
+		font-family: -webkit-pictograph;
+		text-align: center;
+		color: rgba(255,255,255,.4);
+		font-size: .32rem;
+	}
+}

src/stage/index/style/LessonScene.less

@@ -5,7 +5,7 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
+	height: 10.9rem;
 	overflow: hidden;
 	background-image: url("assets/img/LessonScene/background.jpg");
 	background-size: 100% 100%;
@@ -24,7 +24,7 @@
 
 	#list {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 0.7rem;
 		width: 7.2rem;
 		height: 8.15rem;
@@ -94,10 +94,10 @@
 
 	#view {
 		position: absolute;
-		top: 1.7rem;
+		top: 1.6rem;
 		left: 7.9rem;
 		width: 10.72rem;
-		height: 8.15rem;
+		height: 8.03rem;
 		background-color: #2b63e2;
 
 		#view-top {
@@ -120,7 +120,7 @@
 				width: 100%;
 				height: 100%;
 			}
-			video {
+			#hls-video {
 				width: 100%;
 				height: 100%;
 			}
@@ -131,7 +131,7 @@
 			left: 0rem;
 			top: 7.03rem;
 			width: 10.72rem;
-			height: 1.12rem;
+			height: 1rem;
 
 			.view-text-ctl-btn{
 				position: absolute;
@@ -164,7 +164,7 @@
 				*/
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 
@@ -172,7 +172,7 @@
 				position: absolute;
 				left: 5.88rem;
 				//left: 4.82rem;
-				top: 0.2rem;
+				top: 0.15rem;
 				width: 1.4rem;
 				//height: 0.65rem;
 				//line-height: 0.65rem;
@@ -199,7 +199,7 @@
 				*/
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 
@@ -215,12 +215,12 @@
 				color: #ffffff;
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 
 			.view-full-screen-video {
-        		position: absolute;
+        position: absolute;
 				left:1.53rem;
 				top: 0.2rem;
 				width: 2.2rem;
@@ -231,7 +231,7 @@
 				background-repeat: no-repeat;
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 

src/stage/index/style/LoginScene.less

@@ -16,26 +16,26 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
+	height: 10.9rem;
 	overflow: hidden;
-	background-color: rgba(0, 0, 0, 0.1);
-	background-image: url('assets/img/LoginScene/background.png');
+	background-image: url('assets/img/LoginScene/page_bg.png');
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
+	padding: .8rem 1.2rem .4rem;
 
 	.formBox {
-		position: absolute;
-		top: 4.57rem;
-		left: 2.2rem;
-		width: 8.3rem;
-		height: 3.7rem;
-
+		width: 10.5rem;
+		height: 8.9rem;
+		padding: 3.7rem 1.1rem 0 1rem;
+		background-image: url('assets/img/LoginScene/left_bg.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
 		.form-sid {
-			position: relative;
-			width: 8.3rem;
+			width: 100%;
 			height: 0.8rem;
 			border-radius: 5rem;
 			border: solid unit(@outLineSize, rem) #d3d3d3;
+			overflow: hidden;
 
 			.form-sid-label {
 				float: left;
@@ -63,13 +63,12 @@
 		}
 
 		.form-password {
-			position: relative;
-			top: 0.3rem;
-			width: 8.3rem;
+			margin-top: 0.3rem;
+			width: 100%;
 			height: 0.8rem;
 			border-radius: 5rem;
 			border: solid unit(@outLineSize, rem) #d3d3d3;
-
+			overflow: hidden;
 			.form-password-label {
 				float: left;
 				width: 1.5rem;
@@ -96,9 +95,8 @@
 		}
 
 		.form-submit {
-			position: relative;
-			top: 1.18rem;
-			width: 8.5rem;
+			margin-top: 1.18rem;
+			width: 100%;
 			height: 0.8rem;
 			background: #fff;
 			margin-left: -0.2rem;
@@ -117,7 +115,7 @@
 
 				&.fe-focus {
 					background: #2973d7;
-					.after-focus(@outLineSize; #ff5a00; 0; #ff5a00);
+				//	.after-focus(@outLineSize; #ff5a00; 0; #ff5a00);
 				}
 			}
 		}
@@ -125,10 +123,15 @@
 
 	.keyborad {
 		position: absolute;
-		top: 3.7rem;
-		left: 12.5rem;
-		width: 4.4rem;
-		height: 5.2rem;
+		top: .8rem;
+		right: 1.2rem;
+		width: 6.9rem;
+		height: 8.9rem;
+		background-image: url('assets/img/LoginScene/right_bg.png');
+		//background-color: rgba(0, 0, 0, 0.1);
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		padding: 3rem 0rem 0rem 1.8rem;
 
 		.keyborad-item {
 			width: 1rem;
@@ -136,7 +139,6 @@
 			float: left;
 			margin: 0 0.45rem 0.3rem 0;
 			.before-focus;
-
 			.key-icon {
 				.keyborad-box;
 
@@ -188,9 +190,8 @@
 					background-image: url('assets/img/LoginScene/enter.png');
 				}
 			}
-
 			&.fe-focus .key-icon {
-				.after-focus(@outLineSize; #ff5a00; 0; #ff5a00);
+			//	.after-focus(@outLineSize; #ff5a00; 0; #ff5a00);
 			}
 		}
 	}

src/stage/index/style/Mixins.less

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

src/stage/index/style/RepeatLoginScene.less

@@ -50,7 +50,7 @@
 			}
 
 			&.fe-focus {
-				.after-focus(@borderSize; #ffe100);
+				//.after-focus(@borderSize; #ffe100);
 				border-radius: .5rem;
 			}
 		}

src/stage/index/style/ShopCartScene.less

@@ -6,21 +6,12 @@
 	top: 0;
 	left: 0;
 	width: 100%;
-	height: 100%;
+	height: 10.9rem;
 	overflow: hidden;
+	background-image: url('assets/img/IndexScene/index_bg.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
 
-	.cart-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: -1;
-		width: 100%;
-		height: 100%;
-		img {
-			width: 100%;
-			height: 100%;
-		}
-	}
 	.cart-name {
 		position: absolute;
 		top: .7rem;
@@ -29,6 +20,18 @@
 		line-height: .5rem;
 		font-size: .36rem;
 		color: #fff;
+		&::before {
+			content: "";
+			display: inline-block;
+			position: absolute;
+			top: -.3rem;
+			left: -1.1rem;
+			width: .8rem;
+			height: .8rem;
+			background-image: url('assets/img/shopCart.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		}
 	}
 	.cart-empty {
 		position: absolute;
@@ -80,7 +83,7 @@
 				}
 
 				&.fe-focus .goods-item-frame, &.fe-focus .course-item-frame{
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 
@@ -96,7 +99,7 @@
 				background-size: cover;
 
 				&.fe-focus {
-					.after-focus(@borderSize; #ffe100);
+				//	.after-focus(@borderSize; #ffe100);
 				}
 			}
 		}
@@ -114,7 +117,7 @@
 		background-size: cover;
 
 		&.fe-focus {
-			.after-focus(@borderSize; #ffe100);
+			//.after-focus(@borderSize; #ffe100);
 		}
 	}
 }

src/stage/index/style/TerminalScene.less

@@ -9,19 +9,42 @@
 
 	.background {
 		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: -1;
-		width: 100%;
-		height: 100%;
-		img {
-			position: absolute;
-			top: 0;
-			left: 0;
+		width: 13rem;
+		left: 50%;
+		margin-left: -6.5rem;
+		padding-top: 1.78rem;
+		padding-bottom: 1.78rem;
+		font-size: .46rem;
+		.terminal-wrapper {
 			width: 100%;
-			height: 100%;
+			height: 7rem;
+			border-radius: 1rem;
+			padding: .2rem .7rem 0;
+			box-sizing: border-box;
+			background-color: #FFFAEA;
+			.info-item {
+				width: 100%;
+				height: 1.2rem;
+				padding-left: .2rem;
+				line-height: 1.7rem;
+				font-size: .46rem;
+				border-bottom: .05rem dashed #fcca98;
+				span {
+					display: inline-block;
+					width: 2rem;
+					height: 100%;
+					text-align:justify;
+					text-justify:distribute-all-lines;/*ie6-8*/
+					text-align-last:justify;/* ie9*/
+					-moz-text-align-last:justify;/*ff*/
+					-webkit-text-align-last:justify;/*chrome 20+*/
+				}
+				&:nth-last-child(1) {
+					border-bottom: none;
+					line-height: 1.6rem;
+				}
+			}
 		}
-	}
 
 	.terminal {
 		position: absolute;

src/util/EfunVideoPlayer.js

@@ -0,0 +1,58 @@
+class EfunVideoPlayer {
+  constructor() {
+    this.efunplayer = null;
+    this.metadata = null;
+  }
+
+  loadedHandler() {
+    this.efunplayer.addListener('loadedmetadata', () => {
+      this.metadata = this.efunplayer.getMetaDate();
+    });
+  }
+
+  initPlayer(url, domId) {
+    let videoObject = {
+      autoplay: true,
+      container: `#${domId}`,
+      variable: 'player',
+      video: url,
+    };
+    if (Hls.isSupported()) {
+      videoObject.html5m3u8 = true;
+    } else {
+      videoObject.flashplayer = true;
+    }
+    this.efunplayer = new ckplayer(videoObject);
+  }
+
+  playStatus() {
+    return (this.metadata || {})['paused'];
+  }
+
+  pause() {
+    console.log('click pause btn...');
+    this.efunplayer.videoPause();
+  }
+
+  start() {
+    this.efunplayer.videoPlay();
+  }
+
+  fullScreen() {
+    this.efunplayer.webkitRequestFullScreen();
+  }
+
+  getCurtime() {
+    return this.efunplayer.currentTime * 1000;
+  }
+
+  getDuration() {
+    return this.efunplayer.duration * 1000;
+  }
+
+  seekProgress(currentTime) {
+    this.efunplayer.videoSeek(currentTime);
+  }
+}
+
+module.exports = EfunVideoPlayer;

src/util/Utils.js

@@ -201,7 +201,7 @@ class Utils {
         if (url.startsWith('http')) {
             return url.replace('http://ljvideo.ai160.com', Consts.VIDEO_PATH);
         } else if (url.startsWith('https')) {
-            return url;
+            return url.replace('https', 'http');
         } else {
             return url;
         }