From f4f639e072e673fed0f24865539c81e9532e796a Mon Sep 17 00:00:00 2001
From: stapxs <1007028430.stapx@gmail.com>
Date: Fri, 19 Jul 2024 10:33:50 +0800
Subject: [PATCH] =?UTF-8?q?CI=20=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96=20:wh?=
 =?UTF-8?q?eelchair:=20=E8=BF=BD=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF:=20=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=20GitHub,=20=E7=82=B9=E5=87=BB=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=20blog,=20=E5=88=87=E6=8D=A2=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98,=20=E5=88=87=E6=8D=A2=E4=B8=BB=E4=BD=93?=
 =?UTF-8?q?=E8=89=B2,=20=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF;=20=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=BB=9F=E8=AE=A1=E5=8F=AA=E8=AE=A1=E6=AC=A1,=20?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E4=BC=A0=E5=85=B6=E4=BB=96=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=20:construction=5Fworker:=20=E7=BB=99=20pr=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=20lint=20action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-app.yml | 11 -----------
 .github/workflows/pr-check.yml  | 28 ++++++++++++++++++++++++++++
 package.json                    |  2 +-
 src/App.vue                     |  1 -
 src/components/AboutPan.vue     | 22 ++++++++++++++++++----
 src/function/utils/msgUtil.ts   |  3 +++
 src/pages/options/OptView.vue   | 18 ++++++++++++++++--
 7 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/pr-check.yml

diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index bc904c3b..1158aa36 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -43,17 +43,6 @@ jobs:
         fi
         # 获取版本号
         echo VERSION=$(node -p "require('./package.json').version") >> $GITHUB_OUTPUT
-    # 设置 Node.js 版本
-    - name: Load Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18.x
-    # 更新依赖
-    - name: Install
-      run: yarn
-    # 代码检查
-    - name: Lint
-      run: yarn lint
 
   # ========================= 构建 Web 版本 ========================= 
   build-pages:
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
new file mode 100644
index 00000000..664bd546
--- /dev/null
+++ b/.github/workflows/pr-check.yml
@@ -0,0 +1,28 @@
+# 在主分支上构建
+name: lint
+on:
+  pull_request: # PR 触发
+    branches:
+      - next
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    # 拉取代码
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        persist-credentials: false
+    # 设置 Node.js 版本
+    - name: Load Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+    # 更新依赖
+    - name: Install
+      run: yarn
+    # 代码检查
+    - name: Lint
+      run: yarn lint
\ No newline at end of file
diff --git a/package.json b/package.json
index b8dab9bc..255e7ed4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stapxs-qq-lite",
-  "version": "2.7.17",
+  "version": "2.7.18",
   "private": false,
   "author": "Stapx Steve [林槐]",
   "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，使用 Vue 重制的全新版本。",
