Commit 970c6cf0 authored by wildfirecode's avatar wildfirecode

1

parent 641b4519
...@@ -54,9 +54,8 @@ ...@@ -54,9 +54,8 @@
// window['pageID'] = 'TeamShareScene'; // window['pageID'] = 'TeamShareScene';
// window['pageID'] = 'JoinShareScene'; // window['pageID'] = 'JoinShareScene';
// window['pageID'] = 'Share2Scene'; // window['pageID'] = 'Share2Scene';
window['pageID'] = 'TransScene';
window['TransLink']=''; window['TransLink']='';
// window['pageID'] = 'TransScene';
window['projectId'] = "1"; window['projectId'] = "1";
window['playwayId'] = "join_1"; window['playwayId'] = "join_1";
window["appId"] = ""; window["appId"] = "";
......
...@@ -4,4 +4,8 @@ ...@@ -4,4 +4,8 @@
<e:Image source="joinshare_bg_jpg" scaleX="1" scaleY="1"/> <e:Image source="joinshare_bg_jpg" scaleX="1" scaleY="1"/>
<e:Image id="btn" source="joinshare_btn_png" y="797" horizontalCenter="0" x="192.21" scaleX="1" scaleY="1"/> <e:Image id="btn" source="joinshare_btn_png" y="797" horizontalCenter="0" x="192.21" scaleX="1" scaleY="1"/>
</e:Group> </e:Group>
<e:Group id="sharemask" x="0" y="0" visible="false">
<e:Rect id="rect0" width="750" height="1624" x="0" y="0" fillAlpha="0.7"/>
<e:Image id="cover0" source="share2mask_png" x="177" y="73"/>
</e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -8,4 +8,8 @@ ...@@ -8,4 +8,8 @@
<e:Image id="title" source="transfer _title_png" y="335" x="54"/> <e:Image id="title" source="transfer _title_png" y="335" x="54"/>
</e:Group> </e:Group>
<e:Image id="btn" source="transfer _btn_png" x="179" bottom="93"/> <e:Image id="btn" source="transfer _btn_png" x="179" bottom="93"/>
<e:Group id="sharemask" x="0" y="0" visible="false">
<e:Rect id="rect1" width="750" height="1624" x="0" y="0" fillAlpha="0.7"/>
<e:Image id="cover1" source="share2mask_png" x="177" y="73"/>
</e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
export default () => {
return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
}
\ No newline at end of file
...@@ -2,9 +2,7 @@ import Scene from "../views/Scene"; ...@@ -2,9 +2,7 @@ import Scene from "../views/Scene";
import PanelCtrl from "../ctrls/panelCtrl"; import PanelCtrl from "../ctrls/panelCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import GameConst from "../GameConst"; import GameConst from "../GameConst";
const iswx = () => { import iswx from "../iswx";
return navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
}
export default class JoinShareScene extends Scene { export default class JoinShareScene extends Scene {
protected get skinKey() { return 'JoinShare' } protected get skinKey() { return 'JoinShare' }
...@@ -22,6 +20,10 @@ export default class JoinShareScene extends Scene { ...@@ -22,6 +20,10 @@ export default class JoinShareScene extends Scene {
onTap_btn() { onTap_btn() {
console.log('onTap_btn'); console.log('onTap_btn');
if (iswx()) { if (iswx()) {
this['sharemask'].visible = true;
this['sharemask'].once(egret.TouchEvent.TOUCH_TAP, () => {
this['sharemask'].visible = false;
}, this);
} else { } else {
PanelCtrl.instance.show(ModuleTypes.ConfirmPanel); PanelCtrl.instance.show(ModuleTypes.ConfirmPanel);
......
...@@ -74,10 +74,7 @@ export default class ShareStarterScene extends Scene { ...@@ -74,10 +74,7 @@ export default class ShareStarterScene extends Scene {
this['tipsWrapper'].visible = true; this['tipsWrapper'].visible = true;
this['transbtn'].visible = true; this['transbtn'].visible = true;
// const data = DataManager.ins.getData('accept').data; const data = DataManager.ins.getData('yyh_pollingAnimationState').data;
// data.from = 'ShareStarterScene';
// SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
const data: any = {}
data.from = 'ShareStarterScene'; data.from = 'ShareStarterScene';
SceneCtrl.instance.change(ModuleTypes.CertificateScene, data); SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
}, this); }, this);
...@@ -105,7 +102,7 @@ export default class ShareStarterScene extends Scene { ...@@ -105,7 +102,7 @@ export default class ShareStarterScene extends Scene {
this['matchingTips'].visible = true; this['matchingTips'].visible = true;
NetManager.ins.yyh_pollingAnimationState((success) => { NetManager.ins.yyh_pollingAnimationState((success) => {
const data = DataManager.ins.getData('yyh_pollingAnimationState').data; const data = DataManager.ins.getData('yyh_pollingAnimationState').data;
if (data == 3) {//摇一摇 if (data.state == 3) {//摇一摇
this.changeToTrans(); this.changeToTrans();
this['waitTips'].visible = false; this['waitTips'].visible = false;
this['matchingTips'].visible = false; this['matchingTips'].visible = false;
...@@ -113,14 +110,14 @@ export default class ShareStarterScene extends Scene { ...@@ -113,14 +110,14 @@ export default class ShareStarterScene extends Scene {
} }
}, sharecode, () => { }, sharecode, () => {
const data = DataManager.ins.getData('yyh_pollingAnimationState').data; const data = DataManager.ins.getData('yyh_pollingAnimationState').data;
if (data == 1) {//被邀请者确认邀请 if (data.state == 1) {//被邀请者确认邀请
this['waitTips'].visible = true; this['waitTips'].visible = true;
this['matchingTips'].visible = false; this['matchingTips'].visible = false;
} }
if (data == 2) {//用户取消 if (data.state == 2) {//用户取消
//暂时无法取消 //暂时无法取消
} }
return data === null || data == 0 || data == 1 || data == 2; return data.state === null || data.state == 0 || data.state == 1 || data.state == 2;
}) })
}, window['projectId']) }, window['projectId'])
} }
......
...@@ -8,6 +8,7 @@ import { yzwNet } from "../NetConst"; ...@@ -8,6 +8,7 @@ import { yzwNet } from "../NetConst";
import SceneCtrl from "../ctrls/sceneCtrl"; import SceneCtrl from "../ctrls/sceneCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import PanelCtrl from "../ctrls/panelCtrl"; import PanelCtrl from "../ctrls/panelCtrl";
import iswx from "../iswx";
export default class TransScene extends Scene { export default class TransScene extends Scene {
_bg: SVGA.EgretMovieClip; _bg: SVGA.EgretMovieClip;
...@@ -128,6 +129,15 @@ export default class TransScene extends Scene { ...@@ -128,6 +129,15 @@ export default class TransScene extends Scene {
} }
onTap_btn() { onTap_btn() {
if (iswx()) {
this['sharemask'].visible = true;
this['sharemask'].once(egret.TouchEvent.TOUCH_TAP, () => {
this['sharemask'].visible = false;
}, this);
return;
}
this['title'].visible = false; this['title'].visible = false;
this['btn'].visible = false; this['btn'].visible = false;
console.log('onTap_btn'); console.log('onTap_btn');
......
{ {
"code":null, "code": null,
"data":3, "data": {
"message":null, "inviterUserId": "500412018",
"success":true "inviteeUserId": "500412019",
"state": "3",
"inviterPhone": 123,
"inviteePhone": 456
},
"message": null,
"success": true
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment