From 128783c4bd095214fe07ca38300e84227f1dfce9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 9 Nov 2022 09:58:10 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20GA=20=E7=BB=9F=E8=AE=A1=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=90=8C=E6=AD=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/types/index.d.ts | 1 + app/src/util/assets.ts | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 70b07519f..83faf1854 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -332,6 +332,7 @@ declare interface IConfig { stat: string interval: number cloudName: string + provider: number }, lang: string api: { diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts index 2645b472a..eaff33424 100644 --- a/app/src/util/assets.ts +++ b/app/src/util/assets.ts @@ -136,16 +136,22 @@ export const addGA = () => { const para = { version: Constants.SIYUAN_VERSION, container: window.siyuan.config.system.container, - isLoggedIn: "false", - subscriptionStatus: "-1", - subscriptionPlan: "-1", - subscriptionType: "-1", + isLoggedIn: false, + subscriptionStatus: -1, + subscriptionPlan: -1, + subscriptionType: -1, + syncEnabled: false, + syncProvider: -1, }; if (window.siyuan.user) { - para.isLoggedIn = "true"; - para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus.toString(); - para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan.toString(); - para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType.toString(); + para.isLoggedIn = true; + para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus; + para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan; + para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType; + } + if (window.siyuan.config.sync) { + para.syncEnabled = window.siyuan.config.sync.enabled; + para.syncProvider = window.siyuan.config.sync.provider; } gtag("event", Constants.ANALYTICS_EVT_ON_GET_CONFIG, para); }