feat: 规则维护更新

src/apps/com.baidu.tieba.ts

@@ -43,6 +43,7 @@ export default defineGkdApp({
       desc: '关闭首页、帖子内的广告和直播推广',
       enable: false,
       fastQuery: true,
+      forcedTime: 10000,
       activityIds: [
         '.tblauncher.MainTabActivity',
         '.pb.pb.main.PbActivity',
@@ -91,25 +92,71 @@ export default defineGkdApp({
           matches:
             'ImageView[index=parent.childCount.minus(1)] < @[vid="obfuscated"][clickable=true] -n * < RelativeLayout + FrameLayout >n [text="广告"]',
           snapshotUrls: [
+            'https://i.gkd.li/i/16595301',
+            'https://i.gkd.li/i/16596195',
+            'https://i.gkd.li/i/16596775',
             'https://i.gkd.li/i/21524232',
             'https://i.gkd.li/i/21529443',
             'https://i.gkd.li/i/21556758',
             'https://i.gkd.li/i/24520138',
             'https://i.gkd.li/i/25710401',
+            'https://i.gkd.li/i/29640762', // ❗无快查,但是一截完快照它就触发了 (等第2次遇到再修)
           ],
         },
         {
           key: 5,
           activityIds: '.pb.pb.main.PbActivity',
           matches:
-            'ImageView[childCount=0] < @FrameLayout[clickable=true][childCount=1][visibleToUser=true] <2 RelativeLayout + RelativeLayout >3 [text="广告"]',
-          snapshotUrls: 'https://i.gkd.li/i/24541094',
+            '@[clickable=true][visibleToUser=true] <(1,2) RelativeLayout <(1,4) RelativeLayout[childCount>1] >(3,4) [text="广告"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/16595124',
+            'https://i.gkd.li/i/16596297',
+            'https://i.gkd.li/i/24541094',
+          ],
+          excludeSnapshotUrls: 'https://i.gkd.li/i/16632851', // [childCount>1] 防止误触
+        },
+        {
+          key: 6,
+          activityIds: '.tblauncher.MainTabActivity',
+          matches:
+            '@ImageView[childCount=0][clickable=true][visibleToUser=true] < LinearLayout[childCount=1] <4 RelativeLayout +3 LinearLayout >4 [text="小游戏"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/17943902',
+            'https://i.gkd.li/i/18217417',
+          ],
+        },
+        {
+          key: 7,
+          activityIds: '.tblauncher.MainTabActivity',
+          matches:
+            'ImageView < @[clickable=true] <2 FrameLayout[childCount=2] -n ViewGroup > [text="广告"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/28345921',
+            'https://i.gkd.li/i/28432320',
+          ],
+        },
+        {
+          key: 8,
+          activityIds: '.pb.pb.main.PbActivity',
+          matches:
+            'ImageView < @[clickable=true][width<82 && height<82] <5 [childCount=5] + [childCount=1] >4 [text="权限" || text="隐私" || text="功能"] -(1,2,3) [text$="有限公司"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/28389197',
+            'https://i.gkd.li/i/29578950',
+          ],
+        },
+        {
+          key: 9,
+          activityIds: '.tblauncher.MainTabActivity',
+          matches:
+            '@ImageView[clickable=true][width<78] <2 [childCount=2] >4 [text="语音中"]',
+          snapshotUrls: 'https://i.gkd.li/i/28432229',
         },
 
         // 第二段
         {
           key: 50,
-          preKeys: [0, 1, 2, 3, 4, 5],
+          preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
           name: '②点击[不感兴趣]', // 直接结束, 无需第三段
           matches:
             '@View[clickable=true][visibleToUser=true] - [text^="选择不喜欢"]',
@@ -121,20 +168,24 @@ export default defineGkdApp({
         },
         {
           key: 51,
-          preKeys: [0, 1, 2, 3, 4, 5],
+          preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
           name: '②选一个[理由]',
           matches:
-            '[text="已经看过" || text="广告重复" || text="不感兴趣"][clickable=true]',
+            '[text="已经看过" || text="内容质量差" || text="不感兴趣" || text="广告重复"][clickable=true]',
           snapshotUrls: [
-            'https://i.gkd.li/i/26634661', // [已经看过]
+            'https://i.gkd.li/i/26634661', // 已经看过、内容质量差
+            'https://i.gkd.li/i/28432358', // 已经看过、内容质量差、不感兴趣
           ],
         },
         {
           key: 52,
-          preKeys: [0, 1, 2, 3, 4, 5],
+          preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
           name: '②选[不喜欢]该直播',
           matches: '@[clickable=true] >3 [text="不喜欢"]',
-          snapshotUrls: 'https://i.gkd.li/i/27052244', // [不喜欢] 直播
+          snapshotUrls: [
+            'https://i.gkd.li/i/27052244', // [不喜欢] 直播
+            'https://i.gkd.li/i/28432247',
+          ],
         },
 
         // 第三段
@@ -152,7 +203,6 @@ export default defineGkdApp({
       name: '局部广告-首页、推荐列表顶部卡片式广告',
       desc: '关闭首页顶部的卡片广告和小游戏推广',
       matchTime: 10000,
-      forcedTime: 10000,
       actionMaximum: 1,
       activityIds: ['.tblauncher.MainTabActivity', '.frs.FrsActivity'],
       rules: [
@@ -195,11 +245,12 @@ export default defineGkdApp({
             'com.baidu.tbadk.browser.TBWebContainerActivity',
           ],
           matches:
-            'WebView[text!=null] > View[childCount=1] > View[childCount=3] > @[visibleToUser=true][index=2]',
+            'WebView[text!=null] > View[childCount=1] > View[childCount=3] > @[visibleToUser=true][index=2][width<150]',
           snapshotUrls: [
             'https://i.gkd.li/i/13060891',
             'https://i.gkd.li/i/16703244',
           ],
+          excludeSnapshotUrls: 'https://i.gkd.li/i/29640529', // [width<150]
         },
       ],
     },
@@ -346,58 +397,6 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 15,
-      name: '局部广告-信息流广告',
-      desc: '点击关闭',
-      fastQuery: true,
-      forcedTime: 10000,
-      rules: [
-        {
-          key: 0,
-          activityIds: '.pb.pb.main.PbActivity',
-          matches:
-            '@[clickable=true][visibleToUser=true] <(1,2) RelativeLayout <(1,4) RelativeLayout[childCount>1] >(3,4) [text="广告"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/16595124',
-            'https://i.gkd.li/i/16596297',
-          ],
-          excludeSnapshotUrls: 'https://i.gkd.li/i/16632851', // [childCount>1] 防止误触
-        },
-        {
-          key: 1,
-          activityIds: [
-            '.tblauncher.MainTabActivity',
-            '.pb.pb.main.PbActivity',
-            '.forum.ForumActivity',
-          ],
-          matches:
-            '@FrameLayout[clickable=true][visibleToUser=true] <4 RelativeLayout + FrameLayout >7 [text="广告"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/16595301',
-            'https://i.gkd.li/i/16596195',
-            'https://i.gkd.li/i/16596775',
-          ],
-        },
-        {
-          key: 2,
-          activityIds: '.tblauncher.MainTabActivity',
-          matches:
-            '@ImageView[childCount=0][clickable=true][visibleToUser=true] < LinearLayout[childCount=1] <4 RelativeLayout +3 LinearLayout >4 [text="小游戏"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/17943902',
-            'https://i.gkd.li/i/18217417',
-          ],
-        },
-        {
-          key: 3,
-          activityIds: '.tblauncher.MainTabActivity',
-          matches:
-            'ImageView < @[clickable=true] <2 FrameLayout[childCount=2] -3 ViewGroup > [text="广告"]',
-          snapshotUrls: 'https://i.gkd.li/i/28345921',
-        },
-      ],
-    },
     {
       key: 16,
       name: '局部广告-感兴趣的吧推广',

src/apps/com.chinamworld.bocmbci.ts

@@ -9,33 +9,27 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
       enable: false,
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
+      matchRoot: true, // 出现Ad时未关闭，录屏or截快照才响应
+      activityIds:
+        'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
       rules: [
         {
           key: 0,
-          fastQuery: true,
-          activityIds:
-            'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
           matches: '@[desc="关闭"] > [vid="btn_action"]',
           snapshotUrls: 'https://i.gkd.li/i/17691747',
         },
         {
           key: 1,
-          fastQuery: true,
-          activityIds:
-            'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
           matches:
-            '@Image[clickable=true][childCount=0][visibleToUser=true][width<150 && height<150] <2 View[childCount=2] < View <4 View < View < WebView < WebView < [vid="webview_layout"]',
-          snapshotUrls: 'https://i.gkd.li/i/19567854',
-        },
-        {
-          key: 2,
-          activityIds:
-            'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
-          matches:
-            '@Image[width<80 && height<80] <2 View[childCount=2] <<2 View[index=parent.childCount.minus(1)] <n [id="app"] <<4 [vid="webview_layout"]',
-          snapshotUrls: 'https://i.gkd.li/i/26644706',
+            '@Image[text=""][desc=null] <(1,2) View[childCount=2] <<(1,2) View <n [id="app"] <<4 [vid="webview_layout"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/19567854',
+            'https://i.gkd.li/i/26644706',
+            'https://i.gkd.li/i/29383961', // =!末尾子节点
+          ],
         },
       ],
     },

