diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts index f6dfa62..1d9df45 100644 --- a/wxsdk/base/SDKConst.ts +++ b/wxsdk/base/SDKConst.ts @@ -35,7 +35,7 @@ export const GAMEDATA = { // sdk版本 -export const SDKVersion = 'v1.0.16'; +export const SDKVersion = 'v1.0.17'; // 是否打印 export const __LOG__ = false; // 是否mock diff --git a/wxsdk/lib/sdk.d.ts b/wxsdk/lib/sdk.d.ts index 170b55f..f913d9b 100644 --- a/wxsdk/lib/sdk.d.ts +++ b/wxsdk/lib/sdk.d.ts @@ -384,7 +384,8 @@ interface _LoginInnerData { logindays?:number amount?:number, pon?:number, - ptm?:number + ptm?:number, + ad_info?:string, } /** diff --git a/wxsdk/service/DataService.ts b/wxsdk/service/DataService.ts index ba44e5d..e9fc71f 100644 --- a/wxsdk/service/DataService.ts +++ b/wxsdk/service/DataService.ts @@ -92,6 +92,9 @@ export default class DataService { if (data.hasOwnProperty('ptm')) this.setPtm(data.ptm); + if (data.hasOwnProperty('ad_info')) + this.setAdInfo(data.ad_info); + } get expice() { @@ -499,6 +502,24 @@ export default class DataService { this.setValue('request_id', request_id) return this; } + setAdInfo(val) { + if (val && val != "" && val != "{}") { + try { + val = JSON.parse(val); + } catch (error) { + val = {}; + console.error('setAdInfo error', val, error); + } + }else{ + val = {}; + } + this.setValue('ad_info', val) + return this; + } + setLaunchAdInfo(val) { + this.setValue('launch_ad_info', val) + return this; + } get IsCross(): boolean { return this._data.isCross; diff --git a/wxsdk/service/LogService.ts b/wxsdk/service/LogService.ts index 3cdeb6e..f597d85 100644 --- a/wxsdk/service/LogService.ts +++ b/wxsdk/service/LogService.ts @@ -549,6 +549,10 @@ export default class LogService { let amount = DataService.I.amount; let pon = DataService.I.pon; let ptm = DataService.I.ptm; + let account_id = DataService.I.Data.ad_info.account_id; + let adgroup_id = DataService.I.Data.ad_info.adgroup_id; + let creative_id = DataService.I.Data.ad_info.creative_id; + let strategy = DataService.I.Data.ad_info.strategy; return { gameid, channel, @@ -566,7 +570,11 @@ export default class LogService { amount, pon, pkv, - ptm + ptm, + account_id, + adgroup_id, + creative_id, + strategy }; } diff --git a/wxsdk/service/entity/SdkData.ts b/wxsdk/service/entity/SdkData.ts index 999cba4..081cc9f 100644 --- a/wxsdk/service/entity/SdkData.ts +++ b/wxsdk/service/entity/SdkData.ts @@ -44,6 +44,8 @@ export default class SdkData { public creative_id: string; // 创意ID public advertister_id: string; // 广告账户ID public request_id: string; // 请求下发ID + public launch_ad_info:any; // 启动广告信息 + public ad_info: any; // 玩家广告信息 constructor() { @@ -89,6 +91,8 @@ export default class SdkData { this.creative_id = ''; this.advertister_id = ''; this.request_id = ''; + this.launch_ad_info = {}; + this.ad_info ={}; } } diff --git a/wxsdk/wx/WxInit.ts b/wxsdk/wx/WxInit.ts index 8618ae5..e62aa53 100644 --- a/wxsdk/wx/WxInit.ts +++ b/wxsdk/wx/WxInit.ts @@ -43,8 +43,15 @@ export default class WxInit { ad_id, creative_id, advertister_id, - request_id + request_id, // 抖音投放相关信息 end + + + // account_id,//账户ID + adgroup_id,//广告ID + strategy,//策略ID + // creative_id,//创意ID + } = query; let fromChannel = channelId || channel_id || channel || td_channelid; @@ -85,6 +92,7 @@ export default class WxInit { .setCreativeId(creative_id) .setAdvertisterId(advertister_id) .setRequestId(request_id) + .setLaunchAdInfo({account_id,adgroup_id,creative_id,strategy}) //clue_token=clue_token123&creative_id=creative_id213&ad_id=ad_id9999&request_id=request_id456&advertister_id=advertister_id9876 // 设置网络类型 WxApi.I.getNetworkType() diff --git a/wxsdk/wx/WxLogin.ts b/wxsdk/wx/WxLogin.ts index db79da2..5c3fc6b 100644 --- a/wxsdk/wx/WxLogin.ts +++ b/wxsdk/wx/WxLogin.ts @@ -94,7 +94,7 @@ export default class WxLogin { if (data) { // 设置登录信息 if (data.data) { - let { channel, uid, firstlogin, token, reftoken, openid, expire, isnew, gameconfig, logindays, amount, pon } = data.data; + let { channel, uid, firstlogin, token, reftoken, openid, expire, isnew, gameconfig, logindays, amount, pon,ad_info } = data.data; LogService.I.setLogind({ channel, userId: uid, @@ -106,7 +106,8 @@ export default class WxLogin { expire, logindays, amount, - pon + pon, + ad_info }); OnlineService.I.setData(gameconfig) LogService.I.active(); @@ -144,6 +145,7 @@ export default class WxLogin { let creative_id = DataService.I.Data.creative_id; let advertister_id = DataService.I.Data.advertister_id; let request_id = DataService.I.Data.request_id; + let ad_info = JSON.stringify(DataService.I.Data.launch_ad_info); return { channel, brand, @@ -159,7 +161,8 @@ export default class WxLogin { clue_token, creative_id, advertister_id, - request_id + request_id, + ad_info }; } -- libgit2 0.21.0