From f347feae0dc33c6ee0f9c364cd39d75056a98e83 Mon Sep 17 00:00:00 2001 From: lisonge Date: Mon, 21 Aug 2023 21:42:24 +0800 Subject: [PATCH] chore: sync --- dist/gkd.json | 49 +++++++++++++++++++++++++++----- package.json | 2 +- src/apps/com.baidu.BaiduMap.ts | 5 +++- src/apps/com.coolapk.market.ts | 1 + src/apps/com.sina.weibo.ts | 8 +++++- src/apps/com.tencent.mobileqq.ts | 14 +++++++++ src/apps/com.tencent.qqmusic.ts | 12 ++++++-- src/apps/tv.danmaku.bili.ts | 2 +- 8 files changed, 79 insertions(+), 14 deletions(-) diff --git a/dist/gkd.json b/dist/gkd.json index 553158ec..0c23b002 100644 --- a/dist/gkd.json +++ b/dist/gkd.json @@ -1,7 +1,7 @@ { "id": 0, "name": "默认订阅", - "version": 7, + "version": 8, "author": "lisonge", "supportUrl": "https://github.com/gkd-kit/subscription", "apps": [ @@ -127,7 +127,10 @@ "key": 0, "name": "百度地图-开屏广告", "activityIds": "com.baidu.baidumaps.MapsActivity", - "rules": "@TextView[text^=`跳过`] + TextView[text=`广告`]" + "rules": [ + "@TextView[text^=`跳过`] + TextView[text=`广告`]", + "ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]" + ] } ] }, @@ -270,6 +273,7 @@ ], "matches": "@LinearLayout > TextView[id=`com.byted.pangle:id/tt_item_tv`][text=`不感兴趣`]" }, + "Button[text$=\"免广告\"] + Button[text=\"不感兴趣\"]", "Button[text$=`去广告`] - Button[text=`不感兴趣`]", "[id=`com.coolapk.market:id/close_view`]" ] @@ -677,7 +681,7 @@ { "key": 0, "name": "微博-开屏广告", - "activityIds": "com.sina.weibo.mobileads.view.a", + "activityIds": "com.sina.weibo.mobileads.view.", "rules": [ "@RelativeLayout > TextView[text=`跳过`]" ] @@ -687,6 +691,17 @@ "name": "微博-评论区顶部-相关推荐", "activityIds": "com.sina.weibo.feed.DetailWeiboActivity", "rules": "ImageView[id=`com.sina.weibo:id/iv_ad_x`]" + }, + { + "key": 2, + "name": "微博-关闭不感兴趣广告弹窗", + "activityIds": "com.sina.weibo.view.bottomsheet.dialog.", + "rules": [ + [ + "[text=\"为何会看到此广告\"]", + "[text=\"不感兴趣\"]" + ] + ] } ] }, @@ -831,6 +846,20 @@ "rules": [ "ImageView[id!=null][desc='关闭'][isClickable=true]" ] + }, + { + "key": 2, + "name": "QQ-好友动态-广告卡片", + "rules": [ + { + "activityIds": "com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog", + "matches": "[isClickable=true] > ImageView + TextView[text=\"关闭此条广告\"]" + }, + { + "activityIds": "com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity", + "matches": "View[desc=\"广告\"] + ImageView[isClickable=true]" + } + ] } ] }, @@ -871,14 +900,20 @@ { "key": 0, "name": "QQ音乐-开屏广告", - "activityIds": "com.tencent.qqmusic.activity.AppStarterActivity", - "rules": "TextView[text=`跳过`]" + "activityIds": [ + "com.tencent.qqmusic.activity.AppStarterActivity", + "com.tencent.qqmusic.business.splash.thirdpartsplash.tme.union.SplashDialog" + ], + "rules": "TextView[text=`跳过`][clickable=true]" }, { "key": 1, "name": "QQ音乐-推荐页-广告卡片", "activityIds": "com.tencent.qqmusic.activity.AppStarterActivity", - "rules": "@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView" + "rules": [ + "@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView", + "TextView[text=\"广告 | 关闭\"][isClickable=true]" + ] } ] }, @@ -1121,7 +1156,7 @@ "rules": [ { "activityIds": "com.bilibili.lib.ui.menu", - "matches": "TextView[text='广告质量差'][id^='tv.danmaku.bili:id/reason']" + "matches": "TextView[text='广告质量差'||text='推广质量差'][id^='tv.danmaku.bili:id/reason']" } ] }, diff --git a/package.json b/package.json index 75cdc251..612b3f7f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gkd-kit/subscription", "type": "module", - "version": "0.0.7", + "version": "0.0.8", "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 37432983..14ca9b1d 100644 --- a/src/apps/com.baidu.BaiduMap.ts +++ b/src/apps/com.baidu.BaiduMap.ts @@ -7,7 +7,10 @@ export default { key: 0, name: '百度地图-开屏广告', activityIds: 'com.baidu.baidumaps.MapsActivity', - rules: '@TextView[text^=`跳过`] + TextView[text=`广告`]', + rules: [ + '@TextView[text^=`跳过`] + TextView[text=`广告`]', + `ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]`, // 1689423368140 + ], }, ], }; diff --git a/src/apps/com.coolapk.market.ts b/src/apps/com.coolapk.market.ts index 4a1af5b4..9123f417 100644 --- a/src/apps/com.coolapk.market.ts +++ b/src/apps/com.coolapk.market.ts @@ -21,6 +21,7 @@ export default { matches: '@LinearLayout > TextView[id=`com.byted.pangle:id/tt_item_tv`][text=`不感兴趣`]', }, + `Button[text$="免广告"] + Button[text="不感兴趣"]`, // 1692148279610 'Button[text$=`去广告`] - Button[text=`不感兴趣`]', '[id=`com.coolapk.market:id/close_view`]', ], diff --git a/src/apps/com.sina.weibo.ts b/src/apps/com.sina.weibo.ts index c483e6d4..01bc7323 100644 --- a/src/apps/com.sina.weibo.ts +++ b/src/apps/com.sina.weibo.ts @@ -6,7 +6,7 @@ export default { { key: 0, name: '微博-开屏广告', - activityIds: 'com.sina.weibo.mobileads.view.a', + activityIds: 'com.sina.weibo.mobileads.view.', rules: ['@RelativeLayout > TextView[text=`跳过`]'], }, { @@ -15,5 +15,11 @@ export default { activityIds: 'com.sina.weibo.feed.DetailWeiboActivity', rules: 'ImageView[id=`com.sina.weibo:id/iv_ad_x`]', }, + { + key: 2, + name: `微博-关闭不感兴趣广告弹窗`, + activityIds: `com.sina.weibo.view.bottomsheet.dialog.`, + rules: [[`[text="为何会看到此广告"]`, `[text="不感兴趣"]`]], // 1688889362832 + }, ], }; diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index aaf8a2f1..6a84cf4f 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -17,5 +17,19 @@ export default { `ImageView[id!=null][desc='关闭'][isClickable=true]`, // 1687669217838 ], }, + { + key: 2, + name: `QQ-好友动态-广告卡片`, + rules: [ + { + activityIds: `com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog`, + matches: `[isClickable=true] > ImageView + TextView[text="关闭此条广告"]`, // 1689050230463 + }, + { + activityIds: `com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity`, + matches: `View[desc="广告"] + ImageView[isClickable=true]`, // 1689050226722 + }, + ], + }, ], }; diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index eed41286..ea3e25da 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -6,14 +6,20 @@ export default { { key: 0, name: 'QQ音乐-开屏广告', - activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', - rules: 'TextView[text=`跳过`]', + activityIds: [ + 'com.tencent.qqmusic.activity.AppStarterActivity', + 'com.tencent.qqmusic.business.splash.thirdpartsplash.tme.union.SplashDialog', + ], + rules: 'TextView[text=`跳过`][clickable=true]', }, { key: 1, name: 'QQ音乐-推荐页-广告卡片', activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', - rules: `@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846 + rules: [ + `@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846 + `TextView[text="广告 | 关闭"][isClickable=true]`, + ], }, ], }; diff --git a/src/apps/tv.danmaku.bili.ts b/src/apps/tv.danmaku.bili.ts index 2a1e8111..17fade5d 100644 --- a/src/apps/tv.danmaku.bili.ts +++ b/src/apps/tv.danmaku.bili.ts @@ -40,7 +40,7 @@ export default { { activityIds: 'com.bilibili.lib.ui.menu', matches: - "TextView[text='广告质量差'][id^='tv.danmaku.bili:id/reason']", + "TextView[text='广告质量差'||text='推广质量差'][id^='tv.danmaku.bili:id/reason']", // 1691203420529 }, ], },