:twisted_rightwards_arrows: merge branch 'dev_base' into online_kid_web

src/res/tpl/GlobalGoodDetail.tpl

@@ -1,10 +1,7 @@
 <div id="GlobalGoodDetailScene" fe-role="Switch">
     <div class="control-panel">
-        <!-- <div class="search-btn-frame" fe-role="Widget">
-            <img src="./assets/img/CLScene/search.png" />
-        </div> -->
         <div class="shopping-cart-btn-frame" fe-role="Widget">
-            <img src="./assets/img/CLScene/shopping_cart.png" />
+            <img src="./assets/img/CLScene/icon_shopcart.png" />
         </div>
         <div class="cart-num"></div>
     </div>
@@ -16,12 +13,6 @@
             <p id="ggd-detail-desc" class="desc">...
             </p>
             <div class="detail-control-panel" id="detail-control-panel">
-                <!-- <div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget">
-                    <img src="./assets/img/GlobalGoodDetail/add_shop_cart.png" />
-                </div>
-                <div id="goto-course-btn" class="play-btn-frame" fe-role="Widget" >
-                    <img src="./assets/img/GlobalGoodDetail/play_course.png" />
-                </div> -->
             </div>
         </div>
     </div>
@@ -29,9 +20,6 @@
         <p id="ggd-concerned-goods-count" class="concerned-goods-count"></p>
         <div id="ggd-concerned-goods-scroll" fe-role="Scroll" fe-cfg="scroll_dir:h, auto_list_width:yes">
             <ul id="ggd-concerned-goods-list" class="scroll-list" >
-                <!--<li class="item" fe-role="Widget">
-                    <img src="https://placeholdit.imgix.net/~text?txtsize=28&txt=Cover&w=114&h=114" />
-                </li>-->
             </ul>
         </div>
     </div>

src/stage/index/scene/GlobalGoodDetailScene.js

