From 89d39ec546fb77ac7c78b4e9dc495e6e058dfa2d Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Fri, 10 Nov 2023 00:44:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8B=BC=E5=A4=9A=E5=A4=9A):=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=BC=98=E6=83=A0=E5=BC=B9=E7=AA=97=EF=BC=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A7=84=E5=88=99=EF=BC=89=E3=80=81=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=89=20(#1976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 首页优惠弹窗（优化规则）

* feat 活动弹窗（优化规则）
---
 src/apps/com.xunmeng.pinduoduo.ts | 60 ++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/apps/com.xunmeng.pinduoduo.ts b/src/apps/com.xunmeng.pinduoduo.ts
index 5606b7c1..d58d32a8 100644
--- a/src/apps/com.xunmeng.pinduoduo.ts
+++ b/src/apps/com.xunmeng.pinduoduo.ts
@@ -31,34 +31,54 @@ export default defineAppConfig({
       ],
     },
     {
-      enable: false,
       key: 2,
       name: '首页优惠弹窗',
-      activityIds: [
-        'com.xunmeng.pinduoduo.ui.activity.HomeActivity',
-        'com.miui.home.launcher.Launcher',
-      ],
+      activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity',
+      matchLauncher: true,
       rules: [
-        'FrameLayout > FrameLayout > RelativeLayout > @ImageView[id="com.xunmeng.pinduoduo:id/pdd"][text=null][clickable=true] + ImageView[id="com.xunmeng.pinduoduo:id/pdd"][text=null][clickable=true]',
-        'View[id=null] > TextView + View > View +(4) View[clickable=true] > Image[id=null]',
-      ],
-      snapshotUrls: [
-        'https://gkd-kit.gitee.io/import/12642015',
-        'https://gkd-kit.gitee.io/import/12642019',
+        {
+          key: 0,
+          name: '首页优惠弹窗1',
+          matches:
+            'FrameLayout > FrameLayout > RelativeLayout > @ImageView[id="com.xunmeng.pinduoduo:id/pdd"][text=null][clickable=true] + ImageView[id="com.xunmeng.pinduoduo:id/pdd"][text=null][clickable=true]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12642015',
+        },
+        {
+          key: 1,
+          name: '首页优惠弹窗2',
+          matches:
+            'View[id=null] > TextView + View > View +(4) View[clickable=true] > Image[id=null]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12642019',
+        },
       ],
     },
     {
-      enable: false,
       key: 3,
-      name: '免单活动弹窗',
-      activityIds: ['com.xunmeng.pinduoduo.activity.NewPageActivity'],
+      name: '活动弹窗',
       rules: [
-        'TextView[text="免单特权"] < View < View +(5) View[clickable=true] > Image[id=null]',
-        'TextView[text$="抽免单"] -(2) Image[id=null][clickable=true]',
-      ],
-      snapshotUrls: [
-        'https://gkd-kit.gitee.io/import/12642032',
-        'https://gkd-kit.gitee.io/import/12642038',
+        {
+          key: 0,
+          name: '抽免单活动1',
+          activityIds: 'com.xunmeng.pinduoduo.activity.NewPageActivity',
+          matches:
+            'TextView[text="免单特权"] < View < View +(5) View[clickable=true] > Image[id=null]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12642032',
+        },
+        {
+          key: 1,
+          name: '抽免单活动2',
+          activityIds: 'com.xunmeng.pinduoduo.activity.NewPageActivity',
+          matches:
+            'TextView[text$="抽免单"] -(2) Image[id=null][clickable=true]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12642038',
+        },
+        {
+          key: 2,
+          name: '下单后追加订单',
+          activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity',
+          matches: '@[text="关闭弹窗"][clickable=true] + [text$="下单成功"]',
+          snapshotUrls: 'https://i.gkd.li/import/13308175',
+        },
       ],
     },
     {