From 1d634a1558d7eb4fb8f61ca01727ec06a908e327 Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Sun, 31 Mar 2024 14:55:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BD=A9=E4=BA=91=E5=A4=A9=E6=B0=94):=20?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=B9=BF=E5=91=8A=E3=80=81=E5=B1=80=E9=83=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=E3=80=81=E5=8A=9F=E8=83=BD=E7=B1=BB-?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=94=B6=E8=B5=B7=E9=A1=B6=E9=83=A8=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/com.nowcasting.activity.ts | 64 ++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/apps/com.nowcasting.activity.ts b/src/apps/com.nowcasting.activity.ts
index 0ae944c9..54526a68 100644
--- a/src/apps/com.nowcasting.activity.ts
+++ b/src/apps/com.nowcasting.activity.ts
@@ -24,11 +24,20 @@ export default defineAppConfig({
       activityIds: 'com.nowcasting.activity.WeatherActivity',
       rules: [
         {
-          matches: [
-            '[id=null][text^="立即" || text^="领取" || text^="了解"][text.length=4]',
-            '[id="android:id/content"] >2 FrameLayout[childCount=3||childCount=2||childCount=4] > FrameLayout[childCount=5||childCount=6||childCount=8] > FrameLayout[childCount=1] > ImageView[text=null][visibleToUser=true]',
+          key: 0,
+          matches:
+            '[id="android:id/content"] >n FrameLayout[childCount>5] > FrameLayout[childCount=1] > ImageView',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13405131',
+            'https://i.gkd.li/i/14814345',
           ],
-          snapshotUrls: 'https://i.gkd.li/i/13405131',
+        },
+        {
+          key: 1,
+          quickFind: true,
+          matches:
+            'ImageView < @ViewGroup[clickable=true] <<n ViewGroup +n ViewGroup [text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/14814374',
         },
       ],
     },
@@ -38,23 +47,56 @@ export default defineAppConfig({
       quickFind: true,
       activityIds: 'com.nowcasting.activity.WeatherActivity',
       rules: [
-        {
-          key: 0,
-          matches: ['[id="com.nowcasting.activity:id/jad_feed_close"]'],
-          snapshotUrls: 'https://i.gkd.li/i/13690826',
-        },
         {
           key: 1,
-          matches: ['[id="com.nowcasting.activity:id/ll_close"]'],
+          matches: '[id="com.nowcasting.activity:id/ll_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13690822',
         },
         {
           preKeys: 1,
           key: 2,
-          matches: ['[id="com.nowcasting.activity:id/ll_uninterested"]'],
+          matches: '[id="com.nowcasting.activity:id/ll_uninterested"]',
           snapshotUrls: 'https://i.gkd.li/i/13690830',
         },
       ],
     },
+    {
+      key: 4,
+      name: '局部广告-卡片广告',
+      desc: '点击关闭',
+      quickFind: true,
+      activityIds: 'com.nowcasting.activity.WeatherActivity',
+      rules: [
+        {
+          key: 0,
+          matches: '[id="com.nowcasting.activity:id/jad_feed_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13690826',
+        },
+        {
+          key: 1,
+          matches:
+            '@FrameLayout[visibleToUser=true] +2 * > [text="广告"][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/14814348',
+        },
+      ],
+    },
+    {
+      key: 5,
+      name: '功能类-点击收起顶部工具栏',
+      rules: [
+        {
+          quickFind: true,
+          activityIds: 'com.nowcasting.activity.WeatherActivity',
+          matches:
+            'ViewGroup[childCount=2][visibleToUser=true] > [vid="fl_arrow"][visibleToUser=true]',
+          exampleUrls:
+            'https://m.gkd.li/57941037/5bdf4f45-d66d-441e-a2ce-f32d5fc40796',
+          snapshotUrls: [
+            'https://i.gkd.li/i/14814347', // 收起前
+            'https://i.gkd.li/i/14814412', // 收起后
+          ],
+        },
+      ],
+    },
   ],
 });