From 0cea3a27572d9abd8579f4c6cca4b1038a8f5972 Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Tue, 2 Jan 2024 20:02:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(QQ)=EF=BC=9A=E5=A5=BD=E5=8F=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81-=E5=B9=BF=E5=91=8A=E5=8D=A1=E7=89=87=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99=EF=BC=89=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=B9=BF=E5=91=8A=E5=BC=B9=E7=AA=97=20(#3509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 好友动态-广告卡片（补充 activityId）

* feat 首页广告弹窗

* feat 好友动态-广告卡片（优化规则）
---
 src/apps/com.tencent.mobileqq.ts | 56 ++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts
index 610938b0..ac53a1c9 100644
--- a/src/apps/com.tencent.mobileqq.ts
+++ b/src/apps/com.tencent.mobileqq.ts
@@ -3,6 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.tencent.mobileqq',
   name: 'QQ',
+  deprecatedKeys: [6],
   groups: [
     {
       key: 0,
@@ -60,9 +61,15 @@ export default defineAppConfig({
       rules: [
         {
           key: 0,
-          activityIds: 'com.tencent.mobileqq.activity.SplashActivity',
-          matches: 'View[desc="广告"] + ImageView[clickable=true]', // 1689050226722
-          snapshotUrls: 'https://i.gkd.li/import/12847842',
+          activityIds: [
+            'com.tencent.mobileqq.activity.SplashActivity',
+            'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity',
+          ],
+          matches: 'View[desc="广告"] + ImageView[clickable=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/import/12847842',
+            'https://i.gkd.li/import/13787345',
+          ],
         },
         {
           preKeys: 0,
@@ -81,6 +88,19 @@ export default defineAppConfig({
           matches: '@[clickable=true] > * > ImageView + [text="隐藏此条动态"]',
           snapshotUrls: 'https://i.gkd.li/import/13761147',
         },
+        {
+          key: 3,
+          activityIds: [
+            'com.tencent.mobileqq.activity.SplashActivity',
+            'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity',
+          ],
+          matches:
+            '[id="com.tencent.mobileqq:id/tv_name"] + TextView[text="广告"] + @ImageView[clickable=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/import/12749584',
+            'https://i.gkd.li/import/13627967',
+          ],
+        },
       ],
     },
     {
@@ -156,21 +176,6 @@ export default defineAppConfig({
         },
       ],
     },
-    {
-      key: 6,
-      name: '动态广告卡片',
-      desc: '点击右上角[广告]右侧的x按钮直接关闭',
-      activityIds: [
-        'com.tencent.mobileqq.activity.SplashActivity',
-        'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity',
-      ],
-      rules:
-        '@ImageView[clickable=true] - TextView[text="广告"] - [id="com.tencent.mobileqq:id/tv_name"]',
-      snapshotUrls: [
-        'https://i.gkd.li/import/12749584',
-        'https://i.gkd.li/import/13627967',
-      ],
-    },
     {
       key: 7,
       name: '扫一扫-登录确认',
@@ -392,5 +397,20 @@ export default defineAppConfig({
         },
       ],
     },
+    {
+      key: 21,
+      name: '首页广告弹窗',
+      rules: [
+        {
+          key: 0,
+          name: '元梦之星广告弹窗',
+          activityIds:
+            'com.tencent.mobileqq.activity.QPublicTransFragmentActivity',
+          matches:
+            'ViewGroup[childCount=2] > ViewGroup[childCount=3][index=1] > ViewGroup[clickable=true][visibleToUser=true][index=1][childCount=0]',
+          snapshotUrls: 'https://i.gkd.li/import/13797876',
+        },
+      ],
+    },
   ],
 });