From f383244d3657d751dfd5c4b5c459b1f30ffc423e Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Thu, 2 Nov 2023 21:52:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=93=94=E5=93=A9=E5=93=94=E5=93=A9):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97=E3=80=81=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E9=A1=BA=E5=BA=8F=E3=80=81=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=80=9A=E7=9F=A5=E6=9D=83=E9=99=90=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=20(#1728)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 更新弹窗

* chore 调整顺序

* chore 修改 key

* chore 修改 key

* chore 更新弹窗（删除重复的 key）

* feat 请求通知权限弹窗

* feat(哔哩哔哩): 规则优化

---------

Co-authored-by: lisonge <i@songe.li>
---
 src/apps/tv.danmaku.bili.ts | 42 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/apps/tv.danmaku.bili.ts b/src/apps/tv.danmaku.bili.ts
index e46b5480..cca2d2cb 100644
--- a/src/apps/tv.danmaku.bili.ts
+++ b/src/apps/tv.danmaku.bili.ts
@@ -16,15 +16,6 @@ export default defineAppConfig({
       rules: '[id="tv.danmaku.bili:id/count_down"][text^="跳过"]',
       snapshotUrls: 'https://gkd-kit.gitee.io/import/12705270',
     },
-    {
-      quickFind: true,
-      key: 1,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      name: '青少年模式弹窗',
-      rules: 'TextView[text*=`青少年模式`] + TextView[text=`我知道了`]',
-    },
     {
       quickFind: true,
       key: 0,
@@ -40,12 +31,22 @@ export default defineAppConfig({
         'https://gkd-kit.gitee.io/import/12775156',
       ],
     },
+    {
+      quickFind: true,
+      key: 1,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      name: '青少年模式弹窗',
+      rules: 'TextView[text*=`青少年模式`] + TextView[text=`我知道了`]',
+    },
     {
       quickFind: true,
       key: 2,
       name: '动态推荐广告卡片',
       desc: '点击卡片右上角[广告]按钮-点击不感兴趣',
       activityIds: 'tv.danmaku.bili.MainActivityV2',
+      matchDelay: 5000,
       rules: [
         {
           key: 1,
@@ -59,6 +60,7 @@ export default defineAppConfig({
         },
       ],
     },
+    // key = 3已弃用
     {
       key: 4,
       name: '视频底部广告',
@@ -96,21 +98,26 @@ export default defineAppConfig({
         },
       ],
     },
+    // key = 5已弃用
     {
       quickFind: true,
       key: 6,
       name: '更新弹窗',
+      actionMaximum: 1,
+      matchDelay: 5000,
       activityIds: [
         'com.bilibili.app.preferences.BiliPreferencesActivity',
         'tv.danmaku.bili.ui.splash.ad.page.HotSplashActivity',
+        'tv.danmaku.bili.MainActivityV2',
       ],
       rules: [
         {
           key: 1,
           matches: '[id="tv.danmaku.bili:id/update_btn_cancel"]',
           snapshotUrls: [
-            'https://gkd-kit.gitee.io/import/13212209',
-            'https://gkd-kit.gitee.io/import/12649689',
+            'https://gkd-kit.gitee.io/import/12649689', // com.bilibili.app.preferences.BiliPreferencesActivity
+            'https://gkd-kit.gitee.io/import/13212209', // tv.danmaku.bili.ui.splash.ad.page.HotSplashActivity
+            'https://i.gkd.li/import/13228977',
           ],
         },
       ],
@@ -137,5 +144,18 @@ export default defineAppConfig({
       rules: '[id="tv.danmaku.bili:id/shopping_close"]',
       snapshotUrls: 'https://i.gkd.li/import/13200549',
     },
+    {
+      key: 9,
+      enable: false,
+      name: '请求通知权限弹窗',
+      activityIds: 'tv.danmaku.bili.MainActivityV2',
+      quickFind: true,
+      matchDelay: 5000,
+      matchTime: 10000,
+      resetMatch: 'app',
+      actionMaximum: 1,
+      rules: '[text="打开推送通知"] +2 * > [id="tv.danmaku.bili:id/close"]',
+      snapshotUrls: 'https://i.gkd.li/import/13229159',
+    },
   ],
 });