From f4900f893ff79f5cf914b20affe2cea8fde6d50a Mon Sep 17 00:00:00 2001 From: 宋庆平 Date: Mon, 9 May 2022 12:17:55 +0800 Subject: [PATCH] X --- sdk/Analytics.ts | 21 +++++++++++++++------ wxsdk/base/SDKConst.ts | 1 + wxsdk/http/SDKApi.ts | 2 ++ wxsdk/http/SDKHttp.ts | 2 +- wxsdk/lib/sdk.d.ts | 2 +- wxsdk/service/DataService.ts | 1 + wxsdk/service/LogService.ts | 31 +++++++++++++++++++++++++++++++ wxsdk/utils/SignUtils.ts | 2 +- wxsdk/wx/WxInterstitial.ts | 2 +- 9 files changed, 54 insertions(+), 10 deletions(-) diff --git a/sdk/Analytics.ts b/sdk/Analytics.ts index 1df252d..147e406 100644 --- a/sdk/Analytics.ts +++ b/sdk/Analytics.ts @@ -1,3 +1,4 @@ +import { LogLevel } from "../wxsdk/service/LogService"; import WXSDK from "../wxsdk/WXSDK"; @@ -77,11 +78,19 @@ export class Analytics { return WXSDK.stat.levelEnd(stageid, stagename, pattern, event, times, perc) } + + + /** + * 客户端日志 + * @param content 内容 + * @param level 日志等级 + * @returns + */ + clientLog(content, level = LogLevel.debug) { + return WXSDK.stat.clientLog(content, level) + } + + } export enum EventKey { - toggleScene = 'toggleScene', - recoverGame = 'recoverGame', - replayGame = 'replayGame', - settingClose = 'settingClose', - updateLvUI = 'updateLvUI', -} \ No newline at end of file +} diff --git a/wxsdk/base/SDKConst.ts b/wxsdk/base/SDKConst.ts index 8e640fd..6bd9d64 100644 --- a/wxsdk/base/SDKConst.ts +++ b/wxsdk/base/SDKConst.ts @@ -76,6 +76,7 @@ export const HostKeys = { jumps: 'logstores/jumps/track', //游戏跳转 level: 'logstores/level/track', //关卡打点 role: 'logstores/role/track', //创建角色 + client_log: 'logstores/client_log/track', //客户端日志 //登录 Login: 'api/login', //登录 diff --git a/wxsdk/http/SDKApi.ts b/wxsdk/http/SDKApi.ts index 9a5f9f8..256ad30 100644 --- a/wxsdk/http/SDKApi.ts +++ b/wxsdk/http/SDKApi.ts @@ -60,6 +60,8 @@ export class SDKApi { public static level = (...args) => SDKHttp.httpGet(`${DataService.I.DotApi}${HostKeys.level}`, ...args); public static role = (...args) => SDKHttp.httpGet(`${DataService.I.DotApi}${HostKeys.role}`, ...args); + + public static client_log = (...args) => SDKHttp.httpGet(`${DataService.I.DotApi}${HostKeys.client_log}`, ...args); public static pay = (...args) => SDKHttp.httpPost(`${DataService.I.OrderApi}${HostKeys.orderReport}`, ...args); diff --git a/wxsdk/http/SDKHttp.ts b/wxsdk/http/SDKHttp.ts index f44b3e6..faa4ac5 100644 --- a/wxsdk/http/SDKHttp.ts +++ b/wxsdk/http/SDKHttp.ts @@ -25,7 +25,7 @@ export default class SDKHttp { if (data && typeof data === "object") { data = JSON.stringify(data); } - // console.error("sign", url, JSON.stringify(data)) + //console.error("sign", url, JSON.stringify(data)) data = data || ""; if (method == "GET" && data != "") { data = JSON.parse(data); diff --git a/wxsdk/lib/sdk.d.ts b/wxsdk/lib/sdk.d.ts index fa4ee08..49446f7 100644 --- a/wxsdk/lib/sdk.d.ts +++ b/wxsdk/lib/sdk.d.ts @@ -721,4 +721,4 @@ interface _adStat { reg_time: number, // 类型 默认0 type: number, -} \ No newline at end of file +} diff --git a/wxsdk/service/DataService.ts b/wxsdk/service/DataService.ts index cd27a8a..a8019ca 100644 --- a/wxsdk/service/DataService.ts +++ b/wxsdk/service/DataService.ts @@ -146,6 +146,7 @@ export default class DataService { setUserId(val: any) { this.setValue('userId', val); + StorageUtils.I.set("userId",val); return this; } diff --git a/wxsdk/service/LogService.ts b/wxsdk/service/LogService.ts index fe830ff..9c253ff 100644 --- a/wxsdk/service/LogService.ts +++ b/wxsdk/service/LogService.ts @@ -443,6 +443,19 @@ export default class LogService { }) this.checkLogin(fun); } + /** + * 客户端日志 + */ + clientLog(content, level = LogLevel.debug) { + SDKApi.client_log({ + APIVersion: '0.6.0', + gameid: GAMEDATA.game_id, + cacheUserId: StorageUtils.I.get("userId") || "0", + level: LogLevel[level], + content + // level: + }) + } /** @@ -483,4 +496,22 @@ export default class LogService { static get I(): LogService { return this.instance || (this.instance = new LogService()); } +} + + + +/** + * 日志等级 + * debug：详细的信息,通常只出现在诊断问题上 + info：确认一切按预期运行 + warning：一个迹象表明,一些意想不到的事情发生了 + error：更严重的问题,软件没能执行一些功能 + critical：一个严重的错误,这表明程序本身可能无法继续运行 + */ +export enum LogLevel { + debug, + info, + warning, + error, + critical } \ No newline at end of file diff --git a/wxsdk/utils/SignUtils.ts b/wxsdk/utils/SignUtils.ts index a236b0f..aab95bf 100644 --- a/wxsdk/utils/SignUtils.ts +++ b/wxsdk/utils/SignUtils.ts @@ -11,7 +11,7 @@ export default class SignUtils { createSign(params: any) { let signStr = this.createQuery(params) + '' + GAMEDATA.appkey; - // console.error("signStr",signStr) + //console.error("signStr",signStr) return Md5.hashStr(signStr); } diff --git a/wxsdk/wx/WxInterstitial.ts b/wxsdk/wx/WxInterstitial.ts index 5e18d11..0bb9874 100644 --- a/wxsdk/wx/WxInterstitial.ts +++ b/wxsdk/wx/WxInterstitial.ts @@ -38,8 +38,8 @@ export default class WxInterstitial { WxInterstitial.interstitialSuccell = true; LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.rt) if (isShow) { - this.interstitialAd.show() LogService.I.adStat('InterstitialAd', this.interstitialAdId, DOT_AD_TYPE.interstitial, DOT_AD_STATUS.show) + this.interstitialAd.show() } }) this.interstitialAd.onError(err => { -- libgit2 0.21.0