diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index b21f25f9..b64842d5 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -476,7 +476,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.tencent.mm', name: '微信', - deprecatedKeys: [8, 12, 13, 14, 16, 20, 21, 23, 24, 27, 33], + deprecatedKeys: [3, 8, 12, 13, 14, 16, 20, 21, 23, 24, 27, 33], }, { id: 'com.tencent.mobileqq', diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts index 3b4a5d20..e1416c35 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -142,7 +142,7 @@ export default defineGkdApp({ }, { key: 2, - name: '功能类-浏览器扫码微信登录自动授权', + name: '功能类-自动授权登录', desc: '自动允许使用头像昵称等', quickFind: true, matchTime: 10000, @@ -150,22 +150,18 @@ export default defineGkdApp({ resetMatch: 'activity', activityIds: [ 'com.tencent.mm.plugin.webview.ui.tools.SDKOAuthUI', + 'com.tencent.mm.plugin.base.stub.UIEntryStub', 'com.tencent.mm.ui.LauncherUI', ], - rules: 'Button[text="拒绝"] - Button[text="允许"]', - snapshotUrls: 'https://i.gkd.li/i/13065462', - }, - { - key: 3, - name: '功能类-第三方APP申请使用授权弹窗', - desc: '自动点击允许,但由于此界面可以额外新建昵称头像,默认不启用', - quickFind: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'activity', - activityIds: 'com.tencent.mm.plugin.base.stub.UIEntryStub', - rules: 'Button[text="拒绝"] - Button[text="允许"]', - snapshotUrls: 'https://i.gkd.li/i/12663602', + rules: [ + { + matches: ['[text^="获取你的"]', '[text="允许"]'], + snapshotUrls: [ + 'https://i.gkd.li/i/12663602', + 'https://i.gkd.li/i/13065462', + ], + }, + ], }, { key: 4, @@ -393,7 +389,7 @@ export default defineGkdApp({ 'com.tencent.mm.plugin.finder.ui.', 'com.tencent.mm.ui.LauncherUI', ], - matches: '[text*="青少年模式"] [text="我知道了"]', + matches: ['[text*="青少年模式"]', '[text="我知道了"]'], snapshotUrls: [ 'https://i.gkd.li/i/13538145', 'https://i.gkd.li/i/13575195', @@ -475,7 +471,7 @@ export default defineGkdApp({ quickFind: true, activityIds: 'com.tencent.mm.framework.app.UIPageFragmentActivity', matches: - '[text="完成" || text="返回商家"] <2 [vid="kinda_button_impl_wrapper"]', + '[vid="kinda_button_impl_wrapper"][desc="完成" || desc="返回商家"]', exampleUrls: 'https://m.gkd.li/57941037/a5177d9d-6745-443f-baf5-af57153430d8', snapshotUrls: [ @@ -543,9 +539,10 @@ export default defineGkdApp({ desc: '点击关闭', rules: [ { + quickFind: true, activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI', matches: - '@TextView[clickable=true] + * > [text="腾讯文档"] + [text^="使用 APP"]', + '@TextView[clickable=true] + * > [text^="使用 APP"] <3 [text="权限申请"]', + matches: ['[text="权限申请"]', '[text="取消"]'], exampleUrls: 'https://m.gkd.li/57941037/43632b72-d389-4fe7-9708-dac78e900679', snapshotUrls: 'https://i.gkd.li/i/14645385',