diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 8b0c4c59..2df09902 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -524,4 +524,9 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: '哔哩哔哩', deprecatedKeys: [3, 5], }, + { + id: 'com.chunqiu.ah', + name: 'AH视频', + deprecatedKeys: [3, 5, 6], + }, ]; diff --git a/src/apps/com.chunqiu.ah.ts b/src/apps/com.chunqiu.ah.ts index 6cc54f33..7c71b21b 100644 --- a/src/apps/com.chunqiu.ah.ts +++ b/src/apps/com.chunqiu.ah.ts @@ -26,90 +26,78 @@ export default defineGkdApp({ matches: '@ImageView - [text="|"]', snapshotUrls: 'https://i.gkd.li/i/13264377', }, + { + key: 2, + matches: + 'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true] + TextView <2 [text="京东"]', - snapshotUrls: 'https://i.gkd.li/i/13264383', - }, - ], - }, - { - key: 2, - name: '局部广告-卡片式广告', rules: [ { key: 0, - name: '腾讯广告', activityIds: 'com.androlua.LuaActivity', matches: - 'ImageView < FrameLayout -2 FrameLayout > FrameLayout[childCount=1] > ImageView[childCount=0]', - snapshotUrls: 'https://i.gkd.li/i/13635499', + '[id="android:id/content"] >(3,4) FrameLayout[childCount>3] > FrameLayout[childCount=1] > ImageView', + snapshotUrls: [ + 'https://i.gkd.li/i/13264383', + 'https://i.gkd.li/i/13852448', + ], }, - ], - }, - { - key: 3, - quickFind: true, - name: '全屏广告-首页推广', - desc: '点击我已知晓', - rules: [ { - activityIds: 'com.androlua.LuaActivity', + key: 1, + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: - '[id="com.chunqiu.ah:id/buttonPanel"] [text="我已知晓"][id="android:id/button2"]', + '[text="反馈"] -4 @View[visibleToUser=true] > Image[childCount=0]', + snapshotUrls: 'https://i.gkd.li/i/15258557', + }, + { + key: 2, + quickFind: true, + activityIds: 'com.androlua.LuaActivity', + matches: '[text="我已知晓"][clickable=true][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13852430', }, ], }, { - key: 4, - quickFind: true, - name: '全屏广告-公告', - desc: '点击不再提示', - rules: [ - { - activityIds: 'com.androlua.LuaActivity', - matches: '[id="com.chunqiu.ah:id/buttonPanel"] [text="不再提示"]', - snapshotUrls: 'https://i.gkd.li/i/13852447', - }, - ], - }, - { - key: 5, - quickFind: true, - name: '全屏广告-首页弹窗广告', - desc: '点击X', - rules: [ - { - activityIds: 'com.androlua.LuaActivity', - matches: - '@ImageView[visibleToUser=true] < * +3 * > [text="查看详情"]', - snapshotUrls: 'https://i.gkd.li/i/13852448', - }, - ], - }, - { - key: 6, - name: '局部广告-播放界面广告', - desc: '点击X', + key: 2, + name: '局部广告-卡片广告', rules: [ { key: 0, + quickFind: true, activityIds: 'com.androlua.LuaActivity', matches: - '[id="com.chunqiu.ah:id/ksad_container"] >n View[id="logoBox"] > TextView[clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13852535', + '@FrameLayout[childCount=1] <3 FrameLayout[childCount=3] +2 * >2 [text="了解更多"]', + snapshotUrls: 'https://i.gkd.li/i/13635499', }, { key: 1, activityIds: 'com.androlua.LuaActivity', + matches: + '@TextView[visibleToUser=true][childCount=0] - View >4 [text="立即下载"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13852535', + 'https://i.gkd.li/i/15258570', + 'https://i.gkd.li/i/15258575', + ], + }, + { + key: 2, + activityIds: 'com.androlua.LuaActivity', + matches: + 'WebView >3 View[childCount=6] > @View[visibleToUser=true] > Image[childCount=0]', + snapshotUrls: 'https://i.gkd.li/i/15258500', + }, + { + key: 3, + activityIds: 'com.androlua.LuaActivity', matches: '[id="android:id/content"] FrameLayout[childCount<=5] > FrameLayout[childCount=1] > ImageView[visibleToUser=true][index=0]', snapshotUrls: [ @@ -120,5 +108,21 @@ export default defineGkdApp({ }, ], }, + { + key: 4, + name: '通知提示-公告弹窗', + desc: '点击[不再提示]', + quickFind: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.androlua.LuaActivity', + matches: '[text="不再提示"][clickable=true][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/13852447', + }, + ], + }, ], });