From 6f51d683d1ae44e56a8ac1682173f596fce639c7 Mon Sep 17 00:00:00 2001
From: aoguai <34203474+aoguai@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:20:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=A4=E8=AF=97=E6=96=87=E7=BD=91):=20?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=86=85=E5=B9=BF=E5=91=8A=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96=20(#1436)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #1404
---
 src/apps/org.gushiwen.gushiwen.ts | 48 ++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/apps/org.gushiwen.gushiwen.ts b/src/apps/org.gushiwen.gushiwen.ts
index 732265f2..c72cb53d 100644
--- a/src/apps/org.gushiwen.gushiwen.ts
+++ b/src/apps/org.gushiwen.gushiwen.ts
@@ -7,38 +7,64 @@ export default defineAppConfig({
     {
       key: 1,
       name: '应用内广告弹窗',
+      matchLauncher: true,
       rules: [
         {
           delay: 500,
           key: 0,
           activityIds: 'org.gushiwen.gushiwen.HomeActivity',
-          matches: 'ImageView - FrameLayout > FrameLayout > ImageView',
-          snapshotUrls: 'https://gkd-kit.gitee.io/import/12813618',
+          matches:
+            '@[width>1 && width<65] < FrameLayout - [name="android.widget.ImageView"||name="android.widget.FrameLayout"||name="android.widget.LinearLayout"]',
+          snapshotUrls: [
+            'https://gkd-kit.gitee.io/import/12813618',
+            'https://gkd-kit.gitee.io/import/12903835',
+            'https://gkd-kit.gitee.io/import/12903885',
+            'https://gkd-kit.gitee.io/import/12876077',
+            'https://gkd-kit.gitee.io/import/13059294',
+          ],
         },
         {
           delay: 500,
           key: 1,
           activityIds:
             'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
-          matches: '@Image < View +3 View > View > Image',
-          snapshotUrls: 'https://gkd-kit.gitee.io/import/12837225',
+          matches: '@Image < View[width<100] <n View > [text="反馈"]',
+          snapshotUrls: [
+            'https://gkd-kit.gitee.io/import/12837225',
+            'https://gkd-kit.gitee.io/import/12876086',
+            'https://gkd-kit.gitee.io/import/12876067',
+            'https://gkd-kit.gitee.io/import/12837225',
+            'https://gkd-kit.gitee.io/import/12912911',
+            'https://gkd-kit.gitee.io/import/13171930',
+          ],
         },
         {
           preKeys: [0, 1],
           key: 10,
           desc: '打赏页面-点击返回按钮',
-          activityIds: 'local.z.androidshared.vip.RewardActivity',
-          matches:
-            '[id="org.gushiwen.gushiwen:id/btn_back"][desc="返回"] + [text="打赏我们"]',
-          snapshotUrls: 'https://gkd-kit.gitee.io/import/12813638',
+          activityIds: [
+            'local.z.androidshared.vip.RewardActivity',
+            'local.z.androidshared.pay.RewardActivity',
+          ],
+          matches: '[id="org.gushiwen.gushiwen:id/btn_back"]',
+          snapshotUrls: [
+            'https://gkd-kit.gitee.io/import/12813638',
+            'https://gkd-kit.gitee.io/import/13111042',
+          ],
         },
         {
           preKeys: [0, 1],
           key: 11,
           desc: '荣誉会员-点击返回按钮',
-          activityIds: 'local.z.androidshared.vip.member.VipActivity',
-          matches: '[id="org.gushiwen.gushiwen:id/backBtn"][desc="返回"]',
-          snapshotUrls: 'https://gkd-kit.gitee.io/import/12837229',
+          activityIds: [
+            'local.z.androidshared.vip.member.VipActivity',
+            'local.z.androidshared.pay.vip.VipActivity',
+          ],
+          matches: '[id="org.gushiwen.gushiwen:id/backBtn"]',
+          snapshotUrls: [
+            'https://gkd-kit.gitee.io/import/12837229',
+            'https://gkd-kit.gitee.io/import/13111057',
+          ],
         },
       ],
     },