diff --git a/src/apps/com.alicloud.databox.ts b/src/apps/com.alicloud.databox.ts index abab0f6f..17ac9de4 100644 --- a/src/apps/com.alicloud.databox.ts +++ b/src/apps/com.alicloud.databox.ts @@ -11,7 +11,7 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '自动签到', + name: '自动签到', matches: ['[id="com.alicloud.databox:id/tvTaskAction"][text="领取"]'], snapshotUrls: 'https://i.gkd.li/import/12929318', quickFind: true, @@ -19,7 +19,7 @@ export default defineAppConfig({ { key: 1, preKeys: [0], - desc: '在签到后,关闭弹窗', + name: '在签到后,关闭弹窗', matches: ['[id="com.alicloud.databox:id/ivClose"]'], snapshotUrls: 'https://i.gkd.li/import/13038304', quickFind: true, diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts index b2da3c88..81d6f85b 100644 --- a/src/apps/com.baidu.tieba.ts +++ b/src/apps/com.baidu.tieba.ts @@ -146,7 +146,7 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '点击右上角x关闭', + name: '点击右上角x关闭', matches: 'View[childCount=3] > @View[clickable=true][childCount=1] > Image', snapshotUrls: [ @@ -156,7 +156,7 @@ export default defineAppConfig({ }, { key: 1, - desc: '点击正下方x关闭', + name: '点击正下方x关闭', matches: '@TextView[clickable=true && text=null] - FrameLayout TextView[text="广告"]', snapshotUrls: 'https://gkd-kit.gitee.io/import/13168383', diff --git a/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts b/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts index 7ab8a006..dcde77a1 100644 --- a/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts +++ b/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts @@ -39,7 +39,7 @@ export default defineAppConfig({ name: '右侧悬浮广告', rules: [ { - desc: '信用卡、我的页面-悬浮广告', + name: '信用卡、我的页面-悬浮广告', activityIds: [ 'com.cmbchina.ccd.pluto.cmbActivity.CMBRootActivityV2', 'com.cmbchina.ccd.pluto.cmbActivity.secondNav.cmbBQDU4FG', @@ -52,7 +52,7 @@ export default defineAppConfig({ ], }, { - desc: '查账页面-悬浮广告', + name: '查账页面-悬浮广告', activityIds: [ 'com.cmbchina.ccd.pluto.cmbActivity.CMBRootActivityV2', 'com.cmbchina.ccd.pluto.cmbActivity.repaymentBillv3.billRepay.view.cmbK99GNX', diff --git a/src/apps/com.dongqiudi.news.ts b/src/apps/com.dongqiudi.news.ts index be5ae7e7..b7d71d4e 100644 --- a/src/apps/com.dongqiudi.news.ts +++ b/src/apps/com.dongqiudi.news.ts @@ -19,8 +19,7 @@ export default defineAppConfig({ ], }, { - name: '另一种倒计时广告', - desc: '此广告要点击文字相邻的图片,如果直接点击文字会无反应或者触发广告跳转', + name: '另一种倒计时广告', // 此广告要点击文字相邻的图片,如果直接点击文字会无反应或者触发广告跳转 matches: '[id="com.dongqiudi.news:id/ad_skip_time"] + [id="com.dongqiudi.news:id/scale_iv"]', snapshotUrls: [ diff --git a/src/apps/com.jingdong.app.mall.ts b/src/apps/com.jingdong.app.mall.ts index 4c3e575b..cf9a1bda 100644 --- a/src/apps/com.jingdong.app.mall.ts +++ b/src/apps/com.jingdong.app.mall.ts @@ -39,7 +39,7 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '参与调研', + name: '参与调研', matches: 'FrameLayout + RelativeLayout > RelativeLayout > ImageView + ImageView[desc!="返回"][visibleToUser=true]', snapshotUrls: [ @@ -49,7 +49,7 @@ export default defineAppConfig({ }, { key: 1, - desc: '邀好友得红包', + name: '邀好友得红包', matches: '@ImageView[id!=null] + FrameLayout[childCount=3] > ImageView + LinearLayout + TextView', snapshotUrls: 'https://i.gkd.li/import/13242002', diff --git a/src/apps/com.miui.packageinstaller.ts b/src/apps/com.miui.packageinstaller.ts index 5f763d32..f5fe14dc 100644 --- a/src/apps/com.miui.packageinstaller.ts +++ b/src/apps/com.miui.packageinstaller.ts @@ -35,7 +35,7 @@ export default defineAppConfig({ // 正常安装 { key: 0, - desc: '点击【继续安装】', + name: '点击【继续安装】', activityIds: [ 'com.miui.packageInstaller.ui.InstallPrepareAlertActivity', 'com.miui.packageInstaller.NewInstallerPrepareActivity', @@ -49,7 +49,7 @@ export default defineAppConfig({ }, { key: 1, - desc: '点击【继续安装】', + name: '点击【继续安装】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '@[text="继续安装"] + [text="取消安装"]', snapshotUrls: 'https://gkd-kit.gitee.io/import/12889120', @@ -58,7 +58,7 @@ export default defineAppConfig({ // 需勾选【已了解此应用未经安全检测】才能继续安装 { key: 2, - desc: '勾选【已了解此应用未经安全检测】', + name: '勾选【已了解此应用未经安全检测】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '[id="com.miui.packageinstaller:id/install_checked"][checked=false]', @@ -71,7 +71,7 @@ export default defineAppConfig({ // 需勾选【已了解此应用存在高风险】才能继续安装 { key: 3, - desc: '点击【了解风险】', + name: '点击【了解风险】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '@[text="了解风险"] + [text="取消安装"]', snapshotUrls: 'https://gkd-kit.gitee.io/import/12889135', @@ -79,7 +79,7 @@ export default defineAppConfig({ { preKeys: 3, key: 4, - desc: '勾选【已了解此应用存在高风险】', + name: '勾选【已了解此应用存在高风险】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '[id="com.miui.packageinstaller:id/install_checked"][checked=false]', @@ -91,7 +91,7 @@ export default defineAppConfig({ { preKeys: 4, key: 5, - desc: '点击【仍然安装】', + name: '点击【仍然安装】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '@[text="仍然安装"] + [text="取消安装"]', snapshotUrls: 'https://gkd-kit.gitee.io/import/12889148', @@ -101,7 +101,7 @@ export default defineAppConfig({ { preKeys: [0, 1, 5], key: 6, - desc: '点击【完成】', + name: '点击【完成】', activityIds: [ 'com.miui.packageInstaller.ui.normalmode.InstallProgressActivity', 'com.miui.packageInstaller.InstallProgressActivity', @@ -123,7 +123,7 @@ export default defineAppConfig({ // 正常更新 { key: 0, - desc: '点击【继续更新】', + name: '点击【继续更新】', activityIds: [ 'com.miui.packageInstaller.ui.InstallPrepareAlertActivity', 'com.miui.packageInstaller.NewInstallerPrepareActivity', @@ -137,7 +137,7 @@ export default defineAppConfig({ }, { key: 1, - desc: '点击【继续更新】', + name: '点击【继续更新】', activityIds: 'com.miui.packageInstaller.NewInstallerPrepareActivity', matches: '@[text="继续更新"] + [text="取消更新"]', snapshotUrls: [ @@ -149,7 +149,7 @@ export default defineAppConfig({ // 需勾选【已了解此安装包未经安全检测】才能继续更新 { key: 2, - desc: '勾选【已了解此安装包未经安全检测】', + name: '勾选【已了解此安装包未经安全检测】', activityIds: [ 'com.miui.packageInstaller.ui.InstallPrepareAlertActivity', 'com.miui.packageInstaller.NewInstallerPrepareActivity', @@ -166,7 +166,7 @@ export default defineAppConfig({ { preKeys: [0, 1], key: 3, - desc: '点击【完成】', + name: '点击【完成】', activityIds: [ 'com.miui.packageInstaller.ui.normalmode.InstallProgressActivity', 'com.miui.packageInstaller.InstallProgressActivity', diff --git a/src/apps/com.oplus.appdetail.ts b/src/apps/com.oplus.appdetail.ts index c4c654f2..c5c395d4 100644 --- a/src/apps/com.oplus.appdetail.ts +++ b/src/apps/com.oplus.appdetail.ts @@ -11,7 +11,7 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '点击【继续安装】', + name: '点击【继续安装】', activityIds: 'com.oplus.appdetail.model.guide.ui.InstallGuideActivity', matches: @@ -26,14 +26,14 @@ export default defineAppConfig({ }, { key: 1, - desc: '点击【完成】', + name: '点击【完成】', activityIds: 'com.oplus.appdetail.model.finish.InstallFinishActivity', matches: '[id="com.oplus.appdetail:id/launch_button"][text="完成"]', snapshotUrls: 'https://i.gkd.li/import/13038664', }, { key: 2, - desc: '点击【完成】', + name: '点击【完成】', activityIds: 'com.oplus.appdetail.model.finish.InstallFinishActivity', matches: '[id="com.oplus.appdetail:id/done_button"][text="完成"]', snapshotUrls: 'https://i.gkd.li/import/13054849', diff --git a/src/apps/com.taobao.taobao.ts b/src/apps/com.taobao.taobao.ts index 54751f84..cf969b53 100644 --- a/src/apps/com.taobao.taobao.ts +++ b/src/apps/com.taobao.taobao.ts @@ -39,7 +39,7 @@ export default defineAppConfig({ }, { key: 1, - desc: '88VIP开通优惠弹窗', + name: '88VIP开通优惠弹窗', activityIds: [ 'com.taobao.tao.welcome.Welcome', 'com.taobao.tao.TBMainActivity', diff --git a/src/apps/com.tencent.news.ts b/src/apps/com.tencent.news.ts index 54f0a2d2..eddfd98d 100644 --- a/src/apps/com.tencent.news.ts +++ b/src/apps/com.tencent.news.ts @@ -29,7 +29,7 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '点击【更多】按钮', + name: '点击【更多】按钮', matches: 'FrameLayout[id="android:id/content"][childCount=1] >n [text="广告"] +n [id="com.tencent.news:id/dislike_streamAd_more"]', snapshotUrls: [ @@ -41,7 +41,7 @@ export default defineAppConfig({ { preKeys: [0], key: 1, - desc: '点击【不感兴趣】按钮', + name: '点击【不感兴趣】按钮', matches: '[id="com.tencent.news:id/dislike_reason_view"] >n [text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/import/12755852', diff --git a/src/apps/com.tencent.qqlive.ts b/src/apps/com.tencent.qqlive.ts index c742355c..02269e7b 100644 --- a/src/apps/com.tencent.qqlive.ts +++ b/src/apps/com.tencent.qqlive.ts @@ -49,7 +49,7 @@ export default defineAppConfig({ activityIds: ['com.tencent.qqlive.ona.activity.SplashHomeActivity'], rules: [ { - desc: '点击右上角[广告]', + name: '点击右上角[广告]', matches: 'FrameLayout - RelativeLayout > RelativeLayout > FrameLayout + ImageView[clickable=true]', snapshotUrls: [ @@ -58,12 +58,12 @@ export default defineAppConfig({ ], }, { - desc: '点击右上角[关闭广告]', + name: '点击右上角[关闭广告]', matches: '[text="关闭广告"][clickable=true]', snapshotUrls: ['https://gkd-kit.gitee.io/import/12700518'], }, { - desc: '点击右上角[广告]', + name: '点击右上角[广告]', matches: 'RelativeLayout[id=null] > @FrameLayout[clickable=true][id!=null] > ImageView[desc="the ad tag"]', snapshotUrls: 'https://gkd-kit.gitee.io/import/12737313', diff --git a/src/apps/com.xunmeng.pinduoduo.ts b/src/apps/com.xunmeng.pinduoduo.ts index 4660b594..5606b7c1 100644 --- a/src/apps/com.xunmeng.pinduoduo.ts +++ b/src/apps/com.xunmeng.pinduoduo.ts @@ -118,14 +118,14 @@ export default defineAppConfig({ rules: [ { key: 0, - desc: '自动签到', + name: '自动签到', matches: ['FrameLayout > TextView[text="领取今日现金"]'], snapshotUrls: 'https://gkd-kit.gitee.io/import/13201422', }, { key: 1, preKeys: [0], - desc: '在签到后关闭弹窗', + name: '在签到后关闭弹窗', matches: ['FrameLayout > TextView[text="明日继续来领"]'], snapshotUrls: 'https://gkd-kit.gitee.io/import/13205634', }, diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index a03261d4..240f30ca 100644 --- a/src/apps/com.zhihu.android.ts +++ b/src/apps/com.zhihu.android.ts @@ -143,7 +143,7 @@ export default defineAppConfig({ { preKeys: [10], key: 100, - desc: '反馈弹窗-点击“不感兴趣”', + name: '反馈弹窗-点击“不感兴趣”', matches: '[id="com.zhihu.android:id/recycler_view"] > FrameLayout >(3) [text$="不感兴趣"]', snapshotUrls: ['https://gkd-kit.gitee.io/import/12647541'], diff --git a/src/apps/com.zzw.october.ts b/src/apps/com.zzw.october.ts index 8d19740a..614cac62 100644 --- a/src/apps/com.zzw.october.ts +++ b/src/apps/com.zzw.october.ts @@ -11,14 +11,14 @@ export default defineAppConfig({ rules: [ { key: 1, - desc: '方形按钮-开屏广告', + name: '方形按钮-开屏广告', quickFind: true, matches: ['[id="com.zzw.october:id/skip_parent_view"]'], snapshotUrls: ['https://i.gkd.li/import/12842667'], }, { key: 2, - desc: '圆形按钮-开屏广告', + name: '圆形按钮-开屏广告', quickFind: true, matches: 'TextView[text^="跳过"][text.length<=4]', snapshotUrls: [ diff --git a/src/apps/org.gushiwen.gushiwen.ts b/src/apps/org.gushiwen.gushiwen.ts index c72cb53d..a120f255 100644 --- a/src/apps/org.gushiwen.gushiwen.ts +++ b/src/apps/org.gushiwen.gushiwen.ts @@ -41,7 +41,7 @@ export default defineAppConfig({ { preKeys: [0, 1], key: 10, - desc: '打赏页面-点击返回按钮', + name: '打赏页面-点击返回按钮', activityIds: [ 'local.z.androidshared.vip.RewardActivity', 'local.z.androidshared.pay.RewardActivity', @@ -55,7 +55,7 @@ export default defineAppConfig({ { preKeys: [0, 1], key: 11, - desc: '荣誉会员-点击返回按钮', + name: '荣誉会员-点击返回按钮', activityIds: [ 'local.z.androidshared.vip.member.VipActivity', 'local.z.androidshared.pay.vip.VipActivity', diff --git a/src/types.ts b/src/types.ts index 80cfe9f3..3d059450 100644 --- a/src/types.ts +++ b/src/types.ts @@ -198,7 +198,6 @@ type RuleConfig = { key?: number; name?: string; - desc?: string; /** * 一个或者多个合法的 GKD 选择器, 如果每个选择器都能匹配上节点, 那么点击最后一个选择器的目标节点