feat: 更新规则

MengNianxiaoyao · Jul 8, 2024 · 81c3308 · 81c3308
1 parent 5d33537
commit 81c3308
Show file tree

Hide file tree

Showing 19 changed files with 272 additions and 84 deletions.
diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
@@ -276,7 +276,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.cainiao.wireless',
     name: '菜鸟',
-    deprecatedKeys: [0, 3],
+    deprecatedKeys: [0, 3, 7, 8, 11],
   },
   {
     id: 'com.cctv.cctv5ultimate',
@@ -544,4 +544,9 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: '微博',
     deprecatedKeys: [10],
   },
+  {
+    id: 'com.jingyao.easybike',
+    name: '哈啰',
+    deprecatedKeys: [11, 13, 14],
+  },
 ];
diff --git a/src/apps/cn.runningquotient.rq.ts b/src/apps/cn.runningquotient.rq.ts
@@ -0,0 +1,41 @@
+import { defineGkdApp } from '@gkd-kit/define';
+
+export default defineGkdApp({
+  id: 'cn.runningquotient.rq',
+  name: 'RQrun',
+  groups: [
+    {
+      key: 1,
+      name: '功能类-自动签到',
+      desc: '点击右侧[签到福利]',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          key: 0,
+          activityIds: 'cn.runningquotient.rq.page.common_page.MainActivity',
+          matches: '[vid="iv_main_checkin_entry"]',
+          snapshotUrls: 'https://i.gkd.li/i/16105502',
+        },
+        {
+          preKeys: [0],
+          key: 1,
+          activityIds:
+            'cn.runningquotient.rq.page.common_page.CommonContainerActivity',
+          matches: '@[text="我知道了"] <<n [vid="common_h5_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/16105938',
+        },
+        {
+          preKeys: [1],
+          key: 2,
+          activityIds:
+            'cn.runningquotient.rq.page.common_page.CommonContainerActivity',
+          matches: '[vid="iv_setting_header_view_left"]',
+          snapshotUrls: 'https://i.gkd.li/i/16105942',
+        },
+      ],
+    },
+  ],
+});
diff --git a/src/apps/com.android.vending.ts b/src/apps/com.android.vending.ts
@@ -45,6 +45,12 @@ export default defineGkdApp({
           matches: '[text="以后再说"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/15335350',
         },
+        {
+          key: 2,
+          activityIds: 'com.google.android.finsky.activities.MainActivity',
+          matches: ['[text*="推荐内容"]', '[text="不用了"]'],
+          snapshotUrls: 'https://i.gkd.li/i/16079813',
+        },
       ],
     },
   ],

diff --git a/src/apps/com.baidu.netdisk.ts b/src/apps/com.baidu.netdisk.ts
@@ -77,11 +77,10 @@ export default defineGkdApp({
       key: 6,
       name: '更新提示',
       quickFind: true,
-      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: '[text="立即更新"] -2 [text="下次再说"]', //使用ID会导致误触（例如删除确认https://i.gkd.li/i/13069049）
-      snapshotUrls: 'https://i.gkd.li/i/12863984',
+      snapshotUrls: 'https://i.gkd.li/i/16118181',
     },
     {
       key: 8,

diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts
@@ -323,10 +323,15 @@ export default defineGkdApp({
       key: 15,
       name: '局部广告-信息流广告',
       desc: '点击关闭',
+      forcedTime: 10000,
       rules: [
         {
           quickFind: true,
-          activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
+          activityIds: [
+            'com.baidu.tieba.pb.pb.main.PbActivity',
+            'com.baidu.tieba.forum.ForumActivity',
+            'com.baidu.tieba.tblauncher.MainTabActivity',
+          ],
           matches:
             '@FrameLayout[clickable=true] <n RelativeLayout + * [text="广告"]',
           exampleUrls:
@@ -335,6 +340,8 @@ export default defineGkdApp({
             'https://i.gkd.li/i/16038470',
             'https://i.gkd.li/i/16038471',
             'https://i.gkd.li/i/16038472',
+            'https://i.gkd.li/i/16107627',
+            'https://i.gkd.li/i/16118151',
           ],
         },
       ],

diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
@@ -10,14 +10,12 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          quickFind: true,
+          forcedTime: 10000,
           activityIds:
             'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
-          quickFind: true,
-          matches: '[id="com.cainiao.wireless:id/draw_dialog_iv_close"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12914371',
-            'https://i.gkd.li/i/13692758',
-          ],
+          matches: '[vid="draw_dialog_iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/16118156',
         },
         {
           key: 1,
@@ -53,6 +51,14 @@ export default defineGkdApp({
             '@[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/14033859',
         },
+        {
+          key: 5,
+          quickFind: true,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: '[vid="cn_bottom_sheet_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/16118155',
+        },
       ],
     },
     {

diff --git a/src/apps/com.cn21.ecloud.ts b/src/apps/com.cn21.ecloud.ts
@@ -7,12 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: ['com.cn21.ecloud.activity.MainPageActivity'],
-      rules:
-        '[id="com.cn21.ecloud:id/content_frame"] >n FrameLayout >n @ImageView[desc=null] - View < View[childCount=2]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12865481',
-        'https://i.gkd.li/i/12865488',
+      activityIds: 'com.cn21.ecloud.activity.MainPageActivity',
+      rules: [
+        {
+          matches:
+            '[id="com.cn21.ecloud:id/content_frame"] >(5,7) View[childCount=2] > ImageView[childCount=0][clickable=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12865481',
+            'https://i.gkd.li/i/12865488',
+          ],
+        },
       ],
     },
     {

diff --git a/src/apps/com.dianxinai.mobile.ts b/src/apps/com.dianxinai.mobile.ts
@@ -7,16 +7,14 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
-          matches:
-            '@ViewGroup[clickable=true] > TextView[text$="s" && text.length=2]',
-          exampleUrls:
-            'https://m.gkd.li/57941037/a4b9c558-1d1f-4964-9545-95533253c9d1',
-          snapshotUrls: 'https://i.gkd.li/i/12847518',
+          matches: '[text$="s"][text.length=2]',
+          snapshotUrls: 'https://i.gkd.li/i/16115075',
         },
       ],
     },

