perf: 豆瓣

src/appDeprecatedKeys.ts

@@ -390,7 +390,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.douban.frodo',
     name: '豆瓣',
-    deprecatedKeys: [0, 7, 12],
+    deprecatedKeys: [0, 1, 2, 4, 7, 9, 12],
   },
   {
     id: 'com.dragon.read',

src/apps/com.douban.frodo.ts

@@ -26,10 +26,11 @@ export default defineGkdApp({
             left: 'width * 0.8833',
             top: 'width * 0.1388',
           },
-          matches: '[id="com.douban.frodo:id/_ad_image_"][width!=1200]',
+          matches: '[vid="ad_view"][visibleToUser=true][width!=1200]',
           snapshotUrls: [
             'https://i.gkd.li/i/13575257',
             'https://i.gkd.li/i/13575547',
+            'https://i.gkd.li/i/18423724',
           ],
         },
         {
@@ -39,7 +40,7 @@ export default defineGkdApp({
             left: 'width * 0.8666',
             top: 'width * 0.1625',
           },
-          matches: '[id="com.douban.frodo:id/_ad_image_"][width=1200]',
+          matches: '[vid="ad_view"][visibleToUser=true][width=1200]',
           snapshotUrls: [
             'https://i.gkd.li/i/13601755',
             'https://i.gkd.li/i/16054268',
@@ -53,123 +54,70 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 1,
-      name: '功能类-不分享/同步作品短评',
-      desc: '书影音-作品-状态-不分享/同步短评(5s后可手动)',
-      fastQuery: true,
-      matchTime: 5000,
-      activityIds: 'com.douban.frodo.subject.activity.RatingActivity',
-      rules: [
-        {
-          key: 0,
-          name: '不分享到微信、微博',
-          matches:
-            '@LinearLayout > [id="com.douban.frodo:id/check_weibo_wechat"][visibleToUser=true][checked=true]',
-          snapshotUrls: ['https://i.gkd.li/i/12508777'],
-        },
-        {
-          key: 1,
-          name: '不同步到动态',
-          matches:
-            '@LinearLayout > [id="com.douban.frodo:id/check_status"][visibleToUser=true][checked=true]',
-          snapshotUrls: ['https://i.gkd.li/i/12508777'],
-        },
-      ],
-    },
-    {
-      key: 2,
-      name: '分段广告-剧照广告',
-      activityIds: 'com.douban.frodo.baseproject.image.SociableImageActivity',
-      rules: [
-        {
-          matches:
-            'TextView[id="com.douban.frodo:id/ad_not_interest"][text="广告"][visibleToUser=true]',
-          snapshotUrls: 'https://i.gkd.li/i/12509475',
-        },
-        {
-          matches:
-            'TextView[id="com.douban.frodo:id/mainText"][text="不感兴趣"]',
-          snapshotUrls: 'https://i.gkd.li/i/12509476',
-        },
-      ],
-    },
     {
       key: 3,
       name: '分段广告-信息流广告',
       desc: '点击关闭-点击不感兴趣',
       fastQuery: true,
-      activityIds: [
-        'com.douban.frodo.activity.SplashActivity',
-        'com.douban.frodo.status.activity.StatusDetailActivity',
-        'com.douban.frodo.subject.structure.activity.MovieActivity',
-        'com.douban.frodo.subject.activity.ForumTopicActivity',
-        'com.douban.frodo.group.activity.GroupDetailActivity',
-        'com.douban.frodo.group.activity.GroupTopicActivity',
-        'com.douban.frodo.search.activity.NewSearchActivity',
-      ],
       rules: [
         {
           key: 1,
-          name: '首页-动态-信息流广告',
+          activityIds: [
+            '.activity.SplashActivity',
+            '.subject.structure.activity.MovieActivity',
+            '.group.activity.GroupTopicActivity',
+          ],
           matches:
-            'ImageView[id="com.douban.frodo:id/avatar"][index=0] +n ImageView[id="com.douban.frodo:id/menu_item"]',
+            '[vid="ad_header_new"] > [vid="menu_item"][visibleToUser=true]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12547964',
+            'https://i.gkd.li/i/18424402',
-            'https://i.gkd.li/i/12548011',
+            'https://i.gkd.li/i/18424418',
-            'https://i.gkd.li/i/12548046',
+            'https://i.gkd.li/i/18424924',
           ],
         },
         {
           key: 2,
-          name: '小组-帖子列表信息流广告',
+          activityIds: [
-          matches: '[text!=null] + [text="广告"][visibleToUser=true]',
+            '.group.activity.GroupDetailActivity',
+            '.group.activity.GroupTopicActivity',
+          ],
+          matches:
+            '[vid="ad_not_interest" || vid="ad_tag" || vid="group_ad_not_interest"][visibleToUser=true]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12723569',
+            'https://i.gkd.li/i/18424568',
-            'https://i.gkd.li/i/13347455',
+            'https://i.gkd.li/i/18424574',
-            'https://i.gkd.li/i/13692895',
+            'https://i.gkd.li/i/18424681',
-            'https://i.gkd.li/i/16369005',
+            'https://i.gkd.li/i/18424818',
           ],
           excludeSnapshotUrls: 'https://i.gkd.li/i/18422533',
         },
         {
-          name: '点击不感兴趣',
+          key: 3,
-          preKeys: [1, 2],
+          actionMaximum: 1,
+          activityIds: '.group.activity.GroupTopicActivity',
+          matches:
+            '@Image[childCount=0][visibleToUser=true][text=""] < View[childCount=1] -2 View >2 [childCount=0][text="广告"] <<n [vid="structure_header_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/18424747',
+        },
+        {
+          preKeys: [1, 2, 3],
+          activityIds: [
+            '.activity.SplashActivity',
+            '.subject.structure.activity.MovieActivity',
+            '.group.activity.GroupDetailActivity',
+            '.group.activity.GroupTopicActivity',
+          ],
           matches: '@[clickable=true] > [text="不感兴趣"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12548016',
+            'https://i.gkd.li/i/18424404',
-            'https://i.gkd.li/i/12723422',
+            'https://i.gkd.li/i/18424419',
-            'https://i.gkd.li/i/12548016',
+            'https://i.gkd.li/i/18424568',
-            'https://i.gkd.li/i/12723422',
+            'https://i.gkd.li/i/18424674',
-            'https://i.gkd.li/i/16369007',
+            'https://i.gkd.li/i/18424711',
           ],
         },
       ],
     },
