From d3a50ce44ef72f9a521f7a9c99e3593ab495a34b Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Sun, 4 Aug 2024 14:19:13 +0800
Subject: [PATCH] perf: some rules

---
 src/apps/app.esou.ts                  |  5 -----
 src/apps/com.android.bankabc.ts       |  5 -----
 src/apps/com.jd.app.reader.ts         | 23 +++++++++--------------
 src/apps/com.njh.biubiu.ts            |  8 ++++++--
 src/apps/make.more.r2d2.cellular_z.ts | 19 +++++++------------
 5 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/src/apps/app.esou.ts b/src/apps/app.esou.ts
index 37dd21af..2b82167b 100644
--- a/src/apps/app.esou.ts
+++ b/src/apps/app.esou.ts
@@ -21,11 +21,6 @@ export default defineGkdApp({
             'https://m.gkd.li/57941037/fe2a046b-1abe-4aba-a0df-8d9568211e0d',
           snapshotUrls: 'https://i.gkd.li/i/14189313',
         },
-        {
-          key: 1,
-          matches:
-            '[childCount=0][visibleToUser=true][(text.length<10&&(text*="跳过"||text*="跳过"||text*="skip"||text*="Skip")) || id$="tt_splash_skip_btn" || vid*="skip" || vid*="Skip" || (vid*="count" && vid*="down" && vid!*="download") || desc*="跳过" || desc*="skip"]',
-        },
       ],
     },
   ],
diff --git a/src/apps/com.android.bankabc.ts b/src/apps/com.android.bankabc.ts
index bb38c1be..ab2fcf34 100644
--- a/src/apps/com.android.bankabc.ts
+++ b/src/apps/com.android.bankabc.ts
@@ -20,11 +20,6 @@ export default defineGkdApp({
             'https://m.gkd.li/57941037/67cfc2f8-a108-4382-976a-0da7d13764e9',
           snapshotUrls: 'https://i.gkd.li/i/14179162',
         },
-        {
-          key: 1,
-          matches:
-            '[childCount=0][visibleToUser=true][(text.length<10&&(text*="跳过"||text*="跳过"||text*="skip"||text*="Skip")) || id$="tt_splash_skip_btn" || vid*="skip" || vid*="Skip" || (vid*="count" && vid*="down" && vid!*="download") || desc*="跳过" || desc*="skip"]',
-        },
       ],
     },
     {
diff --git a/src/apps/com.jd.app.reader.ts b/src/apps/com.jd.app.reader.ts
index f2e519dc..0404cbf2 100644
--- a/src/apps/com.jd.app.reader.ts
+++ b/src/apps/com.jd.app.reader.ts
@@ -7,6 +7,7 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -14,7 +15,6 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          fastQuery: true,
           matches:
             'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<n [id="android:id/content"]',
           exampleUrls:
@@ -23,12 +23,12 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          matches:
-            '[childCount=0][visibleToUser=true][(text.length<10&&(text*="跳过"||text*="跳过"||text*="skip"||text*="Skip")) || id$="tt_splash_skip_btn" || vid*="skip" || vid*="Skip" || (vid*="count" && vid*="down" && vid!*="download") || desc*="跳过" || desc*="skip"]',
+          matches: '[vid="mJumpBtn"][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/28a83ffc-ba28-4d0e-8f28-b48a4a542f23',
+          snapshotUrls: 'https://i.gkd.li/i/16486457',
         },
         {
           key: 2,
-          fastQuery: true,
           position: {
             left: 'width * 0.9007',
             top: 'width * 0.1603',
@@ -56,18 +56,13 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
-      activityIds: [
-        'com.jingdong.app.reader.main.ui.JdMainActivity',
-        'com.miui.home.launcher.Launcher',
-      ],
       rules: [
         {
-          matches:
-            '[id="com.jd.app.reader:id/mCardView"] + [id="com.jd.app.reader:id/mCloseBtn"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12686577',
-            'https://i.gkd.li/i/12686664', // activityId: 'com.miui.home.launcher.Launcher'
-          ],
+          fastQuery: true,
+          activityIds: 'com.jingdong.app.reader.main.ui.JdMainActivity',
+          matches: '[vid="mCloseBtn"][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/ac85ef54-5180-4740-b12d-608b37ad5502',
+          snapshotUrls: 'https://i.gkd.li/i/16486458',
         },
       ],
     },
diff --git a/src/apps/com.njh.biubiu.ts b/src/apps/com.njh.biubiu.ts
index 8e7ab2e7..8111c157 100644
--- a/src/apps/com.njh.biubiu.ts
+++ b/src/apps/com.njh.biubiu.ts
@@ -24,8 +24,12 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          matches:
-            '[childCount=0][visibleToUser=true][(text.length<10&&(text*="跳过"||text*="跳過"||text*="skip"||text*="Skip")) || id$="tt_splash_skip_btn" || vid*="skip" || vid*="Skip" || (vid*="count" && vid*="down" && vid!*="download") || desc*="跳过" || desc*="skip"]',
+          matches: '[text*="跳过"][text.length<10][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/f96cc8d8-602e-4d96-a8f3-19088656121b',
+          snapshotUrls: [
+            'https://i.gkd.li/i/16486468',
+            'https://i.gkd.li/i/16486469',
+          ],
         },
       ],
     },
diff --git a/src/apps/make.more.r2d2.cellular_z.ts b/src/apps/make.more.r2d2.cellular_z.ts
index c287aa75..f37f5324 100644
--- a/src/apps/make.more.r2d2.cellular_z.ts
+++ b/src/apps/make.more.r2d2.cellular_z.ts
@@ -7,29 +7,24 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
-      resetMatch: 'app',
-      actionMaximum: 1,
+      fastQuery: true,
       matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       actionMaximumKey: 0,
       rules: [
         {
           key: 0,
-          fastQuery: true,
-          matches: '[text*="跳过"][text.length<=10]',
-          snapshotUrls: 'https://i.gkd.li/i/13987038',
+          matches: '[text*="跳过"][text.length<10][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/10fa1ebe-c208-4127-a456-48ac91901984',
+          snapshotUrls: 'https://i.gkd.li/i/16486491',
         },
         {
           key: 1,
-          fastQuery: true,
           matches:
-            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <<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/13978978',
         },
-        {
-          key: 2,
-          matches:
-            '[childCount=0][visibleToUser=true][(text.length<10&&(text*="跳过"||text*="跳過"||text*="skip"||text*="Skip")) || id$="tt_splash_skip_btn" || vid*="skip" || vid*="Skip" || (vid*="count" && vid*="down" && vid!*="download") || desc*="跳过" || desc*="skip"]',
-        },
       ],
     },
     {