feat: 规则维护更新

src/apps/com.alibaba.android.rimet.ts

@@ -73,6 +73,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13402478',
         },
         {
+          key: 1,
           matches:
             'TextView[id="com.alibaba.android.rimet:id/dialog_close_button"]',
           snapshotUrls: 'https://i.gkd.li/i/13772151',

src/apps/com.eg.android.AlipayGphone.ts

@@ -42,6 +42,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/19449399',
             'https://i.gkd.li/i/20684144',
             'https://i.gkd.li/i/23455533',
+            'https://i.gkd.li/i/25000603',
           ],
           excludeSnapshotUrls: ['https://i.gkd.li/i/19478718'],
         },
@@ -328,6 +329,7 @@ export default defineGkdApp({
             'com.alipay.mobile.nebulax.xriver.activity.XRiverTransActivity$Main',
             'com.alipay.android.living.activity.LivingNotTransparentDetailActivity',
             '.AlipayLogin',
+            'com.alipay.android.phone.wallet.blessingcard_receive.biz.activity.ReceiveDialogActivity',
           ],
           matches: [
             '[text="访问被拒绝" || text="人气太旺啦，请稍后再试" || text="訪問被拒絕" || text="人氣太旺啦，請稍後再試" || text="伺服器繁忙，請稍後再試"][visibleToUser=true]',
@@ -340,6 +342,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/24353818',
             'https://i.gkd.li/i/24353826',
             'https://i.gkd.li/i/24183318',
+            'https://i.gkd.li/i/25199767',
           ],
         },
       ],

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