diff --git a/src/apps/com.douban.frodo.ts b/src/apps/com.douban.frodo.ts
@@ -25,11 +25,23 @@ export default defineGkdApp({
             left: 'width * 0.8833',
             top: 'width * 0.1388',
           },
+          excludeMatches: '[id="com.douban.frodo:id/_ad_image_"][width=1200]',
           matches: '[id="com.douban.frodo:id/_ad_image_"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13575257',
             'https://i.gkd.li/i/13575547',
+          ],
+        },
+        {
+          key: 2,
+          position: {
+            left: 'width * 0.8666',
+            top: 'width * 0.1625',
+          },
+          matches: '[id="com.douban.frodo:id/_ad_image_"][width=1200]',
+          snapshotUrls: [
             'https://i.gkd.li/i/13601755',
+            'https://i.gkd.li/i/16054268',
           ],
         },
       ],

diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts
@@ -328,5 +328,21 @@ export default defineGkdApp({
         },
       ],
     },
+    {
+      key: 23,
+      name: '全屏广告-[银行卡还款服务升级]弹窗',
+      desc: '点击[放弃升级，直接付款]',
+      rules: [
+        {
+          quickFind: true,
+          activityIds:
+            'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
+          matches: '@[clickable=true] >2 [text="放弃升级，直接付款"]',
+          exampleUrls:
+            'https://m.gkd.li/57941037/1b788a34-68f6-43c0-8be4-e13cb8221852',
+          snapshotUrls: 'https://i.gkd.li/i/16106615',
+        },
+      ],
+    },
   ],
 });
diff --git a/src/apps/com.example.yr.ts b/src/apps/com.example.yr.ts
@@ -0,0 +1,26 @@
+import { defineGkdApp } from '@gkd-kit/define';
+
+export default defineGkdApp({
+  id: 'com.example.yr',
+  name: '剧兔',
+  groups: [
+    {
+      key: 1,
+      name: '全屏广告-弹窗广告',
+      desc: '点击关闭',
+      rules: [
+        {
+          activityIds: 'com.example.yr.MainActivity',
+          matches:
+            '[id="android:id/content"] >(3,4) FrameLayout[childCount>3] > FrameLayout[childCount=1] > ImageView',
+          exampleUrls:
+            'https://m.gkd.li/57941037/e5ab8198-9705-4976-8a24-7d128b9a576e',
+          snapshotUrls: [
+            'https://i.gkd.li/i/16115831',
+            'https://i.gkd.li/i/16115830',
+          ],
+        },
+      ],
+    },
+  ],
+});
diff --git a/src/apps/com.heytap.cloud.ts b/src/apps/com.heytap.cloud.ts
@@ -0,0 +1,24 @@
+import { defineGkdApp } from '@gkd-kit/define';
+
+export default defineGkdApp({
+  id: 'com.heytap.cloud',
+  name: '云服务',
+  groups: [
+    {
+      key: 1,
+      name: '更新提示',
+      desc: '点击关闭',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.heytap.cloud.home.ui.CloudSettingsActivity2',
+          matches: ['[text="检测到新版本"]', '[vid="cancel"]'],
+          snapshotUrls: 'https://i.gkd.li/i/16097208',
+        },
+      ],
+    },
+  ],
+});