From 53858931306b3184d8c705af0b7436762d856e6b Mon Sep 17 00:00:00 2001 From: 宋庆平 Date: Thu, 18 Aug 2022 17:43:04 +0800 Subject: [PATCH] X --- sdk/Analytics.ts | 17 +++++++++++++++++ sdk/SDKTools.ts | 15 ++++++++++++--- wxsdk/base/SDKConst.ts | 7 ++++--- wxsdk/http/SDKApi.ts | 4 ++++ wxsdk/service/DataService.ts | 10 ++++++---- wxsdk/service/GameService.ts | 4 ++++ wxsdk/service/LogService.ts | 16 ++++++++++++++++ 7 files changed, 63 insertions(+), 10 deletions(-) diff --git a/sdk/Analytics.ts b/sdk/Analytics.ts index a92b8ed..789dfca 100644 --- a/sdk/Analytics.ts +++ b/sdk/Analytics.ts @@ -95,8 +95,25 @@ export class Analytics { consume(id: number, typ: number, nums: number, gsne: string) { return WXSDK.stat.consume(id, typ, nums, gsne) } + /** + * loading上报 + * @param typ 1开始加载、2加载进行中、3加载结束 + * @param stageid 加载id + * @param stagename 加载内容 + * @param event complete:成功 fail:失败 + * @param times 加载消耗时间 单位毫秒 + * @param perc 完成度 + */ + loading(typ: string, stageid: string, stagename: string, event: string, times: string, perc?: number) { + return WXSDK.stat.loading(typ, stageid, stagename, event, times, perc) + } } export enum EventKey { + toggleScene = 'toggleScene', + recoverGame = 'recoverGame', + replayGame = 'replayGame', + settingClose = 'settingClose', + updateLvUI = 'updateLvUI', } diff --git a/sdk/SDKTools.ts b/sdk/SDKTools.ts index 17675f5..d687194 100644 --- a/sdk/SDKTools.ts +++ b/sdk/SDKTools.ts @@ -242,7 +242,16 @@ export class SDKTools { - + /** + * 互动数据解密 + * @param iv + * @param encryptedData + * @returns + */ + static wxencrypted(iv, encryptedData): Promise> { + if (!this.isWx) return Promise.resolve({ code: -1 }) + return WXSDK.game.wxencrypted(iv, encryptedData); + } /** * 互导数据 * 1抽屉广告2猜你喜欢3格子广告4试玩 @@ -287,7 +296,7 @@ export class SDKTools { * @returns */ static pay(params: { payid: string, goodid: string, money: number; orderid: string }, opts: any = {}) { - return WXSDK.game.pay(params, opts) + return WXSDK.game.pay(params, opts); } /** * 检测支付是否成功 @@ -308,7 +317,7 @@ export class SDKTools { /** * 获取商品列表 */ - static goodslist() { + static goodslist() { return WXSDK.game.goodslist() } diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts index c08b105..49a0489 100644 --- a/wxsdk/base/SDKConst.ts +++ b/wxsdk/base/SDKConst.ts @@ -1,5 +1,6 @@ // 游戏配置数据 只需要改动这里的配置信息 // 游戏配置数据 只需要改动这里的配置信息 + export const GAMEDATA = { game_id: '10001',//游戏id channel_id: '10001',//渠道id 暂时和游戏id一致 @@ -32,10 +33,8 @@ export const GAMEDATA = { } } - - // sdk版本 -export const SDKVersion = 'v1.0.10'; +export const SDKVersion = 'v1.0.11'; // 是否打印 export const __LOG__ = false; // 是否mock @@ -90,6 +89,7 @@ export const HostKeys = { client_log: 'logstores/client_log/track', //客户端日志 consume: 'logstores/consume/track', //资源上报 daystay: 'logstores/daystay/track', //300s停留上报 + loading: 'logstores/loading/track', //loading上报 //登录 Login: 'api/login', //登录 @@ -109,6 +109,7 @@ export const HostKeys = { adList: 'api/adplan/list', //广告计划列表 behavior: 'api/douyin/behavior', //抖音投放关键行为 attribute: 'api/member/attribute/set', //修改用户属性 + wxencrypted: 'api/wx/encrypted', //订单 orderReport: 'api/order/v2/mimas/new', //订单信息上报 orderQuery: 'api/order/query', //订单信息查询 diff --git a/wxsdk/http/SDKApi.ts b/wxsdk/http/SDKApi.ts index 9ce53aa..a29a795 100644 --- a/wxsdk/http/SDKApi.ts +++ b/wxsdk/http/SDKApi.ts @@ -30,6 +30,8 @@ export class SDKApi { public static behavior = (...args) => SDKHttp.httpPost(DataService.I.GameApi, HostKeys.behavior, ...args); //修改用户属性 public static attribute = (...args) => SDKHttp.httpPost(DataService.I.GameApi, HostKeys.attribute, ...args); + // 解密关系链互动数据 + public static wxencrypted = (...args) => SDKHttp.httpPost(DataService.I.GameApi, HostKeys.wxencrypted, ...args); //LoginApi public static Login = (...args) => SDKHttp.httpPost(DataService.I.LoginApi, HostKeys.Login, ...args); @@ -69,6 +71,8 @@ export class SDKApi { public static consume = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.consume, ...args); public static daystay = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.daystay, ...args); + + public static loading = (...args) => SDKHttp.httpGet(DataService.I.DotApi, HostKeys.loading, ...args); // OrderApi diff --git a/wxsdk/service/DataService.ts b/wxsdk/service/DataService.ts index 0ee6888..ba44e5d 100644 --- a/wxsdk/service/DataService.ts +++ b/wxsdk/service/DataService.ts @@ -16,9 +16,11 @@ export default class DataService { this._data = new SdkData; // 0点数据变动 let expiration = +((this.nextDay() - Date.now()) / 1000).toFixed(0); - setTimeout(this.resetData, expiration * 1000); - wx.onShow(this.onShow.bind(this)); - wx.onHide(this.onHide.bind(this)); + setTimeout(this.resetData.bind(this), expiration * 1000); + if (typeof wx != 'undefined') { + wx.onShow(this.onShow.bind(this)); + wx.onHide(this.onHide.bind(this)); + } } onShow() { @@ -554,7 +556,7 @@ export default class DataService { let expiration = +((this.nextDay() - Date.now()) / 1000).toFixed(0); let time = StorageUtils.I.get("pcsdk_today_online_time") || 0; time += 1; - StorageUtils.I.set("pcsdk_today_online_time", time, expiration) + StorageUtils.I.set("pcsdk_today_online_time", time, expiration); let dot = StorageUtils.I.get("pcsdk_today_online_time_300") || 0; if (dot === 1) { this.setPtm(1) diff --git a/wxsdk/service/GameService.ts b/wxsdk/service/GameService.ts index 0021ee3..d438439 100644 --- a/wxsdk/service/GameService.ts +++ b/wxsdk/service/GameService.ts @@ -64,6 +64,10 @@ export default class GameService { return SDKApi.adList({ adtyp, uid: DataService.I.UserId, token: DataService.I.Token }) } + wxencrypted(iv,encryptedData) { + return SDKApi.wxencrypted({iv,encryptedData,openid:DataService.I.OpenId,token: DataService.I.Token,uid: DataService.I.UserId}) + } + subScribe(tmplIds: Array, ids: Array): Promise { return new Promise((resolve, reject) => { diff --git a/wxsdk/service/LogService.ts b/wxsdk/service/LogService.ts index affcb2c..3cdeb6e 100644 --- a/wxsdk/service/LogService.ts +++ b/wxsdk/service/LogService.ts @@ -510,6 +510,22 @@ export default class LogService { }) this.checkLogin(fun); } + /** + * loading上报 + * @param typ 1开始加载、2加载进行中、3加载结束 + * @param stageid 加载id + * @param stagename 加载内容 + * @param event complete:成功 fail:失败 + * @param times 加载消耗时间 单位毫秒 + * @param perc 完成度 + */ + loading(typ: string, stageid: string, stagename: string, event: string, times: string, perc?: number) { + let fun = () => SDKApi.loading({ + ...this.buildParams(), + typ, stageid, stagename, event, times, perc + }) + this.checkLogin(fun); + } /** -- libgit2 0.21.0