Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/.wing/exml.json

@@ -160,5 +160,13 @@
     "backgroundType": "user",
     "useBgImage": false,
     "useBgColor": true
+  },
+  "16cc233ca3b": {
+    "bindingDataTestObj": [
+      {
+        "key": "data.img",
+        "value": "http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif"
+      }
+    ]
   }
 }
\ No newline at end of file

egret/index.html

@@ -65,7 +65,7 @@
             return b;
         }
     </script>
-    <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" src="https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"/>
+    <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
 
     <script src="output.js"></script>
 </body>

egret/libs/new_wx/ctrls/panelCtrl.ts

@@ -68,7 +68,7 @@ export default class PanelCtrl {
         panel.addEventListener('onDestroy', this.onPanelHide, this);
     }
 
-    private remove(panel: Panel, rightNow = false) {
+    private remove(panel: Panel, rightNow = true) {
         if (rightNow) {
             this._parent.removeChild(panel);
             this.removeMask(rightNow);

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png"]}
\ No newline at end of file

egret/resource/default.res.json

@@ -9,7 +9,7 @@
 			"name": "rule"
 		},
 		{
-			"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png",
+			"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png,share_btn2_png,朋友圈中间分享蒙层1_jpg,share_btn1_png",
 			"name": "common"
 		},
 		{
@@ -1434,6 +1434,26 @@
 			"url": "assets/mainScene/bonusTime.png",
 			"type": "image",
 			"name": "bonusTime_png"
+		},
+		{
+			"url": "assets/share3.jpg",
+			"type": "image",
+			"name": "share3_jpg"
+		},
+		{
+			"url": "assets/common/朋友圈中间分享蒙层1.jpg",
+			"type": "image",
+			"name": "朋友圈中间分享蒙层1_jpg"
+		},
+		{
+			"url": "assets/common/share_btn1.png",
+			"type": "image",
+			"name": "share_btn1_png"
+		},
+		{
+			"url": "assets/common/share_btn2.png",
+			"type": "image",
+			"name": "share_btn2_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

@@ -25,6 +25,7 @@
 		"resource/skins/RankSkin.exml",
 		"resource/skins/ReliveSkin.exml",
 		"resource/skins/RuleSkin.exml",
+		"resource/skins/Share2Skin.exml",
 		"resource/skins/ShareSkin.exml",
 		"resource/skins/ShopSkin.exml",
 		"resource/skins/ShowOffSkin.exml",

egret/resource/skins/BoxSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<w:Config id="16cc233ca3b"/>
 	<e:Image source="boxbg_png" y="33.76" horizontalCenter="0"/>
+	<e:Image id="img" y="355" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="0.9" scaleY="0.9" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="608" y="165">
 		<e:skinName>
 		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">

egret/resource/skins/Share2Skin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="Share2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Rect width="750" height="1624" fillAlpha="0.7"/>
+	<e:Group id="pic" x="86" y="46">
+		<e:Image source="share3_jpg" y="0" x="0"/>
+		<e:Label id="lvTxt" text="22" x="247.65" y="719.82" size="16" anchorOffsetX="0" width="61.33" textAlign="center" verticalAlign="middle" textColor="0xEA2917"/>
+	</e:Group>
+	<e:Image source="朋友圈中间分享蒙层1_jpg" y="899.88" horizontalCenter="0"/>
+	<e:Group y="965.88" horizontalCenter="0">
+		<e:Button id="btn1" label="" x="0" y="0">
+			<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="share_btn1_png" source.down="share_btn1_png" source.disabled="share_btn1_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
+		<e:Button id="btn2" label="" x="152">
+			<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="share_btn2_png" source.down="share_btn2_png" source.disabled="share_btn2_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
+	</e:Group>
+</e:Skin>
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -12,6 +12,7 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
 import wait from "../../libs/new_tc/wait";
 import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
 import { toggleSound, toggleBg, playBg } from "../soundCtrl";
+import { showShare } from "../shareCtrl";
 
 export default class MapScene extends Scene {
     scrollGroup: eui.Group;
@@ -66,9 +67,9 @@ export default class MapScene extends Scene {
             PanelCtrl.instance.show('StartPanel', data.level)
         }
 
-        // this.stage.once(egret.TouchEvent.TOUCH_TAP,()=>{
-        //     if(getBgOn)playBg();
-        // },this);
+        this.stage.once(egret.TouchEvent.TOUCH_TAP,()=>{
+            playBg();
+        },this);
     }
 
     disableIcon(level) {

egret/src/panels/BoxPanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
 import { NetManager } from "../../libs/tw/manager/NetManager";
 import { getlogItem } from "../Main";
+import { DataManager } from "../../libs/tw/manager/DataManager";
 
 export default class BoxPanel extends Panel {
     start(data) {
@@ -10,6 +11,7 @@ export default class BoxPanel extends Panel {
 
         }, this);
         this.showlog();
+        this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
     }
     showlog() {
         NetManager.ins.showLog(getlogItem(17));

egret/src/shareCtrl.ts

+import ComponentBase from "../libs/new_wx/components/ComponentBase";
+import layers from "../libs/new_wx/views/layers";
+import { getPrintScreenData } from "./getShowOffPic";
+import { NetManager } from "../libs/tw/manager/NetManager";
+import { DataManager } from "../libs/tw/manager/DataManager";
+import getHomeData from "./getHomeData";
+
+const img: any = document.getElementById('pic');
+img.style.display = 'none';
+
+class Share2 extends ComponentBase {
+    start() {
+        const data = getHomeData();
+        this['lvTxt'].text = data.levels.length;
+        this['btn1'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            this.getFunc('btn1');
+        }, this);
+
+        this['btn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            this.getFunc('btn2');
+        }, this);
+    }
+
+    getFunc(type: string) {
+        const base64 = getPrintScreenData(this['pic'], 0, 0, 579, 866);
+        NetManager.ins.imgUrl((success) => {
+            const data = DataManager.ins.getData('imgURL');
+            img.src = data;
+        }, base64);
+    }
+
+    get skinKey() {
+        return 'Share2';
+    }
+}
+let inited = false;
+const initShare = () => {
+    const layer = layers.shareLayer;
+    const share = new Share2();
+    share.loadSkin();
+    share.start();
+    layer.addChild(share);
+};
+export const showShare = () => {
+    if (!inited) {
+        initShare();
+        inited = true;
+    }
+    layers.shareLayer.visible = true;
+}
+
+export const hideShare = () => {
+    layers.shareLayer.visible = false;
+}
\ No newline at end of file

mock/json/getPlugOrderStatus.json

-{
-    "result": 2,
+{"result":2,"lotteryCode":1,"success":true,"lottery":{"id":1385,"imgurl":"//yun.duiba.com.cn/developer/img/activityTool/slotMachine/virtual.png","isAppHidden":true,"isDownloadUrl":true,"itemId":49440,"link":"//activity.m.duibadev.com.cn/activity/takePrizeNew?recordId=30035037&dbnewopen","linkTo":0,"title":"宝箱1","type":"virtual"},"takeSuccess":false}
\ No newline at end of file
-    "lotteryCode": 1,
-    "success": true,
-    "lotter1y": {
-        "confirm": false,
-        "coupon_code": "24324238208",
-        "coupon_key": "865690",
-        "id": 1419,
-        "imgurl": "//yun.dui88.com/images/201907/ns452782nx.png",
-        "isAppHidden": true,
-        "isDownloadUrl": true,
-        "itemId": 49385,
-        "link": "//activity.m.duibadev.com.cn/crecord/recordDetailNew?orderId=1080794503076520393&after=1&dbnewopen&dpm=1.4.3.0&dcm=101.49385.0.0",
-        "linkTo": 0,
-        "showUse": false,
-        "st_info_dpm_close": "{\"dpm\":\"1.4.4.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}",
-        "st_info_dpm_go_use": "{\"dpm\":\"1.4.1.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}",
-        "st_info_dpm_img": "{\"dpm\":\"1.4.1.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}",
-        "tip": "",
-        "title": "亚组委-随机",
-        "type": "coupon",
-        "useBtnText": "马上使用",
-        "validate": "2019-08-31"
-    },
-    "takeSuccess": false
-}
\ No newline at end of file