From 579fde1ff44308ecf59c18cd990a65e3025c943e Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Wed, 26 Jun 2024 10:55:44 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=8F=9C=E9=B8=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/appDeprecatedKeys.ts         |  2 +-
 src/apps/com.cainiao.wireless.ts | 76 +++++++++++++++-----------------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
index 230d12b7..3a3d72f8 100644
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -276,7 +276,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.cainiao.wireless',
     name: '菜鸟',
-    deprecatedKeys: [0, 3],
+    deprecatedKeys: [0, 3, 7, 8, 11],
   },
   {
     id: 'com.cctv.cctv5ultimate',
diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
index ef74a12c..b9e77281 100644
--- a/src/apps/com.cainiao.wireless.ts
+++ b/src/apps/com.cainiao.wireless.ts
@@ -36,14 +36,45 @@ export default defineGkdApp({
             'View[clickable=true] > @[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/14033859',
         },
+        {
+          key: 3,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches: '[vid="dialog_full_image_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13842492',
+        },
+        {
+          key: 4,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches:
+            '@[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/14033859',
+        },
       ],
     },
     {
       key: 2,
-      name: '局部广告-包裹页面-地图底部横条广告',
-      activityIds: 'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
-      rules: 'View[desc="立即查看"] +2 ImageView[id=null]',
-      snapshotUrls: 'https://i.gkd.li/i/12914450',
+      name: '局部广告-卡片广告',
+      rules: [
+        {
+          key: 0,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: 'View[desc="立即查看"] +2 ImageView[id=null]',
+          snapshotUrls: 'https://i.gkd.li/i/12914450',
+        },
+        {
+          key: 1,
+          quickFind: true,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: '[vid="iv_banner_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/15879126',
+        },
+      ],
     },
     {
       key: 4,
@@ -78,29 +109,6 @@ export default defineGkdApp({
         'https://i.gkd.li/i/14969859',
       ],
     },
-    {
-      key: 7,
-      name: '全屏广告-今日手气红包',
-      desc: '点击右上角X',
-      quickFind: true,
-      activityIds:
-        'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
-      rules: '[vid="dialog_full_image_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13842492',
-    },
-    {
-      key: 8,
-      name: '全屏广告-发现页新装试用弹窗',
-      desc: '点击X',
-      rules: [
-        {
-          activityIds:
-            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
-          matches: 'View[childCount=2][clickable=true] > [text="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/i/14033859',
-        },
-      ],
-    },
     {
       key: 9,
       name: '功能类-询问[是否要查询包裹]弹窗',
@@ -132,19 +140,5 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 11,
-      name: '局部广告-包裹页面-物流信息底部横条广告',
-      desc: '点击右上角关闭',
-      rules: [
-        {
-          quickFind: true,
-          activityIds:
-            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
-          matches: '[vid="iv_banner_close"]',
-          snapshotUrls: 'https://i.gkd.li/i/15879126',
-        },
-      ],
-    },
   ],
 });