From 157ac1c94c7e598dab15c9a74eaa75a96a3feb13 Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Sun, 14 Apr 2024 16:00:25 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=BE=AE=E5=8D=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/com.sina.weibo.ts | 85 ++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 45 deletions(-)

diff --git a/src/apps/com.sina.weibo.ts b/src/apps/com.sina.weibo.ts
index 67b89c4e..307c2fab 100644
--- a/src/apps/com.sina.weibo.ts
+++ b/src/apps/com.sina.weibo.ts
@@ -3,7 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.sina.weibo',
   name: '微博',
-  deprecatedKeys: [12],
+  deprecatedKeys: [12, 15, 16, 21],
   groups: [
     {
       key: 3,
@@ -93,19 +93,19 @@ export default defineAppConfig({
       key: 7,
       name: '局部广告-首页顶部话题分享窗口',
       quickFind: true,
-      activityIds: ['com.sina.weibo.MainTabActivity'],
+      activityIds: 'com.sina.weibo.MainTabActivity',
       rules:
         '[id="com.sina.weibo:id/tvGuide"] + [id="com.sina.weibo:id/v_close"] + [id="com.sina.weibo:id/iv_close"]',
-      snapshotUrls: ['https://i.gkd.li/i/12705972'],
+      snapshotUrls: 'https://i.gkd.li/i/12705972',
     },
     {
       key: 8,
       name: '全屏广告-弹窗广告',
+      quickFind: true,
       rules: [
         {
           key: 0,
           activityIds: 'com.sina.weibo.business',
-          quickFind: true,
           matches:
             '@[id="com.sina.weibo:id/btn_close"] - FrameLayout > [id="com.sina.weibo:id/ad_tag"]',
           snapshotUrls: 'https://i.gkd.li/i/12750090',
@@ -114,17 +114,30 @@ export default defineAppConfig({
           key: 1,
           activityIds: 'com.sina.weibo.feed.MPDialogActivity',
           matches:
-            'View[childCount=2] > @TextView[clickable=true] - View >n [text="元"]',
+            'View[childCount=2] > @TextView[clickable=true] - View >n [text="元"] <<n [id="com.sina.weibo:id/container"]',
           snapshotUrls: 'https://i.gkd.li/i/13670266',
         },
         {
           key: 2,
           activityIds: 'com.sina.weibo.page.ad.DiscoverAdDialog',
-          quickFind: true,
           matches:
             '[id="com.sina.weibo:id/ad_portrait_layout"] + [id="com.sina.weibo:id/btn_close"]',
           snapshotUrls: 'https://i.gkd.li/i/12705974',
         },
+        {
+          key: 3,
+          activityIds: 'com.sina.weibo.feed.MPDialogActivity',
+          matches:
+            '[text^="今日签到"] <n * + @TextView[clickable=true] <<n [vid="container"]',
+          snapshotUrls: 'https://i.gkd.li/i/14969848',
+        },
+        {
+          key: 4,
+          activityIds: 'com.sina.weibo.feed.MPDialogActivity',
+          matches:
+            '@Image[text="close"] < View[childCount=4] <2 * <<n [id="com.sina.weibo:id/container"]',
+          snapshotUrls: 'https://i.gkd.li/i/14033735',
+        },
       ],
     },
     {
@@ -137,7 +150,7 @@ export default defineAppConfig({
       quickFind: true,
       rules:
         '@[id="com.sina.weibo:id/bt_cancel"][text="暂不开启"] + [id="com.sina.weibo:id/bt_confirm"]',
-      snapshotUrls: ['https://i.gkd.li/i/12705979'],
+      snapshotUrls: 'https://i.gkd.li/i/12705979',
     },
     {
       key: 10,
@@ -149,43 +162,59 @@ export default defineAppConfig({
       quickFind: true,
       rules:
         '[text^="打开通知"] < LinearLayout + ImageView[id="com.sina.weibo:id/right_icon"]',
-      snapshotUrls: ['https://i.gkd.li/i/12705986'],
+      snapshotUrls: 'https://i.gkd.li/i/12705986',
     },
     {
       key: 11,
       name: '局部广告-首页顶部签到卡片',
       desc: '自动点击x按钮',
       quickFind: true,
-      activityIds: ['com.sina.weibo.MainTabActivity'],
+      activityIds: 'com.sina.weibo.MainTabActivity',
       rules:
         '[id="com.sina.weibo:id/ll_check_in_container"] < FrameLayout - FrameLayout > TextView + [id="com.sina.weibo:id/v_close"]',
-      snapshotUrls: ['https://i.gkd.li/i/12749876'],
+      snapshotUrls: 'https://i.gkd.li/i/12749876',
     },
     {
       key: 13,
       name: '局部广告-悬浮广告',
       desc: '自动点击x按钮',
       quickFind: true,
-      activityIds: 'com.sina.weibo.MainTabActivity',
       rules: [
         {
           key: 0,
+          activityIds: 'com.sina.weibo.MainTabActivity',
           matches:
             '[id="com.sina.weibo:id/floating_window"] >2 [id="com.sina.weibo:id/close"]',
           snapshotUrls: 'https://i.gkd.li/i/12750118',
         },
         {
           key: 1,
+          activityIds: 'com.sina.weibo.MainTabActivity',
           matches:
             '[id="com.sina.weibo:id/floating_window"] >n [id="com.sina.weibo:id/closeView"]',
           snapshotUrls: 'https://i.gkd.li/i/13206775',
         },
         {
           key: 2,
+          activityIds: 'com.sina.weibo.MainTabActivity',
           matches:
             '[id="com.sina.weibo:id/tv_tag"] + @*[clickable=true] + [id="com.sina.weibo:id/countdown_btn_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13206841',
         },
+        {
+          key: 3,
+          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
+          matches:
+            '@[id="com.sina.weibo:id/close_layout"] - LinearLayout [id="com.sina.weibo:id/btnFollow"]',
+          snapshotUrls: 'https://i.gkd.li/i/13482954',
+        },
+        {
+          key: 4,
+          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
+          matches:
+            '[text*="一键转发"] < LinearLayout +2 [id="com.sina.weibo:id/tv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13482960',
+        },
       ],
     },
     {
@@ -212,26 +241,6 @@ export default defineAppConfig({
         },
       ],
     },
-    {
-      key: 15,
-      name: '局部广告-评论区底部账号推荐关注悬浮窗',
-      desc: '点击"x"',
-      quickFind: true,
-      activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-      rules:
-        '@[id="com.sina.weibo:id/close_layout"] - LinearLayout [id="com.sina.weibo:id/btnFollow"]',
-      snapshotUrls: 'https://i.gkd.li/i/13482954',
-    },
-    {
-      key: 16,
-      name: '局部广告-评论区底部转发推荐悬浮窗',
-      desc: '点击"x"',
-      quickFind: true,
-      activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-      rules:
-        '[text*="一键转发"] < LinearLayout +2 [id="com.sina.weibo:id/tv_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13482960',
-    },
     {
       key: 17,
       quickFind: true,
@@ -318,19 +327,5 @@ export default defineAppConfig({
         },
       ],
     },
-    {
-      key: 21,
-      name: '全屏广告-最热钻超弹窗',
-      desc: '点击X',
-      quickFind: true,
-      rules: [
-        {
-          activityIds: 'com.sina.weibo.feed.MPDialogActivity',
-          matches:
-            '@Image[text="close"] < View[childCount=4] <2 * <<n [id="com.sina.weibo:id/container"]',
-          snapshotUrls: 'https://i.gkd.li/i/14033735',
-        },
-      ],
-    },
   ],
 });