@@ -147,7 +147,7 @@ export default defineGkdApp({
           ],
         },
         {
-          key: 2,
+          key: 1,
           activityIds: 'com.jingdong.app.mall.MainFrameActivity',
           anyMatches: [
             '[id="android:id/content"] > RelativeLayout > RelativeLayout > *[childCount=2] > ImageView[index=1][clickable=true][!(desc="拍照购")]',
@@ -160,6 +160,22 @@ export default defineGkdApp({
             'https://i.gkd.li/i/13165721',
           ],
         },
+        {
+          key: 2,
+          name: '购物车页面支付成功广告弹窗',
+          activityIds: 'com.jd.lib.cart.ShoppingCartNewActivity',
+          fastQuery: true,
+          matches: ['@ImageView - ViewGroup >2 TextView[text="查看订单"]'],
+          snapshotUrls: 'https://i.gkd.li/import/13446362',
+        },
+        {
+          key: 3,
+          name: '加入购物车后出现的弹窗',
+          activityIds: 'com.jd.lib.productdetail.ProductDetailActivity',
+          fastQuery: true,
+          matches: ['[text="继续逛"][clickable=true]'],
+          snapshotUrls: 'https://i.gkd.li/i/15047243',
+        },
       ],
     },
     {
@@ -218,7 +234,7 @@ export default defineGkdApp({
       desc: '点击确认登录按钮',
       enable: false,
       activityIds: 'com.jingdong.app.mall.WebActivity',
-      rules: '[text="京东登录"] > [desc="确认登录"]',
+      rules: '@[desc="确认登录"][clickable=true] > [text="确认登录"]',
       snapshotUrls: 'https://i.gkd.li/import/12901734',
     },
     {
@@ -230,20 +246,6 @@ export default defineGkdApp({
       rules: 'ImageView[clickable=true && desc="关闭"]',
       snapshotUrls: 'https://i.gkd.li/import/13191146',
     },
-    {
-      key: 12,
-      name: '全屏广告-购物车页面支付成功广告弹窗',
-      desc: '关闭购物车支付成功后的广告弹窗',
-      enable: false,
-      fastQuery: true,
-      rules: [
-        {
-          activityIds: 'com.jd.lib.cart.ShoppingCartNewActivity',
-          matches: '@ImageView - ViewGroup >2 TextView[text="查看订单"]',
-          snapshotUrls: 'https://i.gkd.li/import/13446362',
-        },
-      ],
-    },
     {
       key: 13,
       name: '功能类-支付订单后点击[完成]',

src/apps/com.max.xiaoheihe.ts

@@ -48,13 +48,15 @@ export default defineGkdApp({
       activityIds: [
         '.module.bbs.post.ui.activitys.WebNewsPostPageActivity',
         '.module.bbs.post.ui.activitys.PicturePostPageActivity',
+        '.module.bbs.post.ui.activitys.v2.PicturePostPageActivityV2',
       ],
       rules: [
         {
-          matches: '[vid="tv_original"][visibleToUser=true]',
+          matches: '[vid="tv_original"][clickable=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/16646832',
             'https://i.gkd.li/i/17574462',
+            'https://i.gkd.li/i/25336815',
           ],
           excludeSnapshotUrls: 'https://i.gkd.li/i/22377026',
         },

src/apps/com.taobao.taobao.ts

@@ -259,6 +259,7 @@ export default defineGkdApp({
         'com.taobao.android.order.bundle.TBOrderListActivity',
         'com.taobao.search.sf.MainSearchResultActivity',
         'com.taobao.browser.BrowserActivity',
+        'com.taobao.themis.container.app.TMSActivity',
       ],
       rules: '[vid="update_imageview_cancel_v2"]',
       snapshotUrls: [
@@ -267,6 +268,7 @@ export default defineGkdApp({
         'https://i.gkd.li/import/13965740',
         'https://i.gkd.li/i/14899863',
         'https://i.gkd.li/i/24861114',
+        'https://i.gkd.li/i/24999523',
       ],
     },
     {

src/apps/com.tencent.mm.ts

@@ -144,6 +144,7 @@ export default defineGkdApp({
             'https://i.gkd.li/import/13522577', // activityIds: 'com.tencent.mm.ui.LauncherUI'
             'https://i.gkd.li/i/19399694',
             'https://i.gkd.li/i/22356438',
+            'https://i.gkd.li/i/25315046', //zh_TW
           ],
         },
         {
@@ -260,10 +261,12 @@ export default defineGkdApp({
             '.plugin.luckymoney.ui.LuckyMoneyNotHookReceiveUI',
             '.plugin.luckymoney.ui.LuckyMoneyNewReceiveUI',
           ],
-          matches: '@Button[desc="开"] -3 LinearLayout >2 [text$="红包"]',
+          matches:
+            '@Button[desc="开" || desc="開"] -3 LinearLayout >2 [text$="红包" || text$="紅包"]',
           snapshotUrls: [
             'https://i.gkd.li/i/18134828',
             'https://i.gkd.li/i/21177180',
+            'https://i.gkd.li/i/25315061', //zh_TW
           ],
           excludeSnapshotUrls: 'https://i.gkd.li/i/12567698', // 金币动画的快照
         },
@@ -274,12 +277,14 @@ export default defineGkdApp({
             '.plugin.luckymoney.ui.LuckyMoneyDetailUI',
             '.plugin.luckymoney.ui.LuckyMoneyNewDetailUI',
           ],
-          matches: '@ImageView[desc="返回"] +n LinearLayout >8 [text$="红包"]',
+          matches:
+            '@ImageView[desc="返回"] +n LinearLayout >8 [text$="红包" || text$="紅包"]',
           snapshotUrls: [
             'https://i.gkd.li/i/18134829',
             'https://i.gkd.li/i/18135031',
             'https://i.gkd.li/i/23825631',
             'https://i.gkd.li/i/24414957',
+            'https://i.gkd.li/i/25315062', //zh_TW
           ],
         },
       ],
@@ -394,7 +399,6 @@ export default defineGkdApp({
       name: '功能类-自动选中发送原图',
       desc: '图片和视频选择器-自动选中底部中间的发送原图',
       enable: false,
-      fastQuery: true,
       actionMaximum: 1,
       activityIds: [
         'com.tencent.mm.plugin.gallery.ui.AlbumPreviewUI',
@@ -403,8 +407,9 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
-          matches:
-            '@[desc="未选中,原图,复选框"][text=null||text=""][visibleToUser=true] <(1,2) [name$="Layout"][childCount=2] > [text="原图"]',
+          anyMatches: [
+            '[desc="未选中,原图,复选框" || desc="未選定，原圖，複選對話方塊"][text=null||text=""][visibleToUser=true] <(1,2) [name$="Layout"][childCount=2] > ImageButton[index=0]',
+          ],
           snapshotUrls: [
             'https://i.gkd.li/i/16987145', // 未选中
             'https://i.gkd.li/i/16987144', // 未选中
@@ -429,9 +434,8 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          anyMatches: [
-            'Button[text^="查看"][clickable=true][visibleToUser=true]',
-            'Button[clickable=true][text^="查看"][visibleToUser=true]',
+          matches: [
+            'Button[text~=".*原.*\\\\d+(\\\\.\\\\d+)?\\\\s*[KMG]B?\\\\)?$"]',
           ],
           snapshotUrls: [
             'https://i.gkd.li/import/13523031',
@@ -440,6 +444,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/17698956',
             'https://i.gkd.li/i/19515095',
             'https://i.gkd.li/i/19645122',
+            'https://i.gkd.li/i/25009442',
           ],
         },
       ],
@@ -462,8 +467,8 @@ export default defineGkdApp({
           forcedTime: 10000,
           fastQuery: true,
           matches: [
-            '[text="广告"][visibleToUser=true]',
-            '[text="跳过"][visibleToUser=true]',
+            '[text="广告" || text="廣告"][visibleToUser=true]',
+            '[text="跳过" || text="跳過"][visibleToUser=true]',
           ],
           snapshotUrls: [
             'https://i.gkd.li/import/12701979',
@@ -484,7 +489,7 @@ export default defineGkdApp({
           actionDelay: 300, // 过早触发有概率无效
           resetMatch: 'app',
           fastQuery: true,
-          excludeMatches: '[text="跳过"][visibleToUser=true]', // 防止提前触发导致失效
+          excludeMatches: '[text="跳过" || text="跳過"][visibleToUser=true]', // 防止提前触发导致失效
           matches: [
             'ImageView[childCount=0][visibleToUser=true] < FrameLayout < @FrameLayout[visibleToUser=true] <2 * - * >(4,5) [text="广告"||text="查看详情"]',
           ],
@@ -641,7 +646,7 @@ export default defineGkdApp({
           key: 0,
           name: '点击[X]-1',
           matches:
-            'View[childCount>=2] >n [name$="View"][desc.length>=1] - View[desc$="推​荐​"][childCount>=2] > ImageView[clickable=true][visibleToUser=true][index=parent.childCount.minus(1)][width<100&&height<100][clickable=true]',
+            'View[childCount>=2] >n [name$="View"][desc.length>=1] - View[desc$="推​荐​" || desc$="推​薦​"][childCount>=2] > ImageView[clickable=true][visibleToUser=true][index=parent.childCount.minus(1)][width<100&&height<100][clickable=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/14436176',
             'https://i.gkd.li/i/14392392',
@@ -736,7 +741,11 @@ export default defineGkdApp({
       rules: [
         {
           fastQuery: true,
-          activityIds: ['.ui.LauncherUI', '.ui.chatting.ChattingUI'],
+          activityIds: [
+            '.ui.LauncherUI',
+            '.ui.chatting.ChattingUI',
+            '.ui.chatting.variants.ChattingMainUI',
+          ],
           anyMatches: [
             '@[clickable=true] >(1,2) [text="转文字"]',
             '@[clickable=true] -2 FrameLayout >2 [desc^="语音" && desc$="未播放"] + [text~="(?is)[0-9].*"]',
@@ -748,6 +757,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/19792042',
             'https://i.gkd.li/i/18135057',
             'https://i.gkd.li/i/24989479',
+            'https://i.gkd.li/i/25002786',
           ],
           excludeSnapshotUrls: ['https://i.gkd.li/i/21792783'],
         },

src/apps/com.tencent.mobileqq.ts

@@ -77,6 +77,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/17529150',
             'https://i.gkd.li/i/23837678',
             'https://i.gkd.li/i/24230528',
+            'https://i.gkd.li/i/25235782',
           ],
           excludeSnapshotUrls: [
             'https://i.gkd.li/i/14414585', //  误触

src/apps/com.twitter.android.ts

@@ -47,7 +47,7 @@ export default defineGkdApp({
           key: 2,
           name: '点击右上角关闭-英文',
           matches:
-            '[id="com.twitter.android:id/tweet_ad_badge_top_right"] + [id="com.twitter.android:id/tweet_curation_action"]',
+            '@[vid="tweet_curation_action"] - [vid="tweet_ad_badge_top_right"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/import/13680756',
             'https://i.gkd.li/i/24359526',
@@ -58,7 +58,7 @@ export default defineGkdApp({
           key: 10,
           name: '点击屏蔽',
           matches:
-            '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="Block"||text^="封鎖"][visibleToUser=true]',
+            '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="Block"||text^="封鎖"||text^="隐藏 @"||text^="Hide @"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/import/12798810',
             'https://i.gkd.li/i/14782902',
@@ -69,22 +69,39 @@ export default defineGkdApp({
             'https://i.gkd.li/i/20034038', // 封鎖
             'https://i.gkd.li/i/20239421',
             'https://i.gkd.li/i/24359537',
+            'https://i.gkd.li/i/25089665',
           ],
         },
         {
           preKeys: 10,
           key: 11,
           name: '二次确认-点击屏蔽',
           matches:
-            '[text="取消"||text^="Cancel"] + [text="屏蔽"||text^="Block"||text^="封鎖"]',
+            '[text="取消"||text^="Cancel"] + [text="屏蔽"||text^="Block"||text^="封鎖"||text="是的，我确定"||text^="Yes"]',
           snapshotUrls: [
             'https://i.gkd.li/import/12828832', // com.twitter.tweetdetail.TweetDetailActivity
             'https://i.gkd.li/import/12904601', // com.twitter.app.profiles.ProfileActivity
             'https://i.gkd.li/import/13680798', // 兼容英文
+            'https://i.gkd.li/i/25089666',
           ],
         },
       ],
     },
+    {
+      key: 2,
+      name: '全屏广告-关闭[开启个性化广告]弹窗',
+      desc: '关闭[开启个性化广告]弹窗',
+      enable: false,
+      rules: [
+        {
+          fastQuery: true,
+          activityIds: 'com.twitter.app.main.MainActivity',
+          matches:
+            '[vid="secondary_button"][clickable=true][getChild(0).getChild(0).getChild(0).text="保留更少相关广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/25150279',
+        },
+      ],
+    },
     {
       key: 6,
       name: '功能类-自动点击翻译',

src/apps/tv.danmaku.bili.ts

@@ -131,6 +131,18 @@ export default defineGkdApp({
         },
       ],
     },
+    {
+      key: 6,
+      name: '局部广告-首页浮标广告',
+      rules: [
+        {
+          fastQuery: true,
+          activityIds: '.MainActivityV2',
+          matches: '[vid="animation_close"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/25357810',
+        },
+      ],
+    },
     {
       key: 7,
       name: '局部广告-视频页广告',
@@ -172,11 +184,12 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            '[id="tv.danmaku.bili:id/shopping_close" || vid="live_game_card_close" || vid="match_close"][visibleToUser=true]',
+            '[id="tv.danmaku.bili:id/shopping_close" || vid="live_game_card_close" || vid="match_close" || vid="iv_pop_rank_guide_card_close"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/13200549',
             'https://i.gkd.li/i/22990081',
             'https://i.gkd.li/i/23098023',
+            'https://i.gkd.li/i/25238734',
           ],
         },
         {
@@ -189,6 +202,18 @@ export default defineGkdApp({
             'https://i.gkd.li/i/22990105',
           ],
         },
+        {
+          key: 2,
+          matchTime: 10000,
+          actionMaximum: 1, //防止循环展开关闭
+          matches:
+            'View[visibleToUser=true] <<2 @[clickable=true] < [vid="pager"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/24985920',
+            'https://i.gkd.li/i/25240029',
+          ],
+          excludeSnapshotUrls: ['https://i.gkd.li/i/25369451'],
+        },
       ],
     },
     {