-    {
-      key: 4,
-      name: '分段广告-卡片广告',
-      desc: '点击关闭-点击不感兴趣',
-      // 豆瓣在屏幕之外渲染了大量节点, 在节点肉眼不可见但是无障碍可见的情况下, 仍然会触发大量点击
-      // 发现增加一个较高的 cd 值可以避免后续广告节点出现, 从而不会触发点击
-      actionCd: 10000,
-      activityIds: 'com.douban.frodo.activity.SplashActivity',
-      rules: [
-        {
-          key: 0,
-          name: '点击"广告"',
-          matches:
-            '@View[clickable=true] > Image - TextView[text="广告"][visibleToUser=true]',
-          snapshotUrls: 'https://i.gkd.li/i/12548131',
-        },
-        {
-          preKeys: [0],
-          name: '点击"不感兴趣"',
-          matches: '[text="不感兴趣"][visibleToUser=true]',
-          snapshotUrls: 'https://i.gkd.li/i/12548116',
-        },
-      ],
-    },
     {
       key: 5,
       name: '评价提示-关闭评分反馈弹窗',
@@ -190,37 +138,26 @@ export default defineGkdApp({
     },
     {
       key: 8,
-      name: '局部广告-搜索页/帖子内容与评论区中间的卡片广告',
+      name: '局部广告-卡片广告',
       desc: '点击关闭',
       actionMaximum: 1,
       rules: [
         {
           key: 0,
-          name: '点击"x"关闭型',
+          fastQuery: true,
-          activityIds: 'com.douban.frodo.group.activity.GroupTopicActivity',
+          activityIds: '.group.activity.GroupTopicActivity',
           matches:
-            'ImageView[id=null] +(n) LinearLayout[childCount<=2] + FrameLayout[childCount=1] > ImageView[id=null][visibleToUser=true][top>250]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序" || text="了解更多"][visibleToUser=true]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/18424415',
-            'https://i.gkd.li/i/12674798',
-            'https://i.gkd.li/i/12674842',
-            'https://i.gkd.li/i/12723462',
-            'https://i.gkd.li/i/12723800',
-            'https://i.gkd.li/i/13402399', // 添加[top>250]，避免误触快照中"更多"按钮
-            'https://i.gkd.li/i/12548476',
-          ],
-        },
-      ],
         },
         {
-      key: 9,
+          key: 1,
-      name: '局部广告-个性化内容推荐弹窗',
+          fastQuery: true,
-      desc: '首页底部-个性化内容推荐弹窗-点击卡片右上角x直接关闭',
+          activityIds: '.group.activity.GroupTopicActivity',
-      rules: [
-        {
-          activityIds: 'com.douban.frodo.activity.SplashActivity',
           matches:
-            '[id="com.douban.frodo:id/info"][text^="开启个性化推荐"] - [id="com.douban.frodo:id/close"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] <3 FrameLayout +2 FrameLayout >2 [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序" || text="了解更多"]',
-          snapshotUrls: 'https://i.gkd.li/i/12836798',
+          exampleUrls: 'https://e.gkd.li/735decb0-7f08-4c7d-8199-a38faf213f77',
+          snapshotUrls: 'https://i.gkd.li/i/18424859',
         },
       ],
     },
@@ -231,7 +168,6 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '腾讯广告-1',
           fastQuery: true,
           activityIds:
             'com.douban.frodo.subject.structure.activity.MovieActivity',
@@ -241,7 +177,6 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          name: '腾讯广告-2',
           fastQuery: true,
           matches:
             '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null] <2 FrameLayout[childCount=5] + FrameLayout[childCount=2] > [text^="立即" || text="查看详情" || text="了解更多" || text="去逛逛" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',
@@ -271,7 +206,10 @@ export default defineGkdApp({
             '.activity.BetaApkDialogActivity',
             '.activity.SplashActivity',
           ],
-          matches: ['[text="新版试用邀请"]', '@[text="取消"] + [text="下载"]'],
+          matches: [
+            '[text="新版试用邀请"][visibleToUser=true]',
+            '[text="取消"][visibleToUser=true]',
+          ],
           snapshotUrls: [
             'https://i.gkd.li/i/13228832',
             'https://i.gkd.li/i/13659160',