From e94f90060edf273e5c546482d25e780421d48c64 Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Mon, 8 Apr 2024 10:15:13 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B7=98=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/com.taobao.taobao.ts | 63 +++++++++++++++--------------------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/src/apps/com.taobao.taobao.ts b/src/apps/com.taobao.taobao.ts
index 9ed2826b..33941fe1 100644
--- a/src/apps/com.taobao.taobao.ts
+++ b/src/apps/com.taobao.taobao.ts
@@ -7,10 +7,11 @@ export default defineAppConfig({
   groups: [
     {
       key: 1,
-      name: '全屏广告-限时福利弹窗',
+      name: '全屏广告-弹窗广告',
       rules: [
         {
           key: 0,
+          quickFind: true,
           activityIds: [
             'com.taobao.tao.welcome.Welcome',
             'com.taobao.tao.TBMainActivity',
@@ -18,26 +19,16 @@ export default defineAppConfig({
             'com.taobao.android.detail.wrapper.activity.DetailActivity',
             'com.alibaba.triver.container.TriverMainActivity',
           ],
-          matches: '[desc^="限时福利"] < FrameLayout + [desc="关闭按钮"]',
+          matches:
+            '@[desc="关闭按钮"] - [id="com.taobao.taobao:id/poplayer_native_state_id"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12642792', // activityId: com.taobao.tao.welcome.Welcome
-            'https://i.gkd.li/i/13180826', // activityId: com.taobao.tao.TBMainActivity
-            'https://i.gkd.li/i/12648734', // activityId: com.taobao.android.tbabilitykit.pop.StdPopContainerActivity
-            'https://i.gkd.li/i/12648746', // activityId: com.taobao.android.detail.wrapper.activity.DetailActivity
-            'https://i.gkd.li/i/13198239', //com.alibaba.triver.container.TriverMainActivity
-          ],
-        },
-        {
-          key: 1,
-          name: '88VIP开通优惠弹窗',
-          activityIds: [
-            'com.taobao.tao.welcome.Welcome',
-            'com.taobao.tao.TBMainActivity',
-          ],
-          matches: '[desc="淘气值冲刺成功"] < FrameLayout + [desc="关闭按钮"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13198052', //com.taobao.tao.welcome.Welcome
-            'https://i.gkd.li/i/13249418', //com.taobao.tao.TBMainActivity
+            'https://i.gkd.li/i/12642792',
+            'https://i.gkd.li/i/13180826',
+            'https://i.gkd.li/i/12648734',
+            'https://i.gkd.li/i/12648746',
+            'https://i.gkd.li/i/13198239',
+            'https://i.gkd.li/i/13198052',
+            'https://i.gkd.li/i/13249418',
           ],
         },
       ],
@@ -45,6 +36,7 @@ export default defineAppConfig({
     {
       key: 2,
       name: '局部广告-消息页面热门活动卡片',
+      quickFind: true,
       activityIds: 'com.taobao.tao.welcome.Welcome',
       rules: 'View[desc.length>0] +2n FrameLayout > TextView[text="퀺"]',
       snapshotUrls: [
@@ -70,16 +62,14 @@ export default defineAppConfig({
       key: 8,
       name: '通知提示',
       desc: '自动点击关闭',
-      matchTime: 10000,
+      quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text^="开启系统通知"] + Image[clickable=true]',
+      rules:
+        '[text^="开启系统通知"] + @Image[clickable=true] <<n [id="com.taobao.taobao:id/poplayer_inner_view"]',
       snapshotUrls: [
-        'https://i.gkd.li/i/13197594', //com.taobao.tao.welcome.Welcome
-        'https://i.gkd.li/i/13222946', //com.taobao.android.order.bundle.TBOrderDetailActivity
-        'https://i.gkd.li/i/13438404', //com.taobao.android.tbabilitykit.pop.StdPopContainerActivity
         'https://i.gkd.li/i/13446901',
-        'https://i.gkd.li/i/13455424', //com.taobao.tao.TBMainActivity
+        'https://i.gkd.li/i/13455424',
       ],
     },
     {
@@ -171,19 +161,20 @@ export default defineAppConfig({
       key: 15,
       name: '权限提示-开启悬浮窗权限',
       desc: '点击“否”',
-      activityIds:
-        'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity',
       quickFind: true,
-      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: {
-        matches: [
-          '[id="android:id/message"][text*="悬浮窗权限"]',
-          '[id="android:id/button2"][text="否"]',
-        ],
-      },
-      snapshotUrls: 'https://i.gkd.li/i/13588165',
+      activityIds:
+        'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity',
+      rules: [
+        {
+          matches: [
+            '[id="android:id/message"][text*="悬浮窗权限"]',
+            '[id="android:id/button2"][text="否"]',
+          ],
+          snapshotUrls: 'https://i.gkd.li/i/13588165',
+        },
+      ],
     },
     {
       key: 16,