perf: 微博 #813

src/appDeprecatedKeys.ts

@@ -450,7 +450,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.sina.weibo',
     name: '微博',
-    deprecatedKeys: [12, 15, 16, 21],
+    deprecatedKeys: [3, 4, 6, 7, 11, 13, 12, 15, 16, 21],
   },
   {
     id: 'com.snda.wifilocating',

src/apps/com.sina.weibo.ts

@@ -4,63 +4,12 @@ export default defineGkdApp({
   id: 'com.sina.weibo',
   name: '微博',
   groups: [
-    {
-      key: 3,
-      name: '全屏广告-兴趣领域推荐',
-      desc: '出现在长久未登录的账户再次登录时',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          activityIds: 'com.sina.weibo.account.interest.InterestActivity',
-          matches:
-            '[id="com.sina.weibo:id/rl_account_title_bar"] > [id="com.sina.weibo:id/tv_title_bar_skip"][text="跳过"]',
-          snapshotUrls: 'https://i.gkd.li/i/12531405',
-        },
-      ],
-    },
-    {
-      key: 4,
-      name: '全屏广告-精选博主推荐',
-      desc: '出现在长久未登录的账户再次登录时',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          key: 1,
-          activityIds: '.account.recommend.RecommendActivity',
-          matches: '[text="取消勾选"]',
-          exampleUrls: 'https://e.gkd.li/a0602466-0f1e-4ab9-8a0d-27a4364d1ff8',
-          snapshotUrls: 'https://i.gkd.li/i/12531433',
-        },
-        {
-          preKeys: [1],
-          key: 2,
-          activityIds:
-            'com.oplusos.systemui.volume.VolumeDialogImplEx$CustomDialog',
-          matches: '[text="跳过"]',
-          exampleUrls: 'https://e.gkd.li/c20bec5d-f4e1-4765-9ba0-ca645b27e434',
-          snapshotUrls: 'https://i.gkd.li/i/12531434',
-        },
-      ],
-    },
     {
       key: 5,
-      name: '局部广告-博文内容区与评论区中间卡片广告',
+      name: '局部广告-卡片广告',
       desc: '点击右上角关闭',
       fastQuery: true,
       rules: [
-        {
-          key: 0,
-          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-          matches:
-            '[id="com.sina.weibo:id/left_img_container"] + LinearLayout >2 [id="com.sina.weibo:id/close"][clickable=true]',
-          snapshotUrls: 'https://i.gkd.li/i/12673043',
-        },
         {
           key: 1,
           activityIds: [
@@ -74,13 +23,6 @@ export default defineGkdApp({
             'https://i.gkd.li/i/19525985',
           ],
         },
-        {
-          key: 3,
-          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-          matches:
-            '[id="com.sina.weibo:id/tvTrendsTitle"] + [id="com.sina.weibo:id/iv_ad_x"]',
-          snapshotUrls: 'https://i.gkd.li/i/13787207',
-        },
         {
           key: 4,
           activityIds: '.feed.detailrefactor.DetailPageActivity',
@@ -90,75 +32,11 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 6,
-      name: '分段广告-评论区博主内容推荐',
-      desc: '评论区同一博主其他博文推荐',
-      fastQuery: true,
-      rules: [
-        {
-          key: 0,
-          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-          matches:
-            'RelativeLayout[visibleToUser=true] - RelativeLayout >n @[id="com.sina.weibo:id/ll_close"] > [id="com.sina.weibo:id/tv_tips"] + [id="com.sina.weibo:id/iv_close_icon"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12674498',
-            'https://i.gkd.li/i/13035647', // 限制 RelativeLayout[visibleToUser=true]，防止在这个快照中误触点赞按钮
-          ],
-        },
-        {
-          preKeys: [0],
-          activityIds: [
-            'com.sina.weibo.utils.WeiboDialog$CustomDialog',
-            'com.sina.weibo.feed.DetailWeiboActivity',
-          ],
-          matches: 'TextView[text="不感兴趣"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12674511',
-            'https://i.gkd.li/i/12929591',
-          ],
-        },
-      ],
-    },
-    {
-      key: 7,
-      name: '局部广告-首页顶部话题分享窗口',
-      rules: [
-        {
-          fastQuery: true,
-          activityIds: 'com.sina.weibo.MainTabActivity',
-          matches:
-            '[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',
-        },
-      ],
-    },
     {
       key: 8,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
       rules: [
-        {
-          key: 0,
-          activityIds: 'com.sina.weibo.business',
-          matches:
-            '@[id="com.sina.weibo:id/btn_close"] - FrameLayout > [id="com.sina.weibo:id/ad_tag"]',
-          snapshotUrls: 'https://i.gkd.li/i/12750090',
-        },
-        {
-          key: 1,
-          activityIds: 'com.sina.weibo.feed.MPDialogActivity',
-          matches:
-            'View[childCount=2] > @TextView[clickable=true] - View >n [visibleToUser=true][text="元"] <<n [id="com.sina.weibo:id/container"]',
-          snapshotUrls: 'https://i.gkd.li/i/13670266',
-        },
-        {
-          key: 2,
-          activityIds: 'com.sina.weibo.page.ad.DiscoverAdDialog',
-          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',
@@ -190,73 +68,6 @@ export default defineGkdApp({
           matches: '[text="暂不开启"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/18342279',
         },
-        {
-          key: 1,
-          activityIds: '.MainTabActivity',
-          matches:
-            '[text^="打开通知"] < LinearLayout + ImageView[id="com.sina.weibo:id/right_icon"]',
-          snapshotUrls: 'https://i.gkd.li/i/12705986',
-        },
-      ],
-    },
-    {
-      key: 11,
-      name: '局部广告-首页顶部签到卡片',
-      desc: '自动点击x按钮',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          activityIds: 'com.sina.weibo.MainTabActivity',
-          matches:
-            '[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',
-        },
-      ],
-    },
-    {
-      key: 13,
-      name: '局部广告-悬浮广告',
-      desc: '自动点击x按钮',
-      fastQuery: true,
-      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',
-        },
       ],
     },
     {
@@ -288,7 +99,7 @@ export default defineGkdApp({
     {
       key: 17,
       name: '分段广告-信息流广告',
-      desc: '点击X-点击"不感兴趣"/"不想看到此类内容"',
+      desc: '点击关闭-点击[不感兴趣]/[不想看到此类内容]',
       fastQuery: true,
       rules: [
         {
@@ -336,33 +147,21 @@ export default defineGkdApp({
 
         // 预留key
         {
-          preKeys: [0],
+          preKeys: [0, 1, 2, 3],
           key: 90,
-          name: '点击"不感兴趣"',
+          matchRoot: true,
           activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-          matches: '[text="不感兴趣"][clickable=true]',
+          anyMatches: [
-          snapshotUrls: 'https://i.gkd.li/i/13852322',
+            '[text="不感兴趣"][clickable=true]',
-        },
+            '@LinearLayout[clickable=true] >2 [text="不感兴趣" || text="不想看到此类内容"]',
-        {
+          ],
-          preKeys: [0, 1, 3],
-          key: 91,
-          name: '点击"不想看到此类内容"',
-          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
-          matches:
-            '@LinearLayout[index=1][clickable=true] >2 [text="不想看到此类内容"]',
           snapshotUrls: [
+            'https://i.gkd.li/i/13852322',
             'https://i.gkd.li/i/13958782',
             'https://i.gkd.li/i/16785777',
+            'https://i.gkd.li/i/14730274',
           ],
         },
-        {
-          preKeys: [2],
-          key: 92,
-          fastQuery: true,
-          activityIds: 'com.sina.weibo.MainTabActivity',
-          matches: '@[clickable=true] >2 [text="不感兴趣"]',
-          snapshotUrls: 'https://i.gkd.li/i/14730274',
-        },
       ],
     },
     {
@@ -453,7 +252,7 @@ export default defineGkdApp({
     },
     {
       key: 23,
-      name: '功能类-关闭猪手提示',
+      name: '其他-关闭猪手提示',
       desc: '点击[取消]',
       rules: [
         {