feat: 更新规则

MengNianxiaoyao · Jul 2, 2024 · 5376802 · 5376802
1 parent bfe3590
commit 5376802
Show file tree

Hide file tree

Showing 77 changed files with 321 additions and 121 deletions.
diff --git a/src/apps/app.esou.ts b/src/apps/app.esou.ts
@@ -16,7 +16,7 @@ export default defineGkdApp({
           key: 0,
           quickFind: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/fe2a046b-1abe-4aba-a0df-8d9568211e0d',
           snapshotUrls: 'https://i.gkd.li/i/14189313',

diff --git a/src/apps/bin.mt.plus.ts b/src/apps/bin.mt.plus.ts
@@ -8,11 +8,14 @@ export default defineGkdApp({
       key: 1,
       name: '更新提示',
       quickFind: true,
-      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="取消"] + [text="更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/12908784',
+      rules: [
+        {
+          matches: ['[text="更新"]', '[text="取消"]'],
+          snapshotUrls: 'https://i.gkd.li/i/16050794',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cn.lezhi.speedtest.ts b/src/apps/cn.lezhi.speedtest.ts
@@ -17,7 +17,7 @@ export default defineGkdApp({
           key: 0,
           name: '字节SDK',
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13544242',
             'https://i.gkd.li/i/13885906',

diff --git a/src/apps/cn.wsds.gamemaster.ts b/src/apps/cn.wsds.gamemaster.ts
@@ -14,7 +14,7 @@ export default defineGkdApp({
         {
           quickFind: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13930391',
         },
       ],

diff --git a/src/apps/cn.xiaochuankeji.zuiyouLite.ts b/src/apps/cn.xiaochuankeji.zuiyouLite.ts
@@ -17,7 +17,7 @@ export default defineGkdApp({
           key: 0,
           quickFind: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14546304',
         },
         {

diff --git a/src/apps/com.UCMobile.ts b/src/apps/com.UCMobile.ts
@@ -16,7 +16,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13188653',
         },
         {

diff --git a/src/apps/com.app.lantt.xs.ts b/src/apps/com.app.lantt.xs.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14899867',
         },
       ],

diff --git a/src/apps/com.baidu.duer.superapp.ts b/src/apps/com.baidu.duer.superapp.ts
@@ -23,7 +23,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/7d338956-f006-4775-a418-2ae6dc21ef9a',
           snapshotUrls: 'https://i.gkd.li/i/14204175',

diff --git a/src/apps/com.baidu.input.ts b/src/apps/com.baidu.input.ts
@@ -20,7 +20,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14406395',
         },
       ],

diff --git a/src/apps/com.baidu.netdisk.samsung.ts b/src/apps/com.baidu.netdisk.samsung.ts
@@ -23,7 +23,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/7f1babd6-7da3-4733-aca9-80ddf3c0a84e',
           snapshotUrls: 'https://i.gkd.li/i/14596658',

diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts
@@ -26,7 +26,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13322227',
         },
         {
@@ -319,5 +319,25 @@ export default defineGkdApp({
         },
       ],
     },
+    {
+      key: 15,
+      name: '局部广告-信息流广告',
+      desc: '点击关闭',
+      rules: [
+        {
+          quickFind: true,
+          activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
+          matches:
+            '@FrameLayout[clickable=true] <n RelativeLayout + * [text="广告"]',
+          exampleUrls:
+            'https://m.gkd.li/57941037/163e225e-209b-40a0-a98e-e2b627df529c',
+          snapshotUrls: [
+            'https://i.gkd.li/i/16038470',
+            'https://i.gkd.li/i/16038471',
+            'https://i.gkd.li/i/16038472',
+          ],
+        },
+      ],
+    },
   ],
 });
diff --git a/src/apps/com.black.unique.ts b/src/apps/com.black.unique.ts
@@ -26,7 +26,7 @@ export default defineGkdApp({
       rules: [
         {
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/63a72bd6-72be-410c-86ab-09ba7a4fa318',
           snapshotUrls: 'https://i.gkd.li/i/14167393',

diff --git a/src/apps/com.byfen.market.ts b/src/apps/com.byfen.market.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13298944',
             'https://i.gkd.li/i/13800021',

diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
@@ -36,14 +36,62 @@ export default defineGkdApp({
             'View[clickable=true] > @[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/14033859',
         },
+        {
+          key: 3,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches: '[vid="dialog_full_image_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13842492',
+        },
+        {
+          key: 4,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches:
+            '@[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/14033859',
+        },
       ],
     },
     {
       key: 2,
-      name: '局部广告-包裹页面-地图底部横条广告',
-      activityIds: 'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
-      rules: 'View[desc="立即查看"] +2 ImageView[id=null]',
-      snapshotUrls: 'https://i.gkd.li/i/12914450',
+      name: '局部广告-卡片广告',
+      rules: [
+        {
+          key: 0,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: 'View[desc="立即查看"] +2 ImageView[id=null]',
+          snapshotUrls: 'https://i.gkd.li/i/12914450',
+        },
+        {
+          key: 1,
+          quickFind: true,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: '[vid="iv_banner_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/15879126',
+        },
+        {
+          key: 2,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches:
+            'FrameLayout[childCount=8] > @FrameLayout[clickable=true][childCount=0][text=null] <<n [vid="layout_root"]',
+          snapshotUrls: 'https://i.gkd.li/i/16024305',
+        },
+        {
+          key: 3,
+          quickFind: true,
+          activityIds:
+            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+          matches: '[vid="home_task_action_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/16024305',
+        },
+      ],
     },
     {
       key: 4,
@@ -78,29 +126,6 @@ export default defineGkdApp({
         'https://i.gkd.li/i/14969859',
       ],
     },
-    {
-      key: 7,
-      name: '全屏广告-今日手气红包',
-      desc: '点击右上角X',
-      quickFind: true,
-      activityIds:
-        'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
-      rules: '[vid="dialog_full_image_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13842492',
-    },
-    {
-      key: 8,
-      name: '全屏广告-发现页新装试用弹窗',
-      desc: '点击X',
-      rules: [
-        {
-          activityIds:
-            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
-          matches: 'View[childCount=2][clickable=true] > [text="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/i/14033859',
-        },
-      ],
-    },
     {
       key: 9,
       name: '功能类-询问[是否要查询包裹]弹窗',
@@ -132,19 +157,5 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 11,
-      name: '局部广告-包裹页面-物流信息底部横条广告',
-      desc: '点击右上角关闭',
-      rules: [
-        {
-          quickFind: true,
-          activityIds:
-            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
-          matches: '[vid="iv_banner_close"]',
-          snapshotUrls: 'https://i.gkd.li/i/15879126',
-        },
-      ],
-    },
   ],
 });
diff --git a/src/apps/com.chunqiu.ah.ts b/src/apps/com.chunqiu.ah.ts
@@ -29,7 +29,7 @@ export default defineGkdApp({
         {
           key: 2,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/15258457',
         },
       ],

diff --git a/src/apps/com.coolapk.market.ts b/src/apps/com.coolapk.market.ts
@@ -20,7 +20,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12503773',
             'https://i.gkd.li/i/13247610',

diff --git a/src/apps/com.delicloud.app.smartoffice.ts b/src/apps/com.delicloud.app.smartoffice.ts
@@ -23,7 +23,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13840775',
             'https://i.gkd.li/i/13944086',

diff --git a/src/apps/com.didapinche.booking.ts b/src/apps/com.didapinche.booking.ts
@@ -14,7 +14,7 @@ export default defineGkdApp({
         {
           quickFind: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13988957',
             'https://i.gkd.li/i/13989178',

diff --git a/src/apps/com.diershoubing.erbing.ts b/src/apps/com.diershoubing.erbing.ts
@@ -16,7 +16,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13378853',
             'https://i.gkd.li/i/13546165',

diff --git a/src/apps/com.dongqiudi.news.ts b/src/apps/com.dongqiudi.news.ts
@@ -16,7 +16,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12620568',
             'https://i.gkd.li/i/12621997',

diff --git a/src/apps/com.douban.frodo.ts b/src/apps/com.douban.frodo.ts
@@ -7,19 +7,25 @@ export default defineGkdApp({
     {
       key: -1,
       name: '开屏广告',
+      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      actionMaximumKey: 0,
       rules: [
         {
-          quickFind: true,
+          key: 0,
+          matches:
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/15981630',
+        },
+        {
+          key: 1,
           position: {
             left: 'width * 0.8833',
             top: 'width * 0.1388',
           },
           matches: '[id="com.douban.frodo:id/_ad_image_"]',
-          exampleUrls:
-            'https://m.gkd.li/57941037/1c36c96b-95b7-4299-8e88-b4fdc85d3518',
           snapshotUrls: [
             'https://i.gkd.li/i/13575257',
             'https://i.gkd.li/i/13575547',

diff --git a/src/apps/com.ecellsz.watch.guard.ts b/src/apps/com.ecellsz.watch.guard.ts
@@ -12,7 +12,7 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       rules:
-        'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+        'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
       snapshotUrls: 'https://i.gkd.li/i/14039510',
     },
   ],

diff --git a/src/apps/com.excean.na.ts b/src/apps/com.excean.na.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14835263',
         },
       ],

diff --git a/src/apps/com.fan.app.ts b/src/apps/com.fan.app.ts
@@ -14,7 +14,7 @@ export default defineGkdApp({
         {
           quickFind: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/470c6262-62ca-45c5-908c-8435d7b0e86f',
           snapshotUrls: [

diff --git a/src/apps/com.feeyo.vz.pro.cdm.ts b/src/apps/com.feeyo.vz.pro.cdm.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
       rules: [
         {
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13926823',
         },
       ],

diff --git a/src/apps/com.firebear.androil.ts b/src/apps/com.firebear.androil.ts
@@ -21,7 +21,7 @@ export default defineGkdApp({
         {
           key: 1,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <<n [id="android:id/content"]',
+            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13088169',
             'https://i.gkd.li/i/12855707',