feat: 规则维护更新 (#70)

* feat(QQ): 一些更新 - 频道页面广告 - 自动授权 - 自动勾选原图 - 自动查看原图 * feat(PU口袋校园): 弹窗广告 * feat(应用商店): 功能类-自动点击[查看全部升级] * fix(微信): 订阅号文章广告, 青少年模式自动点击验证密码 * fix(QQ): 自动授权 * feat(菜鸟): 弹窗广告 * feat(高德地图): 广告弹窗
aoguai · Mar 30, 2024 · 0b9e855 · 0b9e855
1 parent b07cacd
commit 0b9e855
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 58 deletions.
diff --git a/src/apps/com.autonavi.minimap.ts b/src/apps/com.autonavi.minimap.ts
@@ -40,6 +40,7 @@ export default defineAppConfig({
         'https://i.gkd.li/i/14715295',
         'https://i.gkd.li/i/14730914',
         'https://i.gkd.li/i/14730915',
+        'https://i.gkd.li/i/14784970',
       ],
     },
     {
@@ -54,13 +55,26 @@ export default defineAppConfig({
     },
     {
       key: 13,
-      name: '全屏广告-[欢迎]弹窗',
+      name: '全屏广告-广告弹窗',
       desc: '点击关闭',
+      enable: false,
       quickFind: true,
       activityIds: 'com.autonavi.map.activity.NewMapActivity',
-      rules:
-        'ViewGroup[childCount=6] >4 ViewGroup[childCount=5] > @ImageView + View[text!=null] <<n [vid="fragment_container"]',
-      snapshotUrls: 'https://i.gkd.li/i/14800704',
+      rules: [
+        {
+          key: 0,
+          name: '【欢迎】弹窗',
+          matches:
+            'ViewGroup[childCount=6] >4 ViewGroup[childCount=5] > @ImageView + View[text!=null] <<n [vid="fragment_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/14800704',
+        },
+        {
+          key: 1,
+          name: '签到弹窗',
+          matches: '[desc="弹窗"] + [vid="main_map_msg_dialog_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/14809993',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts
@@ -199,6 +199,7 @@ export default defineAppConfig({
     {
       key: 11,
       name: '局部广告-帖子底部浮窗广告',
+      activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
       rules:
         'View + @ImageView[clickable=true] <<6 RelativeLayout[childCount>2] > ImageView[clickable=false]',
       snapshotUrls: [

diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
@@ -9,11 +9,14 @@ export default defineAppConfig({
       key: 1,
       name: '全屏广告-弹窗广告',
       enable: false,
+      activityIds: [
+        'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
+        'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+        'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
+      ],
       rules: [
         {
           key: 0,
-          activityIds:
-            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
           quickFind: true,
           matches: '[id="com.cainiao.wireless:id/draw_dialog_iv_close"]',
           snapshotUrls: [
@@ -23,20 +26,21 @@ export default defineAppConfig({
         },
         {
           key: 1,
-          activityIds:
-            'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
           matches:
             'View[childCount=4] > Image + View + Image + View[text.length>0][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/import/13042279',
         },
         {
           key: 2,
           quickFind: true,
-          activityIds:
-            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
           matches: '[vid="dialog_full_image_close"]',
           snapshotUrls: 'https://i.gkd.li/import/13842492',
         },
+        {
+          key: 3,
+          matches: 'View[childCount=2][clickable=true] > [text="关闭"]',
+          snapshotUrls: 'https://i.gkd.li/import/14033859',
+        },
       ],
     },
     {
@@ -48,19 +52,5 @@ export default defineAppConfig({
       rules: 'View[desc="立即查看"] +2 ImageView[id=null]',
       snapshotUrls: ['https://i.gkd.li/import/14162159'],
     },
-    {
-      key: 8,
-      name: '全屏广告-发现页新装试用弹窗',
-      desc: '点击X',
-      enable: false,
-      rules: [
-        {
-          activityIds:
-            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
-          matches: 'View[childCount=2][clickable=true] > [text="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/import/14033859',
-        },
-      ],
-    },
   ],
 });
diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts
@@ -238,7 +238,7 @@ export default defineAppConfig({
           key: 0,
           name: '点击「广告」按钮',
           matches: [
-            '@[name$=".View"||name$=".TextView"][text^="广告"][visibleToUser=true] <n View < View[childCount=1] <<3 View[childCount=1] <<2 View[childCount=1]',
+            '[name$=".View"||name$=".TextView"][text^="广告"][visibleToUser=true] <n @View < View[childCount=1] <<3 View[childCount=1] <<2 View[childCount=1]',
           ],
           snapshotUrls: [
             'https://i.gkd.li/import/12642232', // ui.TmplWebViewMMUI
@@ -248,6 +248,7 @@ export default defineAppConfig({
             'https://i.gkd.li/import/12700183',
             'https://i.gkd.li/import/12714424',
             'https://i.gkd.li/import/14293295',
+            'https://i.gkd.li/i/14802057',
             'https://i.gkd.li/import/12678937', // 防误触, 文章未浏览至页面底部，广告反馈按钮不可见，使用 [visibleToUser=true] 进行限定，防止打开文章就频繁触发规则
             'https://i.gkd.li/import/12646837', // 防误触, 事件完成后，反馈按钮仍然存在，使用 View[childCount=1] 进行限定，防止频繁触发规则
             'https://i.gkd.li/import/12642234', // 防误触, 出现反馈菜单后应该不匹配
@@ -434,7 +435,6 @@ export default defineAppConfig({
       desc: '点击“验证密码”以申请临时访问',
       enable: false,
       actionMaximum: 1,
-      resetMatch: 'activity',
       matchTime: 10000,
       activityIds: [
         'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',

diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts
@@ -3,7 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.tencent.mobileqq',
   name: 'QQ',
-  deprecatedKeys: [4, 6, 17, 18, 22],
+  deprecatedKeys: [4, 6, 17, 18, 19, 22],
   groups: [
     {
       key: 0,
@@ -138,14 +138,15 @@ export default defineAppConfig({
       key: 3,
       name: '全屏广告-频道页面广告',
       enable: false,
+      activityIds: [
+        'com.tencent.mobileqq.activity.SplashActivity',
+        'com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog',
+      ],
       rules: [
         {
+          key: 0,
           name: '弹窗广告',
           quickFind: true,
-          activityIds: [
-            'com.tencent.mobileqq.activity.SplashActivity',
-            'com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog',
-          ],
           matches:
             'ImageView[id="com.tencent.mobileqq:id/close"][clickable=true]',
           snapshotUrls: [
@@ -154,8 +155,8 @@ export default defineAppConfig({
           ],
         },
         {
+          key: 1,
           name: '右侧悬浮广告',
-          activityIds: 'com.tencent.mobileqq.activity.SplashActivity',
           matches:
             'FrameLayout[desc="发表帖子"] - LinearLayout[id!=null] >3 ImageView[id!=null][clickable=false] - View[id!=null][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/import/12708844',
@@ -204,23 +205,29 @@ export default defineAppConfig({
           activityIds: [
             'com.tencent.biz.qrcode.activity.QRLoginAuthActivity',
             'com.tencent.mobileqq.activity.DevlockQuickLoginActivity',
+            'com.tencent.open.agent.PublicFragmentActivityForOpenSDK',
           ],
           matches:
-            'TextView[text="登录确认"||text="一键验证"] <n * +n * >n Button[text*="登录"]',
+            'Button[text*="登录"][clickable=true][visibleToUser=true][text.length<10]',
           snapshotUrls: [
             'https://i.gkd.li/import/13623520',
             'https://i.gkd.li/import/12789287',
             'https://i.gkd.li/import/13063027',
+            'https://i.gkd.li/import/13166314',
           ],
         },
         {
           key: 2,
-          name: 'QQ 互联登录确认',
-          activityIds: [
-            'com.tencent.mobileqq.activity.DevLockQuickVerifyActivity',
-          ],
-          matches: 'Button[text="拒绝"] - Button[text="登录"]',
-          snapshotUrls: ['https://i.gkd.li/import/13166314'],
+          name: '点击同意',
+          matches: 'Button[text="同意"][clickable=true][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/14752498',
+        },
+        {
+          preKeys: [2],
+          key: 3,
+          name: '点击确认',
+          matches: 'Button[text="确认"]',
+          snapshotUrls: 'https://i.gkd.li/i/14752519',
         },
       ],
     },
@@ -237,6 +244,7 @@ export default defineAppConfig({
       name: '功能类-自动勾选原图',
       desc: '发送图片时自动勾选原图',
       enable: false,
+      quickFind: true,
       activityIds: [
         'com.tencent.mobileqq.activity.SplashActivity',
         'com.tencent.qqnt.qbasealbum.WinkHomeActivity',
@@ -255,11 +263,13 @@ export default defineAppConfig({
       name: '功能类-自动查看原图',
       desc: '查看图片时自动点击原图',
       enable: false,
+      quickFind: true,
       activityIds: 'com.tencent.richframework.gallery.QQGalleryActivity',
-      rules: '[desc="查看原图"][checked=false]',
+      rules: '[text^="查看原图"][checked=false]',
       snapshotUrls: [
         'https://i.gkd.li/import/12840632', // 点击原图前
         'https://i.gkd.li/import/12840633', // 点击原图后
+        'https://i.gkd.li/i/14757735',
       ],
     },
     {
@@ -349,20 +359,6 @@ export default defineAppConfig({
         },
       ],
     },
-    {
-      key: 19,
-      name: '全屏广告-内测邀请弹窗',
-      enable: false,
-      quickFind: true,
-      activityIds: 'com.tencent.mobileqq.activity.SplashActivity',
-      rules: [
-        {
-          key: 0,
-          matches: '@ImageView[desc="关闭"] <2 * >2 [text="QQ测试版"]',
-          snapshotUrls: 'https://i.gkd.li/import/13526551',
-        },
-      ],
-    },
     {
       key: 20,
       name: '分段广告-钱包页卡片广告',
@@ -501,8 +497,6 @@ export default defineAppConfig({
       rules: [
         {
           matches: 'RelativeLayout[childCount=2] > [text="关闭"]',
-          exampleUrls:
-            'https://m.gkd.li/57941037/df526685-8a68-48cd-8328-0292079ff030',
           snapshotUrls: 'https://i.gkd.li/import/14235163',
         },
       ],

diff --git a/src/apps/com.xiaomi.market.ts b/src/apps/com.xiaomi.market.ts
@@ -52,5 +52,15 @@ export default defineAppConfig({
         },
       ],
     },
+    {
+      key: 13,
+      name: '功能类-自动点击[查看全部升级]',
+      desc: '应用升级页面',
+      quickFind: true,
+      enable: false,
+      activityIds: 'com.xiaomi.market.ui.UpdateListActivity',
+      rules: '@[clickable=true] > [text^="查看全部升级"]',
+      snapshotUrls: 'https://i.gkd.li/i/14782814',
+    },
   ],
 });
diff --git a/src/apps/com.xyhui.ts b/src/apps/com.xyhui.ts
@@ -12,14 +12,14 @@ export default defineAppConfig({
       rules: [
         {
           key: 1,
-          name: '腾讯广告-1',
+          name: '腾讯广告',
           activityIds: [
             'com.xyhui.start.PUMainActivity',
             'com.xyhui.start.LoadingActivity',
             'com.huawei.permissioncontroller.hwcust.appjump.AppJumpActivity',
           ],
           matches:
-            '[id="android:id/content"] >(4,5) FrameLayout[index=1] > ImageView',
+            '[id="android:id/content"] >(4,5) @FrameLayout[index=1] > ImageView',
           snapshotUrls: [
             'https://i.gkd.li/import/12642482',
             'https://i.gkd.li/import/12646519',
@@ -36,6 +36,7 @@ export default defineAppConfig({
             'https://i.gkd.li/import/12793177',
             'https://i.gkd.li/import/12868157', // com.xyhui.start.LoadingActivity
             'https://i.gkd.li/import/13348807', // com.bbk.launcher2.Launcher
+            'https://i.gkd.li/i/14766902',
           ],
         },
         {