diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index 31e4335e..3816fbf8 100644 --- a/src/apps/com.zhihu.android.ts +++ b/src/apps/com.zhihu.android.ts @@ -9,16 +9,13 @@ export default defineGkdApp({ name: '分段广告-信息流广告', desc: '点击关闭-点击内容不感兴趣', fastQuery: true, - activityIds: [ - 'com.zhihu.android.mixshortcontainer.MixShortContainerActivity', - 'com.zhihu.android.app.ui.activity.HostActivity', - 'com.zhihu.android.feature.short_container_feature.ui.ShortContainerHostActivity', - 'com.zhihu.android.ContentActivity', - 'com.zhihu.android.app.ui.activity.MainActivity', - ], rules: [ { key: 0, + activityIds: [ + 'com.zhihu.android.feature.short_container_feature.ui.ShortContainerHostActivity', + 'com.zhihu.android.ContentActivity', + ], matches: '@ImageView[clickable=true][visibleToUser=true] -(1,2) TextView[childCount=0][id=null][text=null][desc=null] n [text*="广告"][childCount=0][id=null][desc=null]', snapshotUrls: [ @@ -27,6 +24,9 @@ export default defineGkdApp({ 'https://i.gkd.li/i/14178516', 'https://i.gkd.li/i/13849442', 'https://i.gkd.li/i/14178979', + 'https://i.gkd.li/i/14178980', + 'https://i.gkd.li/i/14206949', + 'https://i.gkd.li/i/14206988', ], excludeSnapshotUrls: [ 'https://i.gkd.li/i/17002118', @@ -36,25 +36,34 @@ export default defineGkdApp({ }, { key: 2, + activityIds: 'com.zhihu.android.app.ui.activity.MainActivity', matches: '@ImageView[clickable=true] < * - * > [text*="广告"]', snapshotUrls: [ + 'https://i.gkd.li/i/14296163', 'https://i.gkd.li/i/14321041', 'https://i.gkd.li/i/14468152', ], }, { key: 3, + activityIds: 'com.zhihu.android.app.ui.activity.MainActivity', matches: '@ViewGroup[clickable=true] <4 * -3 * >2 [text*="广告"]', snapshotUrls: 'https://i.gkd.li/i/14192451', }, { key: 4, + activityIds: 'com.zhihu.android.app.ui.activity.MainActivity', matches: '@ViewGroup[clickable=true] <3 * < * -3 * >2 [text*="广告"]', snapshotUrls: 'https://i.gkd.li/i/14730741', }, { preKeys: [0, 2, 3, 4], key: 90, + activityIds: [ + 'com.zhihu.android.feature.short_container_feature.ui.ShortContainerHostActivity', + 'com.zhihu.android.ContentActivity', + 'com.zhihu.android.app.ui.activity.MainActivity', + ], matches: '@[clickable=true] >3 [text$="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13849689', }, @@ -145,23 +154,6 @@ export default defineGkdApp({ desc: '点击关闭', fastQuery: true, rules: [ - { - key: 0, - activityIds: - 'com.zhihu.android.feature.short_container_feature.ui.ShortContainerHostActivity', - matches: - '@ImageView[clickable=true][visibleToUser=true] -(1,2) TextView[childCount=0][id=null][text=null][desc=null] n [text*="广告"][childCount=0][id=null][desc=null]', - snapshotUrls: [ - 'https://i.gkd.li/i/14178980', - 'https://i.gkd.li/i/14206949', - 'https://i.gkd.li/i/14206988', - ], - excludeSnapshotUrls: [ - 'https://i.gkd.li/i/17002118', - 'https://i.gkd.li/i/17002119', - 'https://i.gkd.li/i/17002120', - ], - }, { key: 2, activityIds: [ @@ -176,12 +168,6 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15285359', ], }, - { - key: 3, - activityIds: 'com.zhihu.android.app.ui.activity.MainActivity', - matches: '@[vid="menu"][visibleToUser=true] < * - * > [text^="广告"]', - snapshotUrls: 'https://i.gkd.li/i/14296163', - }, { key: 4, activityIds: 'com.zhihu.android.app.ui.activity.MainActivity', @@ -206,12 +192,12 @@ export default defineGkdApp({ activityIds: 'com.zhihu.android.feature.short_container_feature.ui.ShortContainerHostActivity', matches: - '@ImageView[clickable=true][visibleToUser=true] [text*="知乎" || text="创作者小助手"][index=1]', + '@ImageView[clickable=true][visibleToUser=true] -(1,2) TextView[childCount=0][id=null][text=null][desc=null] [text*="知乎" || text="创作者小助手"][childCount=0][id=null][desc=null]', snapshotUrls: [ 'https://i.gkd.li/i/14235024', 'https://i.gkd.li/i/14944631', 'https://i.gkd.li/i/14232195', - 'https://i.gkd.li/i/14232195', // [index=1]避免误触 + 'https://i.gkd.li/i/14232195', // 避免误触 ], }, ],