diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts index 38570418..b1498074 100644 --- a/src/apps/com.zmzx.college.search.ts +++ b/src/apps/com.zmzx.college.search.ts @@ -3,6 +3,7 @@ import { defineAppConfig } from '../types'; export default defineAppConfig({ id: 'com.zmzx.college.search', name: '大学搜题酱', + deprecatedKeys: [4], groups: [ { enable: false, @@ -19,28 +20,26 @@ export default defineAppConfig({ }, { key: 2, - name: '弹窗广告', - desc: '会出现在搜题页面与我的页面', - - activityIds: [ - 'com.zmzx.college.search.activity.main.activity.MainActivity', - 'com.zmzx.college.search.activity.questionsearch.camera.activity.PicSearchResultActivity', - ], + name: '全屏广告', rules: [ { key: 0, name: '腾讯广告', quickFind: true, + activityIds: [ + 'com.zmzx.college.search.activity.main.activity.MainActivity', + 'com.zmzx.college.search.activity.questionsearch.camera.activity.PicSearchResultActivity', + ], matches: 'ImageView[id="com.zmzx.college.search:id/iv_close"]', snapshotUrls: [ 'https://i.gkd.li/import/12867751', 'https://i.gkd.li/import/12894813', - 'https://i.gkd.li/import/13345633', // ], }, { key: 1, name: '快手广告-1', + activityIds: 'com.bbk.launcher2.Launcher', matches: '[text="广告"] <2 ViewGroup -3 ViewGroup > @ViewGroup[clickable=true] > ImageView', snapshotUrls: 'https://i.gkd.li/import/13346628', @@ -48,9 +47,11 @@ export default defineAppConfig({ { key: 2, name: '快手广告-2', + activityIds: + 'com.zmzx.college.search.activity.main.activity.MainActivity', matches: [ 'ViewGroup > ViewGroup > ViewGroup[childCount=2] > ImageView + [text="广告"]', - 'ViewGroup > ViewGroup > ViewGroup[childCount=1] > ImageView[childCount=0]', + 'ViewGroup > ViewGroup > @ViewGroup[childCount=1][clickable=true] > ImageView[childCount=0]', ], snapshotUrls: 'https://i.gkd.li/import/13451304', }, @@ -71,31 +72,39 @@ export default defineAppConfig({ matches: '@Image < View +3 View > View > TextView[text$="广告"]', snapshotUrls: 'https://i.gkd.li/import/13523288', }, + { + key: 5, + name: '字节广告-3', + quickFind: true, + activityIds: + 'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity', + matches: + '@[clickable=true] > [id="com.zmzx.college.search:id/tt_reward_full_count_down_after_close"]', + snapshotUrls: 'https://i.gkd.li/import/12893408', + }, ], }, { key: 3, - name: '资料库-弹窗广告', - activityIds: [ - 'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity', - ], - rules: - '@LinearLayout > ImageView[id="com.zmzx.college.search:id/tt_reward_full_count_down_after_close"]', - quickFind: true, - snapshotUrls: 'https://i.gkd.li/import/12893408', - }, - { - key: 4, - name: '教材-底部广告', - quickFind: true, - - activityIds: [ - 'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity', - ], - rules: '[id="com.zmzx.college.search:id/close"]', - snapshotUrls: [ - 'https://i.gkd.li/import/13063381', - 'https://i.gkd.li/import/13346621', // + name: '局部广告', + rules: [ + { + key: 0, + quickFind: true, + activityIds: + 'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity', + matches: '[vid="close_m_image_left_text_right_app_compliance"]', + snapshotUrls: 'https://i.gkd.li/import/13849755', + }, + { + key: 1, + quickFind: true, + activityIds: + 'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity', + matches: + '[id^="com.zmzx.college.search:id/ad_flag_source"] - * > [id="com.zmzx.college.search:id/close"]', + snapshotUrls: 'https://i.gkd.li/import/13063381', + }, ], }, {