From 749c59ba376a4f13dc7c97ab845a6aa77ad8a1fb Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Wed, 14 Feb 2024 07:37:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E5=A5=87=E5=A6=99=E5=BA=94=E7=94=A8)?= =?UTF-8?q?=20=E5=B1=80=E9=83=A8=E5=B9=BF=E5=91=8A-=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=BC=8F=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BF=AE=E5=A4=8D=E8=AF=AF?= =?UTF-8?q?=E8=A7=A6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/com.magicalstory.AppStore.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/apps/com.magicalstory.AppStore.ts b/src/apps/com.magicalstory.AppStore.ts index 239d5e81..9ed57804 100644 --- a/src/apps/com.magicalstory.AppStore.ts +++ b/src/apps/com.magicalstory.AppStore.ts @@ -12,24 +12,31 @@ export default defineAppConfig({ key: 0, name: '腾讯广告', activityIds: [ - 'com.magicalstory.AppStore.search.searchActivity', 'com.magicalstory.AppStore.appDetails.AppDetailsActivity', 'com.magicalstory.AppStore.main.fragments.square.section.forumDetailsActivity', ], - matches: [ - '[id^="com.magicalstory.AppStore:id/banner"]', - 'FrameLayout[childCount=5] > FrameLayout[childCount=1] > ImageView[visibleToUser=true]', - ], + excludeActivityIds: 'com.magicalstory.AppStore.search.searchActivity', // 排除搜索页，搜索页的规则见 key: 1 + matches: + '[visibleToUser=true] - [vid^="banner"] >n FrameLayout[childCount=5] > FrameLayout[childCount=1] > @ImageView[visibleToUser=true] < FrameLayout +2 *[visibleToUser=true]', snapshotUrls: [ - 'https://i.gkd.li/import/13185746', 'https://i.gkd.li/import/13413482', 'https://i.gkd.li/import/13416979', 'https://i.gkd.li/import/13527698', 'https://i.gkd.li/import/13759492', // 限定 visibleToUser, 防止误触 + 'https://i.gkd.li/import/14273176', // 限定 visibleToUser, 防止误触 + 'https://i.gkd.li/import/14273317', // 限定 visibleToUser, 防止误触 ], }, { key: 1, + name: '腾讯广告-搜索页面', + activityIds: 'com.magicalstory.AppStore.search.searchActivity', + matches: + 'FrameLayout[childCount=5] > FrameLayout[childCount=1] > @ImageView[visibleToUser=true] < FrameLayout +2 *[visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/import/13185746', + }, + { + key: 2, quickFind: true, activityIds: 'com.magicalstory.AppStore.main.MainActivity', matches: '[id="com.magicalstory.AppStore:id/button_close_ad"]', From aea3e2e6ac1db01e72e3adeb149af4e6913ee119 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Wed, 14 Feb 2024 07:39:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?remove(=E5=A5=87=E5=A6=99=E5=BA=94=E7=94=A8?= =?UTF-8?q?)=20=E7=A7=BB=E9=99=A4=20key:=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/com.magicalstory.AppStore.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/apps/com.magicalstory.AppStore.ts b/src/apps/com.magicalstory.AppStore.ts index 9ed57804..f828a5ad 100644 --- a/src/apps/com.magicalstory.AppStore.ts +++ b/src/apps/com.magicalstory.AppStore.ts @@ -3,6 +3,7 @@ import { defineAppConfig } from '../types'; export default defineAppConfig({ id: 'com.magicalstory.AppStore', name: '奇妙应用', + deprecatedKeys: [6], groups: [ { key: 1, @@ -71,15 +72,5 @@ export default defineAppConfig({ '[id="com.magicalstory.AppStore:id/tv_update"] <2 * + * > [id="com.magicalstory.AppStore:id/iv_close"]', snapshotUrls: 'https://i.gkd.li/import/13459373', }, - { - key: 6, - name: '局部广告-搜索页卡片广告', - desc: '腾讯广告', - actionMaximum: 1, - activityIds: 'com.magicalstory.AppStore.search.searchActivity', - rules: - 'FrameLayout[childCount>1] > FrameLayout[childCount=1] > ImageView[width<80][height<80]', - snapshotUrls: 'https://i.gkd.li/import/13695554', - }, ], }); From b18bc38025025cfa08d143c0d9d037c518c94da7 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Wed, 14 Feb 2024 07:54:15 +0800 Subject: [PATCH 3/3] fix groupKey:1 key: 1 --- src/apps/com.magicalstory.AppStore.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/com.magicalstory.AppStore.ts b/src/apps/com.magicalstory.AppStore.ts index f828a5ad..e4aa3953 100644 --- a/src/apps/com.magicalstory.AppStore.ts +++ b/src/apps/com.magicalstory.AppStore.ts @@ -33,8 +33,11 @@ export default defineAppConfig({ name: '腾讯广告-搜索页面', activityIds: 'com.magicalstory.AppStore.search.searchActivity', matches: - 'FrameLayout[childCount=5] > FrameLayout[childCount=1] > @ImageView[visibleToUser=true] < FrameLayout +2 *[visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/import/13185746', + 'FrameLayout[childCount=5] > FrameLayout[childCount=1] > @ImageView < FrameLayout +2 *[visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/import/13185746', + 'https://i.gkd.li/import/13695554', + ], }, { key: 2,