@@ -41,7 +41,7 @@ class GlobalGoodDetailScene extends scene {
 
         let btnWrapper = document.getElementById('detail-control-panel');
         let addCartHTML = `<div id="add-cart-btn" data-goodsId="${goodsItem.id}" class="add-shop-cart-btn-frame add-cart" fe-role="Widget"><img src="./assets/img/GlobalGoodDetail/add_shop_cart.png" /></div>`;
-        let addCartBoughtHTML = `<div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget"><img src="./assets/img/course/detail/periphery_added.png" /></div>`;
+        let addCartBoughtHTML = `<div id="add-cart-btn" class="add-shop-cart-btn-frame" fe-role="Widget"><img src="./assets/img/CourseScene/detail/periphery_added.png" /></div>`;
 
         if (relatedCourses && relatedCourses.length) {
             //可能会有多个相关的课程,这里只取第一个
@@ -59,7 +59,7 @@ class GlobalGoodDetailScene extends scene {
             let addCartBtn = FocusEngine.getWidgetById('add-cart-btn');
             addCartBtn.con.classList.add('added');
             addCartBtn.con.classList.remove('add-cart');
-            addCartBtn.con.children[0].src = goodsItem.isInCart ? './assets/img/course/detail/periphery_added.png' : './assets/img/GlobalGoodDetail/add_shop_cart.png';
+            addCartBtn.con.children[0].src = goodsItem.isInCart ? './assets/img/CourseScene/detail/periphery_added.png' : './assets/img/GlobalGoodDetail/add_shop_cart.png';
         }
     }
 

src/stage/index/scene/LessonScene.js

@@ -1,5 +1,6 @@
-import APIClient from '../../../util/API/APIClient'
-import Consts from '../../../util/Consts'
+import APIClient from '../../../util/API/APIClient';
+import Consts from '../../../util/Consts';
+import Utils from '../../../util/Utils';
 import HlsVideoPlugin from '../../../util/HlsVideoPlugin';
 import {CommandBus, CMD_TYPE} from '../../../util/CommandBus';
 
@@ -141,7 +142,7 @@ class LessonScene extends scene {
     		case Consts.TYPE_VIDEO:
     			let playUrl = '';
     			if (list && list.length >= 1) {
-    				playUrl = list[0].url;
+    				playUrl = Utils.videoUrlFormat(list[0].url);
     			}
     			let videoViewDom =
                 `
@@ -232,14 +233,18 @@ class LessonScene extends scene {
     		case Consts.TYPE_VIDEO:
     			let playUrl = '';
     			if (list && list.length >= 1) {
-    				playUrl = list[0].url;
+    				playUrl = Utils.videoUrlFormat(list[0].url);
     			}
+                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">${this.videoPlayer.playStatus() ? "暂停" : "播放"}</div>
+                    <div class="transparent-btn">${playText}</div>
                   </div>
                 `;
     			document.getElementById('view-bottom').innerHTML = videoViewDom;

src/stage/index/scene/VideoWareFullScreenScene.js

@@ -1,4 +1,5 @@
 import Consts from '../../../util/Consts';
+import Utils from '../../../util/Utils';
 import HlsVideoPlugin from '../../../util/HlsVideoPlugin';
 
 class VideoWareFullScreenScene extends scene {
@@ -86,7 +87,7 @@ class VideoWareFullScreenScene extends scene {
         const { list, type, title } = wareItem;
         let playUrl = '';
         if (list.length > 0) {
-          playUrl = list[0].url;
+          playUrl = Utils.videoUrlFormat(list[0].url);
         }
         if (window.efunbox) {
         	window.efunbox.initAndroidPlayer(

src/stage/index/style/GlobalGoodDetail.less

@@ -4,7 +4,7 @@
     position: absolute;
     width: 100%;
     height: 100%;
-    background: url('./assets/img/GlobalGoodDetail/bg.jpg') center no-repeat;
+    background: url('./assets/img/GlobalGoodDetail/background.jpg') center no-repeat;
     background-size: 100% 100%;
 
     .control-panel {

src/util/Consts.js

@@ -11,8 +11,8 @@ class Consts {
 }
 
 //图片/视频资源域名
-Consts.IMG_PATH = 'http://ljimgs.ai160.com';
-Consts.VIDEO_PATH = 'http://ljvideo.ai160.com/vs2m';
+Consts.IMG_PATH = 'https://efunimgs.ai160.com';
+Consts.VIDEO_PATH = 'https://efunvideo.ai160.com';
 
 //图片/视频资源类型代号
 Consts.TYPE_VIDEO = 0;

src/util/Utils.js

@@ -152,13 +152,13 @@ class Utils {
        return format;
     }
 
-  static trimJsonStr(src){
-    //所有"'" 替换为"\""
-    if(typeof(src) == "string"){
-      return src.replace(new RegExp("'","gm"), "\"");
+    static trimJsonStr(src){
+        //所有"'" 替换为"\""
+        if(typeof(src) == "string"){
+            return src.replace(new RegExp("'","gm"), "\"");
+        }
+        return src;
     }
-    return src;
-  }
 
 	/**
 	 * @desc uuid生成器
@@ -187,14 +187,25 @@ class Utils {
 		return uuid.join('');
 	}
 
-  static getUuidForWeb() {
-    const uuid = Utils.uuid(32);
-    const start = uuid.slice(0,8);
-    const next = uuid.slice(8,12);
-    const nextNext = uuid.slice(13,17);
-    const last = uuid.slice(17,32);
-    return `${start}-${next}-${nextNext}-${last}`;
-  }
+    static getUuidForWeb() {
+        const uuid = Utils.uuid(32);
+        const start = uuid.slice(0,8);
+        const next = uuid.slice(8,12);
+        const nextNext = uuid.slice(13,17);
+        const last = uuid.slice(17,32);
+        return `${start}-${next}-${nextNext}-${last}`;
+    }
+
+    static videoUrlFormat(url) {
+        if (!url) { return; }
+        if (url.startsWith('http')) {
+            return url.replace('http://ljvideo.ai160.com', Consts.VIDEO_PATH);
+        } else if (url.startsWith('https')) {
+            return url;
+        } else {
+            return url;
+        }
+    }
 }
 
 export default Utils;