diff --git a/dist/gkd.json b/dist/gkd.json index 0c23b002..07a9f5d6 100644 --- a/dist/gkd.json +++ b/dist/gkd.json @@ -1,7 +1,7 @@ { "id": 0, "name": "默认订阅", - "version": 8, + "version": 9, "author": "lisonge", "supportUrl": "https://github.com/gkd-kit/subscription", "apps": [ @@ -129,7 +129,7 @@ "activityIds": "com.baidu.baidumaps.MapsActivity", "rules": [ "@TextView[text^=`跳过`] + TextView[text=`广告`]", - "ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]" + "ImageView[clickable=false] + TextView[text^='跳过'][clickable=true]" ] } ] @@ -325,7 +325,7 @@ "rules": [ { "activityIds": "com.dragon.read.ad.banner.ui", - "matches": "@[isClickable=true] TextView[text=`关闭此条广告`]" + "matches": "@[clickable=true] TextView[text=`关闭此条广告`]" }, { "activityIds": "com.dragon.read.reader.ReaderActivity", @@ -659,7 +659,7 @@ "name": "美团外卖-关闭弹窗美食广告", "activityIds": "com.sankuai.waimai.platform.mach.dialog.DynamicDialog", "rules": [ - "@[desc='关闭'][isClickable=true] > ImageView" + "@[desc='关闭'][clickable=true] > ImageView" ] } ] @@ -844,7 +844,7 @@ "name": "QQ-消息页面-顶部广告", "activityIds": "com.tencent.mobileqq.activity.SplashActivity", "rules": [ - "ImageView[id!=null][desc='关闭'][isClickable=true]" + "ImageView[id!=null][desc='关闭'][clickable=true]" ] }, { @@ -853,11 +853,11 @@ "rules": [ { "activityIds": "com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog", - "matches": "[isClickable=true] > ImageView + TextView[text=\"关闭此条广告\"]" + "matches": "[clickable=true] > ImageView + TextView[text=\"关闭此条广告\"]" }, { "activityIds": "com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity", - "matches": "View[desc=\"广告\"] + ImageView[isClickable=true]" + "matches": "View[desc=\"广告\"] + ImageView[clickable=true]" } ] } @@ -911,8 +911,8 @@ "name": "QQ音乐-推荐页-广告卡片", "activityIds": "com.tencent.qqmusic.activity.AppStarterActivity", "rules": [ - "@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView", - "TextView[text=\"广告 | 关闭\"][isClickable=true]" + "@LinearLayout[clickable=true] > TextView[text='广告'] + ImageView", + "TextView[text=\"广告 | 关闭\"][clickable=true]" ] } ] @@ -1035,7 +1035,7 @@ "[id='com.zhihu.android:id/content'] >2 TextView[text='不感兴趣'][id='com.zhihu.android:id/title']", "TextView[text=`内容质量差`][id=`com.zhihu.android:id/tv_content`]", "@ImageView[id=`com.zhihu.android:id/menu`] < FrameLayout - * > TextView[text^=`广告`]", - "@ImageView[id=null][isClickable=true] -n TextView[text*=`广告`][index=0]" + "@ImageView[id=null][clickable=true] -n TextView[text*=`广告`][index=0]" ] }, { @@ -1044,7 +1044,7 @@ "activityIds": "com.zhihu.android.ContentActivity", "rules": [ "@ImageView -n TextView[text=`广告`][index=0]", - "ImageView[id=null] + TextView[text!=null][id=null] + ViewGroup > ImageView[isClickable=true]" + "ImageView[id=null] + TextView[text!=null][id=null] + ViewGroup > ImageView[clickable=true]" ] }, { @@ -1064,7 +1064,7 @@ "TextView[text$=`的广告`] - Image[id=null]", "TextView[text*=`广告`] +2 Image[id=null]", "TextView[text*=`点赞`][text*=`的回答`] +2 Image[id=null]", - "TextView[text=''] + Image[text=''] + TextView[text='​'] + Image[id=null][isClickable=true]" + "TextView[text=''] + Image[text=''] + TextView[text='​'] + Image[id=null][clickable=true]" ] }, { diff --git a/package.json b/package.json index 612b3f7f..8adb07c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gkd-kit/subscription", "type": "module", - "version": "0.0.8", + "version": "0.0.9", "main": "./dist/gkd.json", "unpkg": "./dist/gkd.json", "jsdelivr": "./dist/gkd.json", diff --git a/src/apps/com.baidu.BaiduMap.ts b/src/apps/com.baidu.BaiduMap.ts index 14ca9b1d..f1f778cd 100644 --- a/src/apps/com.baidu.BaiduMap.ts +++ b/src/apps/com.baidu.BaiduMap.ts @@ -9,7 +9,7 @@ export default { activityIds: 'com.baidu.baidumaps.MapsActivity', rules: [ '@TextView[text^=`跳过`] + TextView[text=`广告`]', - `ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]`, // 1689423368140 + `ImageView[clickable=false] + TextView[text^='跳过'][clickable=true]`, // 1689423368140 ], }, ], diff --git a/src/apps/com.dragon.read.ts b/src/apps/com.dragon.read.ts index c44100a8..546b758a 100644 --- a/src/apps/com.dragon.read.ts +++ b/src/apps/com.dragon.read.ts @@ -9,7 +9,7 @@ export default { rules: [ { activityIds: 'com.dragon.read.ad.banner.ui', - matches: '@[isClickable=true] TextView[text=`关闭此条广告`]', + matches: '@[clickable=true] TextView[text=`关闭此条广告`]', }, { activityIds: 'com.dragon.read.reader.ReaderActivity', diff --git a/src/apps/com.sankuai.meituan.takeoutnew.ts b/src/apps/com.sankuai.meituan.takeoutnew.ts index f3464ba9..8f95caaa 100644 --- a/src/apps/com.sankuai.meituan.takeoutnew.ts +++ b/src/apps/com.sankuai.meituan.takeoutnew.ts @@ -24,7 +24,7 @@ export default { name: `美团外卖-关闭弹窗美食广告`, activityIds: `com.sankuai.waimai.platform.mach.dialog.DynamicDialog`, rules: [ - `@[desc='关闭'][isClickable=true] > ImageView`, // 1686969062508 + `@[desc='关闭'][clickable=true] > ImageView`, // 1686969062508 ], }, ], diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index 6a84cf4f..cf36c29c 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -14,7 +14,7 @@ export default { name: `QQ-消息页面-顶部广告`, activityIds: `com.tencent.mobileqq.activity.SplashActivity`, rules: [ - `ImageView[id!=null][desc='关闭'][isClickable=true]`, // 1687669217838 + `ImageView[id!=null][desc='关闭'][clickable=true]`, // 1687669217838 ], }, { @@ -23,11 +23,11 @@ export default { rules: [ { activityIds: `com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog`, - matches: `[isClickable=true] > ImageView + TextView[text="关闭此条广告"]`, // 1689050230463 + matches: `[clickable=true] > ImageView + TextView[text="关闭此条广告"]`, // 1689050230463 }, { activityIds: `com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity`, - matches: `View[desc="广告"] + ImageView[isClickable=true]`, // 1689050226722 + matches: `View[desc="广告"] + ImageView[clickable=true]`, // 1689050226722 }, ], }, diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index ea3e25da..bce3bc57 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -17,8 +17,8 @@ export default { name: 'QQ音乐-推荐页-广告卡片', activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', rules: [ - `@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846 - `TextView[text="广告 | 关闭"][isClickable=true]`, + `@LinearLayout[clickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846 + `TextView[text="广告 | 关闭"][clickable=true]`, ], }, ], diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index 156302d9..62867be1 100644 --- a/src/apps/com.zhihu.android.ts +++ b/src/apps/com.zhihu.android.ts @@ -53,7 +53,7 @@ export default { `[id='com.zhihu.android:id/content'] >2 TextView[text='不感兴趣'][id='com.zhihu.android:id/title']`, // 1686989681860 'TextView[text=`内容质量差`][id=`com.zhihu.android:id/tv_content`]', '@ImageView[id=`com.zhihu.android:id/menu`] < FrameLayout - * > TextView[text^=`广告`]', // 1687913210243 1686989714786 - '@ImageView[id=null][isClickable=true] -n TextView[text*=`广告`][index=0]', // 1687418944396 1686924015259 + '@ImageView[id=null][clickable=true] -n TextView[text*=`广告`][index=0]', // 1687418944396 1686924015259 ], }, { @@ -62,7 +62,7 @@ export default { activityIds: 'com.zhihu.android.ContentActivity', rules: [ '@ImageView -n TextView[text=`广告`][index=0]', // 1687787712268 1687787635158 - `ImageView[id=null] + TextView[text!=null][id=null] + ViewGroup > ImageView[isClickable=true]`, // 1688028432747 + `ImageView[id=null] + TextView[text!=null][id=null] + ViewGroup > ImageView[clickable=true]`, // 1688028432747 ], }, { @@ -82,7 +82,7 @@ export default { 'TextView[text$=`的广告`] - Image[id=null]', 'TextView[text*=`广告`] +2 Image[id=null]', // 1687338556331 'TextView[text*=`点赞`][text*=`的回答`] +2 Image[id=null]', // 1687076663768 1686969672948 - `TextView[text=''] + Image[text=''] + TextView[text='​'] + Image[id=null][isClickable=true]`, // 1687234636980 + `TextView[text=''] + Image[text=''] + TextView[text='​'] + Image[id=null][clickable=true]`, // 1687234636980 ], }, {