From d2753397bf4106391711853f3ad8b637d536cacf Mon Sep 17 00:00:00 2001
From: jiuqianyuan <39406781+jiuqianyuan@users.noreply.github.com>
Date: Mon, 11 Dec 2023 21:21:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98qui?=
 =?UTF-8?q?ckFind=20(#2985)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除开屏规则[id="com.byted.pangle:id/tt_splash_skip_btn"]的quickFind属性。
快照中[id="com.byted.pangle:id/tt_splash_skip_btn"]可快速查找系GKD标识错误。
- https://github.com/gkd-kit/gkd/issues/369
---
 src/apps/cc.kinva.smartqa.ts            | 1 -
 src/apps/cn.com.yunma.school.app.ts     | 2 +-
 src/apps/cn.xiaochuankeji.zuiyouLite.ts | 2 +-
 src/apps/com.UCMobile.ts                | 2 +-
 src/apps/com.baidu.netdisk.ts           | 1 -
 src/apps/com.chipsea.btcontrol.ts       | 6 +++---
 src/apps/com.coolapk.market.ts          | 4 +---
 src/apps/com.didapinche.booking.ts      | 7 ++++---
 src/apps/com.diershoubing.erbing.ts     | 2 +-
 src/apps/com.doc360.client.ts           | 1 -
 src/apps/com.facetech.konking.ts        | 7 ++++---
 src/apps/com.feeyo.vz.pro.cdm.ts        | 7 ++++---
 src/apps/com.gfd.ecprint.ts             | 1 -
 src/apps/com.gkid.crazyrope.ts          | 2 +-
 src/apps/com.jovetech.CloudSee.temp.ts  | 7 ++++---
 src/apps/com.leduoworks.gpstoolbox.ts   | 5 +++--
 src/apps/com.luna.music.ts              | 3 +--
 src/apps/com.msnothing.airpodsking.ts   | 3 +--
 src/apps/com.naver.linewebtoon.cn.ts    | 2 +-
 src/apps/com.netease.mail.ts            | 2 +-
 src/apps/com.svm.hbyy.ts                | 1 -
 src/apps/com.wacai365.ts                | 3 ++-
 src/apps/com.xuexiaoyi.xxy.ts           | 1 -
 src/apps/com.xyhui.ts                   | 3 ++-
 src/apps/com.youloft.calendar.ts        | 1 -
 src/apps/com.youloft.icloser.ts         | 2 +-
 src/apps/com.zhima.charge.ts            | 1 -
 src/apps/fit.flutter.dsm_helper.ts      | 1 -
 src/apps/moc.nauxuoyoaixoaix.www.ts     | 1 -
 29 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/apps/cc.kinva.smartqa.ts b/src/apps/cc.kinva.smartqa.ts
index ef20482f3..c19d5f3aa 100644
--- a/src/apps/cc.kinva.smartqa.ts
+++ b/src/apps/cc.kinva.smartqa.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/cn.com.yunma.school.app.ts b/src/apps/cn.com.yunma.school.app.ts
index 92cb76125..67d2ec21b 100644
--- a/src/apps/cn.com.yunma.school.app.ts
+++ b/src/apps/cn.com.yunma.school.app.ts
@@ -7,12 +7,12 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          quickFind: true,
           matches: '[text*="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/import/13175275',
diff --git a/src/apps/cn.xiaochuankeji.zuiyouLite.ts b/src/apps/cn.xiaochuankeji.zuiyouLite.ts
index be6e6d0da..269d2afe8 100644
--- a/src/apps/cn.xiaochuankeji.zuiyouLite.ts
+++ b/src/apps/cn.xiaochuankeji.zuiyouLite.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -21,6 +20,7 @@ export default defineAppConfig({
         {
           key: 1,
           name: '【跳过】',
+          quickFind: true,
           matches: '[text*="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/import/12745095',
diff --git a/src/apps/com.UCMobile.ts b/src/apps/com.UCMobile.ts
index ae2d5a208..b01793f9a 100644
--- a/src/apps/com.UCMobile.ts
+++ b/src/apps/com.UCMobile.ts
@@ -10,13 +10,13 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      quickFind: true,
       rules: [
         {
           matches: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
           snapshotUrls: 'https://i.gkd.li/import/13188653',
         },
         {
+          quickFind: true,
           matches:
             '@View[clickable=true] < RelativeLayout <2 FrameLayout < FrameLayout < FrameLayout <4 FrameLayout < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/import/13197655',
diff --git a/src/apps/com.baidu.netdisk.ts b/src/apps/com.baidu.netdisk.ts
index e142db770..8d68005c8 100644
--- a/src/apps/com.baidu.netdisk.ts
+++ b/src/apps/com.baidu.netdisk.ts
@@ -25,7 +25,6 @@ export default defineAppConfig({
         },
         {
           key: 1,
-          quickFind: false,
           matches: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
           snapshotUrls: 'https://i.gkd.li/import/13538334',
         },
diff --git a/src/apps/com.chipsea.btcontrol.ts b/src/apps/com.chipsea.btcontrol.ts
index 9844b041a..3f01f720a 100644
--- a/src/apps/com.chipsea.btcontrol.ts
+++ b/src/apps/com.chipsea.btcontrol.ts
@@ -7,9 +7,9 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
-      matchLauncher: true,
-      activityIds: 'com.chipsea.btcontrol.InitActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: '[id="com.byted.pangle.m:id/tt_splash_skip_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/13115472',
     },
diff --git a/src/apps/com.coolapk.market.ts b/src/apps/com.coolapk.market.ts
index 42b3d15b4..416a3f79b 100644
--- a/src/apps/com.coolapk.market.ts
+++ b/src/apps/com.coolapk.market.ts
@@ -18,9 +18,7 @@ export default defineAppConfig({
       rules: [
         {
           key: 0,
-          quickFind: false,
-          matches:
-            '[id="com.byted.pangle:id/tt_splash_skip_btn"||id="com.byted.pangle.m:id/tt_splash_skip_btn"]',
+          matches: '[id$="tt_splash_skip_btn"]',
           snapshotUrls: [
             'https://i.gkd.li/import/12503773',
             'https://i.gkd.li/import/13247610',
diff --git a/src/apps/com.didapinche.booking.ts b/src/apps/com.didapinche.booking.ts
index c839cabea..b23edb925 100644
--- a/src/apps/com.didapinche.booking.ts
+++ b/src/apps/com.didapinche.booking.ts
@@ -7,15 +7,16 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      matchLauncher: true,
-      quickFind: true,
-      activityIds: 'com.didapinche.booking.home.activity.StartActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           matches: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
           snapshotUrls: 'https://i.gkd.li/import/13051862',
         },
         {
+          quickFind: true,
           matches: '[id="com.didapinche.booking:id/tv_full_skip"]',
           snapshotUrls: [
             'https://i.gkd.li/import/13051805',
diff --git a/src/apps/com.diershoubing.erbing.ts b/src/apps/com.diershoubing.erbing.ts
index 1b3643b06..e0f368dd3 100644
--- a/src/apps/com.diershoubing.erbing.ts
+++ b/src/apps/com.diershoubing.erbing.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -22,6 +21,7 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          quickFind: true,
           matches: '[text="跳过"]',
           snapshotUrls: 'https://i.gkd.li/import/13538207',
         },
diff --git a/src/apps/com.doc360.client.ts b/src/apps/com.doc360.client.ts
index 582d1cc26..5cc7f33dd 100644
--- a/src/apps/com.doc360.client.ts
+++ b/src/apps/com.doc360.client.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.facetech.konking.ts b/src/apps/com.facetech.konking.ts
index 7d672d66f..a1cd56244 100644
--- a/src/apps/com.facetech.konking.ts
+++ b/src/apps/com.facetech.konking.ts
@@ -7,12 +7,13 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: 'com.facetech.konking.MainActivity',
-      matchLauncher: true,
-      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
+          quickFind: true,
           matches:
             '[id="com.facetech.konking:id/ksad_splash_circle_skip_view"] > [text="跳过"]',
           snapshotUrls: 'https://i.gkd.li/import/12841078',
diff --git a/src/apps/com.feeyo.vz.pro.cdm.ts b/src/apps/com.feeyo.vz.pro.cdm.ts
index 5925ac928..596ad66dc 100644
--- a/src/apps/com.feeyo.vz.pro.cdm.ts
+++ b/src/apps/com.feeyo.vz.pro.cdm.ts
@@ -7,9 +7,9 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: 'com.feeyo.vz.pro.activity.cdm.WelcomeActivity',
-      matchLauncher: true,
-      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -18,6 +18,7 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          quickFind: true,
           matches:
             '[id="com.feeyo.vz.pro.cdm:id/splashAdContainer"] >n [text^="跳过"]',
           snapshotUrls: 'https://i.gkd.li/import/12893753',
diff --git a/src/apps/com.gfd.ecprint.ts b/src/apps/com.gfd.ecprint.ts
index 9037f16f4..a0a09dc10 100644
--- a/src/apps/com.gfd.ecprint.ts
+++ b/src/apps/com.gfd.ecprint.ts
@@ -10,7 +10,6 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      quickFind: true,
       rules: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/13579102',
     },
diff --git a/src/apps/com.gkid.crazyrope.ts b/src/apps/com.gkid.crazyrope.ts
index 3754cc4be..095f7bb7e 100644
--- a/src/apps/com.gkid.crazyrope.ts
+++ b/src/apps/com.gkid.crazyrope.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -17,6 +16,7 @@ export default defineAppConfig({
           snapshotUrls: 'https://i.gkd.li/import/12916417',
         },
         {
+          quickFind: true,
           matches: '[text^="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/import/13028151',
diff --git a/src/apps/com.jovetech.CloudSee.temp.ts b/src/apps/com.jovetech.CloudSee.temp.ts
index 9a91bc348..5b1a52ec1 100644
--- a/src/apps/com.jovetech.CloudSee.temp.ts
+++ b/src/apps/com.jovetech.CloudSee.temp.ts
@@ -7,9 +7,9 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      matchLauncher: true,
-      quickFind: true,
-      activityIds: 'com.jovision.saas.ui.activity.splash.SplashActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -18,6 +18,7 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          quickFind: true,
           matches:
             '[id="com.jovetech.CloudSee.temp:id/splash_container"] >n [text^="跳过"]',
           snapshotUrls: [
diff --git a/src/apps/com.leduoworks.gpstoolbox.ts b/src/apps/com.leduoworks.gpstoolbox.ts
index c1c7f655d..2aa5253fa 100644
--- a/src/apps/com.leduoworks.gpstoolbox.ts
+++ b/src/apps/com.leduoworks.gpstoolbox.ts
@@ -7,8 +7,9 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      matchLauncher: true,
-      activityIds: 'com.leduoworks.gpstoolbox.newest.StarterActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/13062600',
     },
diff --git a/src/apps/com.luna.music.ts b/src/apps/com.luna.music.ts
index 0a9cce25b..d304d9f7c 100644
--- a/src/apps/com.luna.music.ts
+++ b/src/apps/com.luna.music.ts
@@ -7,11 +7,10 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.byted.pangle:id/tt_splash_skip_btn"]', // 删除旧规则[id$="/tt_splash_skip_btn"]，等出现[id="com.byted.pangle.m:id/tt_splash_skip_btn"] 快照再适配
+      rules: '[id$="id/tt_splash_skip_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/13533782',
     },
     {
diff --git a/src/apps/com.msnothing.airpodsking.ts b/src/apps/com.msnothing.airpodsking.ts
index 259215c94..cdaa41028 100644
--- a/src/apps/com.msnothing.airpodsking.ts
+++ b/src/apps/com.msnothing.airpodsking.ts
@@ -7,17 +7,16 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
       matchTime: 10000,
       rules: [
         {
-          quickFind: false,
           matches: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
           snapshotUrls: ['https://i.gkd.li/import/12908449'],
         },
         {
+          quickFind: true,
           matches: '[text="跳过"]',
           snapshotUrls: ['https://i.gkd.li/import/13607847'],
         },
diff --git a/src/apps/com.naver.linewebtoon.cn.ts b/src/apps/com.naver.linewebtoon.cn.ts
index 52eabf4e8..01514dd0b 100644
--- a/src/apps/com.naver.linewebtoon.cn.ts
+++ b/src/apps/com.naver.linewebtoon.cn.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -19,6 +18,7 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          quickFind: true,
           matches: '[text="跳过"]',
           snapshotUrls: 'https://i.gkd.li/import/13546265',
         },
diff --git a/src/apps/com.netease.mail.ts b/src/apps/com.netease.mail.ts
index c4f4896ce..ddba519f0 100644
--- a/src/apps/com.netease.mail.ts
+++ b/src/apps/com.netease.mail.ts
@@ -7,13 +7,13 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 0,
+          quickFind: true,
           matches: '[text*="跳过"][text.length<=10]',
           excludeMatches: '[id="com.netease.mail:id/ad_skip"][clickable=false]',
           snapshotUrls: [
diff --git a/src/apps/com.svm.hbyy.ts b/src/apps/com.svm.hbyy.ts
index fb74c2393..4f3480f96 100644
--- a/src/apps/com.svm.hbyy.ts
+++ b/src/apps/com.svm.hbyy.ts
@@ -10,7 +10,6 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      quickFind: true,
       rules: [
         {
           matches: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
diff --git a/src/apps/com.wacai365.ts b/src/apps/com.wacai365.ts
index 6c8e45c0c..d5c229133 100644
--- a/src/apps/com.wacai365.ts
+++ b/src/apps/com.wacai365.ts
@@ -7,13 +7,13 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 0,
+          quickFind: true,
           matches: '[id="com.wacai365:id/ksad_splash_circle_skip_view"]',
           snapshotUrls: 'https://i.gkd.li/import/13162861',
         },
@@ -27,6 +27,7 @@ export default defineAppConfig({
         },
         {
           key: 2,
+          quickFind: true,
           matches: '[text^="跳过"][text.length<=6]',
           snapshotUrls: 'https://i.gkd.li/import/13399124',
         },
diff --git a/src/apps/com.xuexiaoyi.xxy.ts b/src/apps/com.xuexiaoyi.xxy.ts
index fed6dfe6a..f77fbf8d3 100644
--- a/src/apps/com.xuexiaoyi.xxy.ts
+++ b/src/apps/com.xuexiaoyi.xxy.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      // quickFind: true,  // 会导致无法跳过
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.xyhui.ts b/src/apps/com.xyhui.ts
index 27e8680a4..06d2b2747 100644
--- a/src/apps/com.xyhui.ts
+++ b/src/apps/com.xyhui.ts
@@ -8,7 +8,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -16,6 +15,7 @@ export default defineAppConfig({
         {
           key: 1,
           name: '开屏广告-1',
+          quickFind: true,
           snapshotUrls: [
             'https://i.gkd.li/import/12642486',
             'https://i.gkd.li/import/12846496',
@@ -26,6 +26,7 @@ export default defineAppConfig({
         {
           key: 2,
           name: '开屏广告-2',
+          quickFind: true,
           matches: '[id="com.xyhui:id/ms_skipView"]',
           snapshotUrls: ['https://i.gkd.li/import/13197417'],
         },
diff --git a/src/apps/com.youloft.calendar.ts b/src/apps/com.youloft.calendar.ts
index 63394daf8..40419b63f 100644
--- a/src/apps/com.youloft.calendar.ts
+++ b/src/apps/com.youloft.calendar.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.youloft.icloser.ts b/src/apps/com.youloft.icloser.ts
index 4d8eab1f3..a605f0e28 100644
--- a/src/apps/com.youloft.icloser.ts
+++ b/src/apps/com.youloft.icloser.ts
@@ -7,13 +7,13 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 0,
+          quickFind: true,
           matches: '[text^="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/import/12910405',
diff --git a/src/apps/com.zhima.charge.ts b/src/apps/com.zhima.charge.ts
index cf34298e3..c763f06ce 100644
--- a/src/apps/com.zhima.charge.ts
+++ b/src/apps/com.zhima.charge.ts
@@ -10,7 +10,6 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      quickFind: true,
       rules: '[id="com.byted.pangle:id/tt_splash_skip_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/13576613',
     },
diff --git a/src/apps/fit.flutter.dsm_helper.ts b/src/apps/fit.flutter.dsm_helper.ts
index a7a8e573f..99ea5800d 100644
--- a/src/apps/fit.flutter.dsm_helper.ts
+++ b/src/apps/fit.flutter.dsm_helper.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/moc.nauxuoyoaixoaix.www.ts b/src/apps/moc.nauxuoyoaixoaix.www.ts
index 133c178f8..12c8bf035 100644
--- a/src/apps/moc.nauxuoyoaixoaix.www.ts
+++ b/src/apps/moc.nauxuoyoaixoaix.www.ts
@@ -7,7 +7,6 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',