From 0f112307e44d0fd9c624d125bbaba610b5f10d36 Mon Sep 17 00:00:00 2001 From: AIsouler Date: Fri, 13 Sep 2024 22:03:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8D=8E=E4=B8=BA=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/appDeprecatedKeys.ts | 2 +- src/apps/com.huawei.android.thememanager.ts | 158 ++++++++------------ 2 files changed, 63 insertions(+), 97 deletions(-) diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 2dd98252..7f78cb1f 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -561,7 +561,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.huawei.android.thememanager', name: '华为主题', - deprecatedKeys: [3], + deprecatedKeys: [3, 4, 5, 6], }, ]; diff --git a/src/apps/com.huawei.android.thememanager.ts b/src/apps/com.huawei.android.thememanager.ts index 99e31cb6..911524f7 100644 --- a/src/apps/com.huawei.android.thememanager.ts +++ b/src/apps/com.huawei.android.thememanager.ts @@ -13,8 +13,8 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { - matches: '[text^="跳过"][text.length<=10]', action: 'clickCenter', + matches: '[text^="跳过"][text.length<=10]', snapshotUrls: [ 'https://i.gkd.li/i/12657379', 'https://i.gkd.li/i/13069736', @@ -25,126 +25,92 @@ export default defineGkdApp({ }, { key: 1, - name: '局部广告-主题详情页“下应用领主题”横幅', + name: '局部广告-悬浮广告', fastQuery: true, - activityIds: [ - 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.OnlineThemePreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinewallpaper.OnlineWallpaperPreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinefont.OnlineFontPreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.paster.PasterDetailActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.LocalThemePreviewActivity', - ], rules: [ { - matches: '[id="com.huawei.android.thememanager:id/iv_vip_close"]', - snapshotUrls: 'https://i.gkd.li/i/12647175', + key: 0, + activityIds: 'com.huawei.android.thememanager.HwThemeManagerActivity', + matches: '[vid="iv_ad_close"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/2ca3890a-ef46-4f10-92ec-bfb921582a6a', + snapshotUrls: 'https://i.gkd.li/i/16993275', + }, + { + key: 1, + activityIds: + 'com.huawei.android.thememanager.mvp.view.activity.onlinefont.OnlineFontPreviewActivity', + matches: '[vid="iv_vip_close"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/5e5afbbf-b891-47f3-9543-48ceb3fd0104', + snapshotUrls: 'https://i.gkd.li/i/16993276', }, ], }, { key: 2, - name: '分段广告-主题详情页广告', + name: '分段广告-卡片广告', fastQuery: true, rules: [ { key: 0, - activityIds: [ + activityIds: 'com.huawei.android.thememanager.HwThemeManagerActivity', + matches: + '[vid="pps_label_ll" || vid="announce_ad_close_layout"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/04d831b8-0a98-4b3a-9ecc-f9026c1d7f2c', + snapshotUrls: [ + 'https://i.gkd.li/i/16992846', + 'https://i.gkd.li/i/16993185', + ], + }, + { + key: 1, + activityIds: 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.OnlineThemePreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinewallpaper.OnlineWallpaperPreviewActivity', + matches: + '@LinearLayout[clickable=true] < LinearLayout -2 LinearLayout >2 [text="广告"]', + exampleUrls: 'https://e.gkd.li/1f3cecca-2339-4271-873e-5ecb65263a8a', + snapshotUrls: 'https://i.gkd.li/i/16993229', + }, + { + key: 2, + activityIds: 'com.huawei.android.thememanager.mvp.view.activity.onlinefont.OnlineFontPreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.paster.PasterDetailActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.LocalThemePreviewActivity', + matches: '[vid="download_pps_close"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/8bace857-9eb3-4b6a-83b7-34328a3f96eb', + snapshotUrls: 'https://i.gkd.li/i/16993406', + }, + { + preKeys: [0, 1, 2], + activityIds: [ + 'com.huawei.openalliance.ad.activity.FeedbackActivity', + '.HwThemeManagerActivity', + ], + anyMatches: [ + '[text="直接关闭"]', + '@[clickable=true] >2 [text="不感兴趣"]', + ], + exampleUrls: [ + 'https://e.gkd.li/93458efb-d891-46b3-a2a0-8629a0399731', + 'https://e.gkd.li/0e72693d-4ad3-4efd-b469-5aa635dd958b', ], - matches: - '[id="com.huawei.hms.ads.uiengine:id/unlike_iv" || id="com.huawei.android.thememanager:id/download_pps_close" || vid="pps_close"]', snapshotUrls: [ - 'https://i.gkd.li/i/12647248', - 'https://i.gkd.li/i/12647292', - 'https://i.gkd.li/i/12647367', - 'https://i.gkd.li/i/16956672', + 'https://i.gkd.li/i/16992845', + 'https://i.gkd.li/i/16993186', ], }, - { - preKeys: [0], - activityIds: 'com.huawei.openalliance.ad.activity.FeedbackActivity', - matches: '[text="直接关闭"]', - snapshotUrls: 'https://i.gkd.li/i/12647268', - }, - ], - }, - { - key: 4, - name: '分段广告-主题详情信息流广告', - fastQuery: true, - activityIds: [ - 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.OnlineThemePreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinewallpaper.OnlineWallpaperPreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinefont.OnlineFontPreviewActivity', - 'com.huawei.android.thememanager.mvp.view.activity.paster.PasterDetailActivity', - 'com.huawei.android.thememanager.mvp.view.activity.onlinetheme.LocalThemePreviewActivity', - ], - rules: [ - { - key: 0, - matches: - '[id="com.huawei.android.thememanager:id/pps_lable_top"||id="com.huawei.android.thememanager:id/pps_img_video_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12647311', - 'https://i.gkd.li/i/12647346', - ], - }, - { - preKeys: [0], - matches: - '[id="com.huawei.android.thememanager:id/tv_btn_uninterested"]', - snapshotUrls: 'https://i.gkd.li/i/12647326', - }, - ], - }, - { - key: 5, - name: '局部广告-分类页“免费领取”', - activityIds: ['com.huawei.android.thememanager.HwThemeManagerActivity'], - rules: [ - { - matches: '[id="com.huawei.android.thememanager:id/rl_ad_close"]', - snapshotUrls: 'https://i.gkd.li/i/12647393', - }, - ], - }, - { - key: 6, - name: '分段广告-主页面（推荐、分类、我的）广告', - activityIds: ['com.huawei.android.thememanager.HwThemeManagerActivity'], - rules: [ - { - key: 0, - matches: - '[id="com.huawei.android.thememanager:id/announce_ad_close_btn"||id="com.huawei.android.thememanager:id/pps_lable_top"||id="com.huawei.android.thememanager:id/pps_img_video_close"||id="com.huawei.android.thememanager:id/pps_label_ll"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12647614', - 'https://i.gkd.li/i/12647653', - 'https://i.gkd.li/i/12647650', - 'https://i.gkd.li/i/12657822', - ], - }, - { - preKeys: [0], - matches: - '[id="com.huawei.android.thememanager:id/tv_btn_uninterested"]', - snapshotUrls: 'https://i.gkd.li/i/12647655', - }, ], }, { key: 7, name: '全屏广告-首页活动弹窗', - activityIds: [ - 'com.huawei.android.thememanager.HwThemeManagerActivity', - 'com.huawei.android.launcher.unihome.UniHomeLauncher', - ], + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { + activityIds: [ + 'com.huawei.android.thememanager.HwThemeManagerActivity', + 'com.huawei.android.launcher.unihome.UniHomeLauncher', + ], matches: '[id="com.huawei.android.thememanager:id/campaign_dialog_close_image"]', snapshotUrls: [