Skip to content

X
xiaoxiaole
Commit 8fb9fb12 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 0ccf3ac4
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 130 deletions
egret/index.html
View file @ 8fb9fb12
......@@ -40,30 +40,30 @@
</head>
<body>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750"
data-content-height="1624" data-multi-fingered="2" data-show-fps="false" data-show-log="true"
data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div>
</div>
<script src="libs/modules/egret/egret.js"></script>
<script src="libs/modules/egret/egret.web.js"></script>
<script src="libs/modules/eui/eui.js"></script>
<script src="libs/modules/assetsmanager/assetsmanager.js"></script>
<script src="libs/modules/tween/tween.js"></script>
<script src="libs/zepto.min.js"></script>
<script src="libs/security.js"></script>
<script src="libs/downloadApp.js"></script>
<script src="libs/svga.egret.min2.js"></script>
<script src="libs/aes.js"></script>
<script src="libs/pad-zeropadding.js"></script>
<!-- 复制口令苏宁提供的js，线上需要添加 -->
<script src="https://yun.dui88.com/DS-tech/dtt_tech/suning/snShare.min.js"></script>
<!-- //线上不需要 -->
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
<script>
window.fresp=0.00001;
<script src="libs/modules/egret/egret.js"></script>
<script src="libs/modules/egret/egret.web.js"></script>
<script src="libs/modules/eui/eui.js"></script>
<script src="libs/modules/assetsmanager/assetsmanager.js"></script>
<script src="libs/modules/tween/tween.js"></script>
<script src="libs/zepto.min.js"></script>
<script src="libs/security.js"></script>
<script src="libs/downloadApp.js"></script>
<script src="libs/svga.egret.min2.js"></script>
<script src="libs/aes.js"></script>
<script src="libs/pad-zeropadding.js"></script>
<!-- 复制口令苏宁提供的js，线上需要添加 -->
<script src="https://yun.dui88.com/DS-tech/dtt_tech/suning/snShare.min.js"></script>
<!-- //线上不需要 -->
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
<script>
window.fresp = 0.00001;
// localStorage.clear();
window['testUrl'] = 'http://cuxiaoprexg.m.cnsuning.com/scms/cx521.html?activityId=SL446689024459878400&subactivityId=SUB446689681678090240&businessid=cx521';
window['hbRainTime'] = 30; // 红包雨倒计时
......@@ -94,7 +94,7 @@
console.log(shareApi.callMediaShare);
shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
}
}
}
function isIphone() {
var ua = navigator.userAgent.toLocaleLowerCase();
if (ua.match(/iphone|ipad/)) {
......@@ -209,8 +209,10 @@
<script src="output.js"></script>
<script>
const SAUP = () => {
window['SAUP'] = {
sendLogData: (click,p) => {
console.log('发送买点',p.sapmodid,p.eleid)
}
}
</script>
</body>
......
egret/libs/tw/manager/NetManager.ts
View file @ 8fb9fb12
......@@ -10,6 +10,8 @@ import { IExposureData } from '../data/common/IExposureData';
import { GDispatcher } from '../../tc/util/GDispatcher';
import onNotSuccess from '../../new_wx/onNotSuccess';
import { showToast } from '../../new_wx/ctrls/toastCtrl';
import SAUP_sendLogData from '../../../src/SAUP_sendLogData';
import SAMap from '../../../src/SAMap';
// import { IExposureData } from '..';
......@@ -17,7 +19,7 @@ export class NetManager extends ABNetManager {
private static instance: NetManager;
public static get ins(): NetManager {
if(!this.instance) {
if (!this.instance) {
this.instance = new NetManager();
}
return this.instance;
......@@ -27,7 +29,7 @@ export class NetManager extends ABNetManager {
constructor() {
super();
if(this.isInit) {
if (this.isInit) {
throw Error(TwLang.lang_001);
}
this.isInit = true;
......@@ -98,7 +100,7 @@ export class NetManager extends ABNetManager {
*/
public addTimesForActivity(callback: Function, type: number, count: number, validType: number): void {
let activityId: number;
if(type == 1) {
if (type == 1) {
activityId = DataManager.ins.gameCfgData.gameInfo.oaId;
} else {
activityId = DataManager.ins.customCfgData.oaId;
......@@ -108,7 +110,7 @@ export class NetManager extends ABNetManager {
addCount: count,
activityId: activityId
};
if(validType) {
if (validType) {
param.validType = validType;
}
......@@ -149,15 +151,15 @@ export class NetManager extends ABNetManager {
public openCollectGoodsPrize(callback: Function, collectRuleId: number, type?: number): void {
let actId: number;
let param: any;
if(type == 1) {
if (type == 1) {
actId = DataManager.ins.gameCfgData.gameInfo.oaId;
} else if(type == 2) {
} else if (type == 2) {
actId = DataManager.ins.customCfgData.oaId;
}
if(type) {
param = {collectRuleId: collectRuleId, actId: actId}
if (type) {
param = { collectRuleId: collectRuleId, actId: actId }
} else {
param = {collectRuleId: collectRuleId};
param = { collectRuleId: collectRuleId };
}
const net: INetData = {
name: NetName.OPEN_COLLECT,
......@@ -238,7 +240,7 @@ export class NetManager extends ABNetManager {
uri: '/summer/getToyInfo',
type: 'get',
dataType: 'json',
param: {operatingActivityId: operatingActivityId},
param: { operatingActivityId: operatingActivityId },
callback: callback
};
this.send(net);
......@@ -254,7 +256,7 @@ export class NetManager extends ABNetManager {
public doStart(callback: Function, isAgain: boolean, credits?: number, customizedType?: number): void {
let addUrl = '';
if(isAgain) {
if (isAgain) {
addUrl += '?dpm=' + DataManager.ins.gameGetSubmitResultData.againExposure.dpm;
}
......@@ -263,11 +265,11 @@ export class NetManager extends ABNetManager {
oaId: DataManager.ins.gameCfgData.gameInfo.oaId
};
if(credits) {
if (credits) {
param.credits = credits;
}
if(customizedType) {
if (customizedType) {
param.customizedType = customizedType;
}
......@@ -294,7 +296,7 @@ export class NetManager extends ABNetManager {
const param: any = {
ticketId: ticketId
};
if(customizedType) {
if (customizedType) {
param.customizedType = customizedType
}
......@@ -421,7 +423,7 @@ export class NetManager extends ABNetManager {
sgin: sign,
dynamicData: JSON.stringify(dynamicData)
};
if(rankId) {
if (rankId) {
param.rankId = rankId;
}
const net: INetData = {
......@@ -441,7 +443,7 @@ export class NetManager extends ABNetManager {
kk = kk.substring(0, 16);
//补0；
var len = kk.length;
while(len < 16) {
while (len < 16) {
kk = kk + "0";
len++;
}
......@@ -476,7 +478,7 @@ export class NetManager extends ABNetManager {
deviceSessionId: window['_device_session_id'],
score: score
};
if(relatedTaskType) {
if (relatedTaskType) {
data['relatedTaskType'] = relatedTaskType;
}
var sgin = this.encrypt(JSON.stringify(data));
......@@ -572,10 +574,10 @@ export class NetManager extends ABNetManager {
sgin: sign,
dynamicData: dynamicData
};
if(checkScore) {
if (checkScore) {
param.checkScore = checkScore;
}
if(customizedType) {
if (customizedType) {
param.customizedType = customizedType;
}
......@@ -833,7 +835,7 @@ export class NetManager extends ABNetManager {
this.send(net);
}
public getShareInfo(callback: Function,): void {
public getShareInfo(callback: Function, ): void {
const net: INetData = {
name: 'getShareInfo',
uri: window['duiba'] + '/wechatShare/getShareInfo/v2',
......@@ -932,7 +934,7 @@ export class NetManager extends ABNetManager {
activityId: DataManager.ins.customCfgData.actId
};
if(propType) {
if (propType) {
d.propType = propType;
}
const net: INetData = {
......@@ -993,7 +995,7 @@ export class NetManager extends ABNetManager {
uri: window['duiba'] + '/customActivity/happyclear/getBackReward',
type: 'get',
dataType: 'json',
hideMsg:true,
hideMsg: true,
param: d,
callback: callback
};
......@@ -1006,7 +1008,7 @@ export class NetManager extends ABNetManager {
uri: window['duiba'] + '/customActivity/happyclear/hasBackReward',
type: 'get',
dataType: 'json',
hideMsg:true,
hideMsg: true,
param: d,
callback: callback
};
......@@ -1061,9 +1063,9 @@ export class NetManager extends ABNetManager {
public getMusicCategory(callback: Function, categoryID?: number, categoryCode?, liteVersion?): void {
const data: any = {};
if(categoryID) data.categoryID = categoryID;
if(categoryCode) data.categoryCode = categoryCode;
if(liteVersion) data.liteVersion = liteVersion;
if (categoryID) data.categoryID = categoryID;
if (categoryCode) data.categoryCode = categoryCode;
if (liteVersion) data.liteVersion = liteVersion;
const net: INetData = {
name: 'getMusicCategory',
uri: '/aaw/music/category',
......@@ -1098,8 +1100,8 @@ export class NetManager extends ABNetManager {
public getMusicItem(callback: Function, songListId, itemId): void {
const data: any = {};
if(itemId) data.itemId = itemId;
if(songListId) data.songListId = songListId;
if (itemId) data.itemId = itemId;
if (songListId) data.songListId = songListId;
const net: INetData = {
name: 'getMusicItem',
uri: '/aaw/music/item',
......@@ -1154,10 +1156,10 @@ export class NetManager extends ABNetManager {
activityType: 'hdtool',
consumerId: window['CFG'].consumerId
};
if(credits) {
if (credits) {
param.credits = credits;
}
if(collectRuleId) {
if (collectRuleId) {
param.collectRuleId = collectRuleId;
}
const net: INetData = {
......@@ -1851,7 +1853,7 @@ export class NetManager extends ABNetManager {
* @param net
*/
public getToken(net: INetData): void {
if(window['getDuibaToken']) {
if (window['getDuibaToken']) {
window['getDuibaToken']((tokenObj: any) => {
net.param.token = tokenObj.token;
this.send(net);
......@@ -1882,12 +1884,12 @@ export class NetManager extends ABNetManager {
let gTime: string = '?_=' + GTime.getTimestamp();
let realUrl: string = net.uri;
if(realUrl.indexOf('?') != -1) {
if (realUrl.indexOf('?') != -1) {
gTime = '&_=' + GTime.getTimestamp();
}
//url加参数等特殊需求（例如再玩一次需要在dostart接口的url上加埋点）
if(net.addUrl) {
if (net.addUrl) {
realUrl += net.addUrl;
}
......@@ -1953,6 +1955,8 @@ export class NetManager extends ABNetManager {
* @param {IExposureData} exposure
*/
public clickLog(exposure: IExposureData): void {
const __area__ = exposure['__area__'];
delete exposure['__area__'];
const net: INetData = {
name: 'clickLog',
uri: window['duiba'] + '/log/click',
......@@ -1963,6 +1967,11 @@ export class NetManager extends ABNetManager {
hideMsg: true
};
this.send(net);
if (SAMap[__area__])
SAUP_sendLogData(SAMap[__area__]);
else
console.warn('苏宁埋点未配置')
}
/**
......@@ -2009,33 +2018,33 @@ export class NetManager extends ABNetManager {
* @param result 结果
*/
protected onResponse(net: INetData, result: any): void {
if(net.name == 'hc_home') {
if (net.name == 'hc_home') {
// if(result.data.refectionCountdown==null)
// result.data.refectionCountdown==0;
if(result.data.refectionCountdown == 0)
if (result.data.refectionCountdown == 0)
result.data.refectionCountdown = 5;
result.data.refectionCountdown += Math.floor(new Date().getTime() / 1000);
}
//数据处理
const data: Data = DataManager.ins.updateData(net.name, result, net.param);
//接口成功
if(net.pollingCount && net.pollingCheck(data)) {
if (net.pollingCount && net.pollingCheck(data)) {
net.pollingCount -= 1;
//轮询接口特殊处理
setTimeout(() => {
this.send(net);
}, 500);
} else if(net.callback) {
if(net.pollingCheck && net.pollingCount == 0 && net.pollingCheck(data)) {
} else if (net.callback) {
if (net.pollingCheck && net.pollingCount == 0 && net.pollingCheck(data)) {
result.message = '系统异常，请稍后再试。';
data['success'] = false;
}
net.callback(data.success, data || result);
}
if(!data.success && !net.hideMsg) {
if (!data.success && !net.hideMsg) {
GDispatcher.dispatchEvent(ABNetManager.ERROR, net, result.message || result.desc || result.msg);
}
if(!data.success && !net.hideMsg) {
if (!data.success && !net.hideMsg) {
onNotSuccess(data, net.name)
}
}
......@@ -2048,11 +2057,11 @@ export class NetManager extends ABNetManager {
* @param message
*/
protected onError(net: INetData): void {
if(net.callback) {
if (net.callback) {
net.callback(false);
}
if(!net.hideMsg) {
if (!net.hideMsg) {
GDispatcher.dispatchEvent(ABNetManager.ERROR, net);
showToast('网络开小差了，再试一次吧');
console.log('接口错误', net.uri)
......
egret/src/Main.ts
View file @ 8fb9fb12
......@@ -7,7 +7,9 @@ class Main extends MainBase {
export const getlogItem = (i) =>{
const Dpm = Buried.connectDpm(110, i, 1); // 点击埋点
const Dcm = Buried.connectDcm(202, 0, 0); // 曝光埋点
return Buried.createExposure(Dpm, Dcm);
const obj = Buried.createExposure(Dpm, Dcm);
obj['__area__'] = i;
return obj;
}
window['Main'] = Main;
......
egret/src/SA.ts deleted 100644 → 0
View file @ 0ccf3ac4
export default () => {
try {
window['SAUP'].sendLogData("click", {
tag: '',   // 必传；如果需要传拓展的信息，在tag中加一个sa-data，将需要传的内容用json格式传到sa-data
sapmodid: "请写入产品提供的 modid",    // 必传；区块编码
eleid: "请写入产品提供的 eleid"        // 必传；坑位编码
});
//这里的this必须传dom节点
} catch (e) { }
}
egret/src/SAMap.ts 0 → 100644
View file @ 8fb9fb12
export default {
'1': ['bingoMapIndex', 'bingoBox'],
'2': ['bingoMapIndex', 'bingoLife'],
'5': ['bingoMapIndex', 'bingoProp'],
'19': ['bingoMapIndex', 'bingoLevel'],
'32': ['bingoMapIndex', 'bingoIndexAd'],
'33': ['bingoMapIndex', 'bingoInvite'],
'67': ['bingoMapIndex', 'bingoCoin'],
'62': ['bingoMapIndex', 'bingoGetCoin'],
'77': ['bingoMapIndex', 'bingoRedBattle'],
'57': ['bingoMapIndex', 'bingoRedPacket'],
'74': ['bingoMapIndex', 'bingoRedBoom'],
'888001': ['bingoMapIndex', 'bingoLottery'],
'888006': ['bingoMapIndex', 'bingoGetRed'],
'30': ['bingoDialog', 'bingoLifeBuy'],
'4': ['bingoDialog', 'bingoLifeAsk'],
'6': ['bingoDialog', 'bingoBoomBuy'],
'8': ['bingoDialog', 'bingoBoomCfm'],
'9': ['bingoDialog', 'bingoHammerBuy'],
'12': ['bingoDialog', 'bingoStepBuy'],
'14': ['bingoDialog', 'bingoStepCfm'],
}
\ No newline at end of file
egret/src/SAUP_sendLogData.ts 0 → 100644
View file @ 8fb9fb12
import { elementMonsterResMap } from "./something/enum/ElementType";
const elem = document.createElement('div');
/**
* @param sapmodid 区块编码
* @param eleid 坑位编码
*/
export default ([sapmodid, eleid], saData = {}) => {
try {
elem.setAttribute('sa-data', JSON.stringify(saData));
if (window['SAUP'] && window['SAUP'].sendLogData) {
window['SAUP'].sendLogData("click", {
tag: elem,   // 必传；如果需要传拓展的信息，在tag中加一个sa-data，将需要传的内容用json格式传到sa-data
sapmodid: sapmodid,    // 必传；区块编码
eleid: eleid       // 必传；坑位编码
});
}else {
console.warn('苏宁买点api错误')
}
elem.setAttribute('sa-data', '{}');
} catch (e) { }
}
egret/src/mapScene/MapScene.ts
View file @ 8fb9fb12
......@@ -296,7 +296,7 @@ export default class MapScene extends Scene {
console.log('必须通关前面的关卡才能开启本关');
} else
PanelCtrl.instance.show('StartPanel', key);
NetManager.ins.clickLog(getlogItem(19))
NetManager.ins.clickLog(getlogItem(19));
}, this);
}
}
......@@ -988,6 +988,7 @@ export default class MapScene extends Scene {
this['musicBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_music, this);
this['recordBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
PanelCtrl.instance.show('bag');
NetManager.ins.clickLog(getlogItem(5));
}, this);
// 消消乐查询信息
......@@ -1115,7 +1116,7 @@ export default class MapScene extends Scene {
onTap_shopBtn() {
PanelCtrl.instance.show('Shop');
NetManager.ins.clickLog(getlogItem(5));
// NetManager.ins.clickLog(getlogItem(5));
}
toggleSettings() {
......
egret/src/mapScene/icon/ScratchIcon.ts
View file @ 8fb9fb12
......@@ -71,6 +71,7 @@ export default class ScratchIcon extends IconBase {
*/
protected onTouchBtn(e: egret.TouchEvent) {
super.onTouchBtn(e);
NetManager.ins.clickLog(getlogItem(888006));
NetManager.ins.showLog(getlogItem(49));
NetManager.ins.scratchGetTaskInfo((success, res) => {
if(!success) {
......
egret/src/mapScene/icon/TurntableIcon.ts
View file @ 8fb9fb12
......@@ -58,7 +58,8 @@ export default class TurntableIcon extends IconBase {
super.onTouchBtn(e);
loadSvga(getResPath() + 'resource/assets/svgas/turntable.svga').then(async (mv: any) => {
// await wait(100);
PanelCtrl.instance.show('turnTable', {mv:mv})
PanelCtrl.instance.show('turnTable', {mv:mv});
NetManager.ins.clickLog(getlogItem(888001));
})
}
......
mock/happyclear/hbRainBaseInfo.json
View file @ 8fb9fb12
......@@ -5,8 +5,18 @@
"timestamp": 1573210800000,
"data": {
"currentRemainTimes": 0,
"currentSession": null,
"nextSession": null,
"canJoin": false
"currentSession": {
"sessionIndex": 6,
"startTime": 1573210800000,
"endTime": 1573299903000,
"limitScore": 10
},
"nextSession": {
"sessionIndex": 10,
"startTime": 1573440915952,
"endTime": 1573299903000,
"limitScore": 10
},
"canJoin": true
}
}
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