From ecb8ab43a19d835d1fd712a6a69e0901888758ba Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Wed, 4 Jun 2025 13:28:00 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20Gmail-=E5=88=86=E6=AE=B5=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A-=E4=BF=A1=E6=81=AF=E6=B5=81=E5=B9=BF=E5=91=8A=20#946?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/com.google.android.gm.ts | 46 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/apps/com.google.android.gm.ts b/src/apps/com.google.android.gm.ts
index 5f4771bc..7e73460a 100644
--- a/src/apps/com.google.android.gm.ts
+++ b/src/apps/com.google.android.gm.ts
@@ -7,47 +7,41 @@ export default defineGkdApp({
     {
       key: 2,
       name: '分段广告-信息流广告',
+      fastQuery: true,
       rules: [
         {
-          fastQuery: true,
-          key: -1,
-          name: '点击广告扩展-1',
-          matches:
-            '[id="com.google.android.gm:id/button_chip_ad_teaser_info_icon"]',
-          snapshotUrls: 'https://i.gkd.li/i/13255698',
-        },
-        {
-          fastQuery: true,
           key: 0,
-          name: '点击广告扩展-2',
-          matches: '[id="com.google.android.gm:id/basic_ad_teaser_info_icon"]',
-          snapshotUrls: 'https://i.gkd.li/i/13255698',
-        },
-        {
-          preKeys: [-1, 0],
-          key: 1,
-          name: '广告中心-点击屏蔽',
-          matches: 'Button[text="屏蔽此广告"||text^="Block"]', // TODO fastQuery 优化改进 Button[text="屏蔽此广告"] <<n [id="com.google.android.gm:id/my_ad_center_dialog"]
+          matches:
+            '[id="com.google.android.gm:id/basic_ad_teaser_info_icon" || id="com.google.android.gm:id/button_chip_ad_teaser_info_icon"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/13255700',
-            'https://i.gkd.li/i/13724271',
+            'https://i.gkd.li/i/13255698',
+            'https://i.gkd.li/i/13255698',
           ],
         },
         {
-          preKeys: 1,
+          preKeys: [0],
+          key: 1,
+          matches:
+            'Button[visibleToUser=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] <<n [vid="my_ad_center_dialog"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13255700',
+            'https://i.gkd.li/i/13724271',
+            'https://i.gkd.li/i/20585351',
+          ],
+        },
+        {
+          preKeys: [1],
           key: 2,
-          name: '点击继续确认屏蔽',
-          matches: 'Button[text="继续"||text="Continue"]', // TODO Button[text="继续"] <<n [id="com.google.android.gm:id/design_bottom_sheet"]
+          matches:
+            'Button[visibleToUser=true][text="继续" || text="Continue"] <<n [id="com.google.android.gm:id/my_ad_center_dialog"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13255701',
             'https://i.gkd.li/i/13724287',
           ],
         },
         {
-          preKeys: 2,
+          preKeys: [2],
           key: 3,
-          fastQuery: true,
-          name: '关闭弹窗',
           matches: '[id="com.google.android.gm:id/my_ad_center_close_icon"]',
           snapshotUrls: 'https://i.gkd.li/i/13263279',
         },