src/apps/com.google.android.youtube.ts

@@ -75,11 +75,12 @@ export default defineGkdApp({
           key: 0,
           name: '视频',
           matches:
-            '[!(getChild(0).getChild(0).desc="Image attachment")] + @[desc="不用了，谢谢" || desc="关闭" || desc="我暂时不要" || desc="Close" || desc="No thanks"][visibleToUser=true] <3 ViewGroup <<(-n+8) [vid="bottom_ui_container" || vid="custom"]',
+            '[!(getChild(0).getChild(0).desc="Image attachment")] + @[desc="不用了，谢谢" || desc="关闭" || desc="我暂时不要" || desc="Close" || desc="No thanks" || desc="I’ll pass this time"][clickable=true] <3 ViewGroup <<(-n+8) [vid="bottom_ui_container" || vid="custom"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13797512',
             'https://i.gkd.li/i/19578085',
             'https://i.gkd.li/i/25865404',
+            'https://i.gkd.li/i/28486200',
           ],
           // excludeSnapshotUrls: 'https://i.gkd.li/i/21978683',
           exampleUrls: 'https://e.gkd.li/1292c8c9-26e3-4053-bec4-e5ebe50cde8e',
@@ -109,17 +110,22 @@ export default defineGkdApp({
           actionCd: 500,
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
-          matches:
-            '@[desc^="翻译成"||desc^="Translate to"][visibleToUser=true] <n [childCount>3] <<(2,4) ViewGroup <n [vid="results" || vid="section_list"]',
-          exampleUrls: 'https://e.gkd.li/e9d6eaa8-9fbf-4b16-8f0c-50239597c687',
+          anyMatches: [
+            '@[desc^="翻译成"||desc^="Translate to"][visibleToUser=true] <n [childCount>3 && childCount<8] < [childCount=2] <(1,2) ViewGroup <n [vid="results" || vid="section_list"]',
+            '@[desc^="翻译成"||desc^="Translate to"][visibleToUser=true] <n [childCount=5] < [childCount=2] <2 [childCount=2] < ViewGroup <n [vid="results" || vid="section_list"]', // UI2
+          ],
           snapshotUrls: [
+            // 2024
             'https://i.gkd.li/i/17068544', // 翻译前
-            'https://i.gkd.li/i/27276425', // 控件类名不一致
             'https://i.gkd.li/i/17068647', // 翻译后
-            'https://i.gkd.li/i/17501400',
-            'https://i.gkd.li/i/25462152', // En_translate前
-            'https://i.gkd.li/i/25462248', // En_translate后
-            'https://i.gkd.li/i/27276291', // 评论-回复区UI
+            'https://i.gkd.li/i/17501400', // 回复-main
+            // English
+            'https://i.gkd.li/i/25462152', // 前
+            'https://i.gkd.li/i/25462248', // 后
+            // 其他
+            'https://i.gkd.li/i/27276291', // 回复-main-> fork 未实现
+            'https://i.gkd.li/i/29379961', // 会员评论
+            'https://i.gkd.li/i/27276425', // 控件类名不一致
           ],
         },
       ],

src/apps/com.jingdong.app.mall.ts

@@ -256,16 +256,20 @@ export default defineGkdApp({
     },
     {
       key: 13,
-      name: '功能类-支付订单后点击[完成]',
-      desc: '点击支付完成后的完成按钮',
+      name: '功能类-支付订单后点击[完成/回首页]',
+      desc: '点击支付完成后的[完成/回首页]按钮',
       enable: false,
       rules: [
         {
           fastQuery: true,
           activityIds:
             '.bundle.cashierfinish.view.CashierUserContentCompleteActivity',
-          matches: '[vid="lib_cashier_finish_back_page_text"]',
-          snapshotUrls: 'https://i.gkd.li/i/17358003',
+          matches:
+            '[vid="lib_cashier_finish_back_page_text" || text="回首页"][clickable=true][visibleToUser=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/17358003',
+            'https://i.gkd.li/i/29404312',
+          ],
         },
       ],
     },

src/apps/com.miui.player.ts

@@ -41,6 +41,16 @@ export default defineGkdApp({
             '@ViewGroup[clickable=true][childCount=0][visibleToUser=true] < ViewGroup[childCount=1] < ViewGroup[childCount=2] < FrameLayout < FrameLayout < [vid="webview_container"]',
           snapshotUrls: 'https://i.gkd.li/i/17783777',
         },
+        {
+          key: 4,
+          name: '体验臻品音质',
+          fastQuery: true,
+          activityIds:
+            'com.tencent.qqmusiclite.activity.player.MusicPlayerActivity',
+          matches:
+            '[text$="钟免费体验"] < * - [text$="臻品音质"] <2 * - @View[clickable=true][text=null][childCount=0] <<4 [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/29175549',
+        },
       ],
     },
     {

src/apps/com.sinovatech.unicom.ui.ts

@@ -27,21 +27,27 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       desc: '关闭各页面的全屏广告弹窗',
       enable: false,
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
       rules: [
         {
           key: 0,
+          name: '首页弹窗1',
           forcedTime: 10000,
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
           matches:
             '[text="首页弹窗"] >2 View > @Image[clickable=true][text!=null] <<n [vid="main_fragment_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/14504242',
         },
         {
           key: 1,
+          name: '首页弹窗2',
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
           matches:
             'WebView[text!=null] > View[id="app"] >2 View[childCount>3] > View[childCount=1] > @TextView[childCount=0][visibleToUser=true][text=""][width<150&&height<150] <<n [vid="main_fragment_layout" || vid="main_fragment_layout_haoka"]',
@@ -50,6 +56,30 @@ export default defineGkdApp({
             'https://i.gkd.li/i/18290899',
           ],
         },
+        {
+          key: 2,
+          name: '首页弹窗3',
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
+          matches:
+            '@Image[text^="close"][childCount=0][width<150 && height<150] <2 View < View <2 View < View < View <2 View < View < WebView < WebView < [vid="homeweb_rootview"]',
+          snapshotUrls: 'https://i.gkd.li/i/23764750',
+        },
+        {
+          key: 5,
+          name: '全屏广告-剩余话费弹窗广告',
+          actionMaximum: 1,
+          resetMatch: 'app',
+          fastQuery: true,
+          activityIds:
+            'com.sinovatech.unicom.basic.ui.activity.WebDetailActivity',
+          matches:
+            '@TextView[index=parent.childCount.minus(1)][width<78 && height<78] <n View[left=0 && top=0] <n View[left=0 && top=0] <<3 WebView - [vid="toutiao_webview_xinxiliu_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/28557416',
+        },
       ],
     },
     {

src/apps/com.taobao.taobao.ts

@@ -244,6 +244,7 @@ export default defineGkdApp({
         {
           key: 7,
           name: '首页横条广告',
+          matchRoot: true,
           activityIds: 'com.taobao.tao.welcome.Welcome',
           matches: '[desc.length=4] < * + @[clickable=true] > [text="뉜"]',
           snapshotUrls: 'https://i.gkd.li/i/25658605',