🚨

app/src/assets/template/app/index.tpl

@@ -32,15 +32,5 @@
     }
   }, 2000)
 </script>
-
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-L7WEXVQCR9"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-L7WEXVQCR9');
-</script>
 </body>
 </html>

app/src/assets/template/desktop/index.tpl

@@ -26,15 +26,5 @@
 <div id="status" class="fn__flex status"></div>
 <div id="commonMenu" class="b3-menu fn__none"></div>
 <div id="message" class="b3-snackbars"></div>
-
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-L7WEXVQCR9"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-L7WEXVQCR9');
-</script>
 </body>
 </html>

app/src/assets/template/mobile/index.tpl

@@ -72,15 +72,5 @@
     <button data-type="redo"><svg><use xlink:href="#iconRedo"></use></svg></button>
     <span class="fn__flex-1"></span>
 </div>
-
-<!-- Google tag (gtag.js) -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-L7WEXVQCR9"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'G-L7WEXVQCR9');
-</script>
 </body>
 </html>

app/src/config/about.ts

@@ -24,6 +24,14 @@ export const about = {
     <div class="fn__space"></div>
     <input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}>
 </label>
+<label class="b3-label fn__flex">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.googleAnalytics}
+        <div class="b3-label__text">${window.siyuan.languages.googleAnalyticsTip}</div>
+    </div>
+    <div class="fn__space"></div>
+    <input class="b3-switch fn__flex-center" id="googleAnalytics" type="checkbox"${window.siyuan.config.system.googleAnalytics ? " checked" : ""}>
+</label>
 <label class="b3-label fn__flex">
     <div class="fn__flex-1">
         ${window.siyuan.languages.about9}
@@ -364,6 +372,12 @@ export const about = {
                 });
             });
         });
+        const googleAnalyticsElement = about.element.querySelector("#googleAnalytics") as HTMLInputElement;
+        googleAnalyticsElement.addEventListener("change", () => {
+            fetchPost("/api/system/setGoogleAnalytics", {googleAnalytics: googleAnalyticsElement.checked}, () => {
+                exportLayout(true);
+            });
+        });
         const uploadErrLogElement = about.element.querySelector("#uploadErrLog") as HTMLInputElement;
         uploadErrLogElement.addEventListener("change", () => {
             fetchPost("/api/system/setUploadErrLog", {uploadErrLog: uploadErrLogElement.checked}, () => {

app/src/config/search.ts

@@ -74,7 +74,7 @@ export const initConfigSearch = (element: HTMLElement) => {
             "importKey", "genKey", "genKeyByPW", "copyKey", "resetRepo", "systemLogTip", "export", "visitAnnouncements",
             "safeQuit", "directConnection", "siyuanNote", "key", "password", "copied", "resetRepoTip",
             "autoDownloadUpdatePkg", "autoDownloadUpdatePkgTip", "networkProxy", "keyPlaceholder", "initRepoKeyTip",
-            "useFixedPort", "useFixedPortTip"]),
+            "useFixedPort", "useFixedPortTip", "googleAnalytics", "googleAnalyticsTip"]),
     ];
     const inputElement = element.querySelector(".b3-form__icon input") as HTMLInputElement;
     if (window.siyuan.config.system.container !== "ios") {

app/src/types/index.d.ts

@@ -26,6 +26,7 @@ type TBazaarType = "templates" | "icons" | "widgets" | "themes"
 declare module "blueimp-md5"
 
 interface Window {
+    dataLayer: string[]
     siyuan: ISiyuan
     webkit: any
 
@@ -44,7 +45,7 @@ interface Window {
 
     hideKeyboardToolbar(): void
 
-    gtag(name: string, key: string, value: IObject): void;
+    gtag(name: string, key: string | Date, value?: IObject): void;
 }
 
 interface ITextOption {
@@ -352,6 +353,7 @@ declare interface IConfig {
         xanadu: boolean
         udanax: boolean
         uploadErrLog: boolean
+        googleAnalytics: boolean
         downloadInstallPkg: boolean
         networkServe: boolean
         fixedPort: boolean

app/src/util/onGetConfig.ts

@@ -161,24 +161,31 @@ export const onGetConfig = (isStart: boolean) => {
         mountHelp();
     }
 
-    try {
+    if (window.siyuan.config.system.googleAnalytics) {
-        const para = {
+        try {
-            "version": Constants.SIYUAN_VERSION,
+            window.dataLayer = window.dataLayer || [];
-            "container": window.siyuan.config.system.container,
+            // @ts-ignore
-            "isLoggedIn": "false",
+            window.gtag = () => {window.dataLayer.push(arguments)};
-            "subscriptionStatus": "-1",
+            window.gtag("js", new Date());
-            "subscriptionPlan": "-1",
+            window.gtag("config", "G-L7WEXVQCR9");
-            "subscriptionType": "-1",
+            const para = {
-        };
+                "version": Constants.SIYUAN_VERSION,
-        if (window.siyuan.user) {
+                "container": window.siyuan.config.system.container,
-            para.isLoggedIn = "true";
+                "isLoggedIn": "false",
-            para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus.toString();
+                "subscriptionStatus": "-1",
-            para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan.toString();
+                "subscriptionPlan": "-1",
-            para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType.toString();
+                "subscriptionType": "-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();
+            }
+            window.gtag("event", Constants.ANALYTICS_EVT_ON_GET_CONFIG, para);
+        } catch (e) {
+            console.error(e);
         }
-        window.gtag("event", Constants.ANALYTICS_EVT_ON_GET_CONFIG, para);
-    } catch (e) {
-        console.error(e);
     }
 };