diff --git a/src/App.vue b/src/App.vue
index ea1c362b..7d286a3a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -257,7 +257,6 @@ export default defineComponent({
             this.tags.page = view
         },
         barMainClick() {
-            console.log(1111)
             if(loginInfo.status) {
                 this.changeTab('信息', 'Messages', false)
             } else {
diff --git a/src/components/AboutPan.vue b/src/components/AboutPan.vue
index 258d254c..46907726 100644
--- a/src/components/AboutPan.vue
+++ b/src/components/AboutPan.vue
@@ -25,9 +25,9 @@
             <span style="text-align: center;">{{ $t('description') }}</span>
             <a>v{{ packageInfo.version }}</a>
             <div class="buttons">
-                <a class="ss-button" @click="openLink('https://github.com/Stapxs/Stapxs-QQ-Lite-2.0')">{{
+                <a class="ss-button" @click="goGithub()">{{
                 $t('option_info_visit_github') }}</a>
-                <a class="ss-button" style="width: 30px;" @click="openLink('https://blog.stapxs.cn/About.html')">
+                <a class="ss-button" style="width: 30px;" @click="goBlog()">
                     <font-awesome-icon :icon="['fas', 'circle-info']"/>
                 </a>
             </div>
@@ -127,12 +127,14 @@
 </template>
 
 <script lang="ts">
+import Umami from '@stapxs/umami-logger-typescript'
+import DepPan from './DepPan.vue'
+import packageInfo from '../../package.json'
+
 import { defineComponent } from 'vue'
 import { openLink } from '@/function/utils/appUtil'
 import { ContributorElem } from '@/function/elements/system'
 
-import DepPan from './DepPan.vue'
-import packageInfo from '../../package.json'
 import { runtimeData } from '@/function/msg'
 
 export default defineComponent({
@@ -158,6 +160,18 @@ export default defineComponent({
                     template: DepPan
                 }
                 runtimeData.popBoxList.push(popInfo)
+        },
+
+        goGithub() {
+            openLink('https://github.com/Stapxs/Stapxs-QQ-Lite-2.0')
+            // UM：统计点击事件
+            Umami.trackEvent('click_statistics', { name: 'visit_github' })
+        },
+
+        goBlog() {
+            openLink('https://blog.stapxs.cn/About.html')
+            // UM：统计点击事件
+            Umami.trackEvent('click_statistics', { name: 'visit_blog' })
         }
     },
     mounted() {
diff --git a/src/function/utils/msgUtil.ts b/src/function/utils/msgUtil.ts
index 4b181402..b56bb688 100644
--- a/src/function/utils/msgUtil.ts
+++ b/src/function/utils/msgUtil.ts
@@ -6,6 +6,7 @@ import { runtimeData } from '@/function/msg'
 import { v4 as uuid } from 'uuid'
 import { Connector } from '@/function/connect'
 import { BotMsgType } from '../elements/information'
+import Umami from '@stapxs/umami-logger-typescript'
 
 const logger = new Logger()
 
@@ -397,5 +398,7 @@ export function sendMsgRaw(id: string, type: string, msg: string | { type: strin
                 break
             }
         }
+        // UM：统计消息发送次数
+        Umami.trackEvent('sendMsg', { type: type })
     }
 }
\ No newline at end of file
diff --git a/src/pages/options/OptView.vue b/src/pages/options/OptView.vue
index 23ced584..e92b328d 100644
--- a/src/pages/options/OptView.vue
+++ b/src/pages/options/OptView.vue
@@ -68,7 +68,7 @@
                         </div>
                         <div class="theme-color-col">
                             <label v-for="(name, index) in colors" :title="name" :key="'color_id_' + index" class="ss-radio">
-                                <input type="radio" name="theme_color" @change="save" :data-id="index"
+                                <input type="radio" name="theme_color" @change="save($event); gaColor($event)" :data-id="index"
                                     :checked="runtimeData.sysConfig.theme_color === undefined ? index === 0 : Number(runtimeData.sysConfig.theme_color) === index">
                                 <div :style="'background: var(--color-main-' + index + ');'">
                                     <div></div>
@@ -116,7 +116,7 @@
                     <span>{{ $t('option_dev_chatview_name') }}</span>
                     <span>{{ $t('option_dev_chatview_name_tip') }}</span>
                 </div>
-                <select @change="save" name="chatview_name" title="chatview_name" v-model="chatview_name">
+                <select @change="save($event); gaChatView($event)" name="chatview_name" title="chatview_name" v-model="chatview_name">
                     <option value="">{{ $t('option_dev_chatview_name_none') }}</option>
                     <option v-for="item in getAppendChatView()" :value="item" :key="item">{{ item.replace('Chat', '') }}</option>
                 </select>
@@ -217,6 +217,18 @@ export default defineComponent({
             Umami.trackEvent('use_language', { name: sender.value })
         },
 
+        gaChatView(event: Event) {
+            const sender = event.target as HTMLInputElement
+            // UM：上传Chat View 选择
+            Umami.trackEvent('use_chatview', { name: sender.value })
+        },
+
+        gaColor(event: Event) {
+            const sender = event.target as HTMLInputElement
+            // UM：上传主题颜色选择
+            Umami.trackEvent('use_theme_color', { name: this.colors[Number(sender.dataset.id)] })
+        },
+
         setInitialScaleShow(event: Event) {
             const sender = event.target as HTMLInputElement
             this.initialScaleShow = Number(sender.value)
@@ -245,6 +257,8 @@ export default defineComponent({
                     sender.checked = false
                 } else {
                     baseApp.classList.add('no-touch')
+                    // UM：上传禁用触摸(彩蛋)的选择
+                    Umami.trackEvent('click_statistics', { name: 'touch_randomly' })
                 }
             }
         },