更新投放字段

宋庆平
1 parent e682ab1b
Showing 7 changed files with 52 additions and 7 deletions Show diff stats
wxsdk/base/SDKConst.ts
wxsdk/lib/sdk.d.ts
wxsdk/service/DataService.ts
wxsdk/service/LogService.ts
wxsdk/service/entity/SdkData.ts
wxsdk/wx/WxInit.ts
wxsdk/wx/WxLogin.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
@@ -384,7 +384,8 @@ interface _LoginInnerData {
     logindays?:number
     amount?:number,
     pon?:number,
-    ptm?:number
+    ptm?:number,
+    ad_info?:string,
 }
 /**
@@ -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;
@@ -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
         };
     }
@@ -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 ={};
     }
 }
@@ -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()
@@ -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
         };
     }
	@@ -35,7 +35,7 @@ export const GAMEDATA = {		@@ -35,7 +35,7 @@ export const GAMEDATA = {
35		35
36		36
37	// sdk版本	37	// sdk版本
38	-export const SDKVersion = 'v1.0.16';	38	+export const SDKVersion = 'v1.0.17';
39	// 是否打印	39	// 是否打印
40	export const __LOG__ = false;	40	export const __LOG__ = false;
41	// 是否mock	41	// 是否mock
	@@ -92,6 +92,9 @@ export default class DataService {		@@ -92,6 +92,9 @@ export default class DataService {
92	if (data.hasOwnProperty('ptm'))	92	if (data.hasOwnProperty('ptm'))
93	this.setPtm(data.ptm);	93	this.setPtm(data.ptm);
94		94
		95	+ if (data.hasOwnProperty('ad_info'))
		96	+ this.setAdInfo(data.ad_info);
		97	+
95	}	98	}
96		99
97	get expice() {	100	get expice() {
	@@ -499,6 +502,24 @@ export default class DataService {		@@ -499,6 +502,24 @@ export default class DataService {
499	this.setValue('request_id', request_id)	502	this.setValue('request_id', request_id)
500	return this;	503	return this;
501	}	504	}
		505	+ setAdInfo(val) {
		506	+ if (val && val != "" && val != "{}") {
		507	+ try {
		508	+ val = JSON.parse(val);
		509	+ } catch (error) {
		510	+ val = {};
		511	+ console.error('setAdInfo error', val, error);
		512	+ }
		513	+ }else{
		514	+ val = {};
		515	+ }
		516	+ this.setValue('ad_info', val)
		517	+ return this;
		518	+ }
		519	+ setLaunchAdInfo(val) {
		520	+ this.setValue('launch_ad_info', val)
		521	+ return this;
		522	+ }
502		523
503	get IsCross(): boolean {	524	get IsCross(): boolean {
504	return this._data.isCross;	525	return this._data.isCross;