Merge branch 'gkd-kit:main' into main

README.md

@@ -2,7 +2,7 @@
 
 搞快点 APP 默认订阅规则
 
-当前订阅文件已适配 82 个 APP, 共有 138 规则组
+当前订阅文件已适配 82 个 APP, 共有 145 规则组
 
 如何编写订阅/贡献此项目 -> [CONTRIBUTING.md](./CONTRIBUTING.md)
 
@@ -383,8 +383,25 @@
 
 ### [com.ximalaya.ting.android](/src/apps/com.ximalaya.ting.android.ts) - 喜马拉雅
 
+- 开屏广告
+  - [快照-0](https://gkd-kit.gitee.io/import/12506207)
+  - [快照-1](https://gkd-kit.gitee.io/import/12506273)
 - 首页右侧浮动广告
   - [快照-0](https://gkd-kit.gitee.io/import/38517192/45664dfb-b8e6-4bdb-b5bb-9852c7a86a2f)
+- 播放页面-暂停按钮下面的广告
+  - [快照-0](https://gkd-kit.gitee.io/import/12506218)
+- 播放页面-底部推荐列表-夹杂广告 - 点击关闭-点击屏蔽
+  - [快照-0](https://gkd-kit.gitee.io/import/12506269)
+  - [快照-1](https://gkd-kit.gitee.io/import/12506225)
+- 播放页面-播放前广告
+  - [快照-0](https://gkd-kit.gitee.io/import/12506250)
+- 首页-推荐列表广告 - 点击关闭-点击屏蔽
+  - [快照-0](https://gkd-kit.gitee.io/import/12506258)
+  - [快照-1](https://gkd-kit.gitee.io/import/12506253)
+- 关闭热播推荐广告
+  - [快照-0](https://gkd-kit.gitee.io/import/12506270)
+- 关闭更新弹窗
+  - [快照-0](https://gkd-kit.gitee.io/import/12506287)
 
 ### [com.ximalaya.ting.lite](/src/apps/com.ximalaya.ting.lite.ts) - 喜马拉雅极速版
 

dist/gkd.json

@@ -1,7 +1,7 @@
 {
   "id": 0,
   "name": "默认订阅",
-  "version": 46,
+  "version": 47,
   "author": "lisonge",
   "supportUri": "https://github.com/gkd-kit/subscription",
   "apps": [
@@ -1361,7 +1361,7 @@
           "key": 0,
           "name": "主页-推荐流广告",
           "activityIds": "com.weico.international.activity.MainFragmentActivity",
-          "snapshotUrls": "https://github.com/gkd-kit/subscription/assets/38517192/e713a2ca-5048-486a-874f-dd876d53c49b",
+          "exampleUrls": "https://github.com/gkd-kit/subscription/assets/38517192/e713a2ca-5048-486a-874f-dd876d53c49b",
           "rules": [
             {
               "activityIds": "com.google.android.material.bottomsheet.BottomSheetDialog",
@@ -1413,6 +1413,23 @@
       "id": "com.ximalaya.ting.android",
       "name": "喜马拉雅",
       "groups": [
+        {
+          "key": -1,
+          "name": "开屏广告",
+          "activityIds": [
+            "com.ximalaya.ting.android.host.activity.MainActivity",
+            "com.ximalaya.ting.android.host.activity.SplashAdActivity"
+          ],
+          "rules": [
+            {
+              "matches": "[id=\"com.ximalaya.ting.android:id/xm_ad_host_count_down_click_lay\"]",
+              "snapshotUrls": [
+                "https://gkd-kit.gitee.io/import/12506207",
+                "https://gkd-kit.gitee.io/import/12506273"
+              ]
+            }
+          ]
+        },
         {
           "key": 0,
           "name": "首页右侧浮动广告",
@@ -1421,6 +1438,71 @@
           "snapshotUrls": [
             "https://gkd-kit.gitee.io/import/38517192/45664dfb-b8e6-4bdb-b5bb-9852c7a86a2f"
           ]
+        },
+        {
+          "key": 1,
+          "name": "播放页面-暂停按钮下面的广告",
+          "activityIds": "com.ximalaya.ting.android.host.activity.MainActivity",
+          "rules": "[id=\"com.ximalaya.ting.android:id/x_play_ad_banner_close_real\"]",
+          "snapshotUrls": "https://gkd-kit.gitee.io/import/12506218"
+        },
+        {
+          "key": 2,
+          "name": "播放页面-底部推荐列表-夹杂广告",
+          "desc": "点击关闭-点击屏蔽",
+          "rules": [
+            {
+              "activityIds": "com.ximalaya.ting.android.main.dialog",
+              "matches": "@[clickable=true] > [text=\"屏蔽\"] + [text=\"关闭当前广告\"]",
+              "snapshotUrls": "https://gkd-kit.gitee.io/import/12506269"
+            },
+            {
+              "activityIds": "com.ximalaya.ting.android.host.activity.MainActivity",
+              "matches": "[id=\"com.ximalaya.ting.android:id/main_close\"]",
+              "snapshotUrls": "https://gkd-kit.gitee.io/import/12506225"
+            }
+          ]
+        },
+        {
+          "key": 3,
+          "name": "播放页面-播放前广告",
+          "activityIds": "com.ximalaya.ting.android.host.activity.MainActivity",
+          "rules": "[id=\"com.ximalaya.ting.android:id/main_play_ad_close_real\"]",
+          "snapshotUrls": "https://gkd-kit.gitee.io/import/12506250"
+        },
+        {
+          "key": 4,
+          "name": "首页-推荐列表广告",
+          "desc": "点击关闭-点击屏蔽",
+          "rules": [
+            {
+              "activityIds": "com.ximalaya.ting.android.adsdk.view.DislikeDialog.DislikeBottomDialog",
+              "matches": "[id=\"com.ximalaya.ting.android:id/xm_ad_main_ad_dislike_shield\"]",
+              "snapshotUrls": "https://gkd-kit.gitee.io/import/12506258"
+            },
+            {
+              "activityIds": "com.ximalaya.ting.android.host.activity.MainActivity",
+              "matches": "[id=\"com.ximalaya.ting.android:id/xm_ad_close_real\"]",
+              "snapshotUrls": "https://gkd-kit.gitee.io/import/12506253"
+            }
+          ]
+        },
+        {
+          "key": 5,
+          "name": "关闭热播推荐广告",
+          "activityIds": "com.ximalaya.ting.android.host.activity.MainActivity",
+          "rules": [
+            {
+              "matches": "[text=\"热播推荐\"] + ImageView + ImageView",
+              "snapshotUrls": "https://gkd-kit.gitee.io/import/12506270"
+            }
+          ]
+        },
+        {
+          "key": 6,
+          "name": "关闭更新弹窗",
+          "rules": "[id=\"com.ximalaya.ting.android:id/host_tv_update_later\"]",
+          "snapshotUrls": "https://gkd-kit.gitee.io/import/12506287"
         }
       ]
     },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gkd-kit/subscription",
   "type": "module",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "main": "./dist/gkd.json",
   "unpkg": "./dist/gkd.json",
   "jsdelivr": "./dist/gkd.json",

src/apps/com.ximalaya.ting.android.ts

@@ -1,17 +1,106 @@
 import { defineAppConfig } from '../types';
 
+// TODO 喜马拉雅 青少年模式弹窗 没有关闭按钮, 但是可以点击根节点以外的区域或者按下返回键关闭这个弹窗
+// https://gkd-kit.gitee.io/import/12506209
+
 export default defineAppConfig({
   id: 'com.ximalaya.ting.android',
-  name: `喜马拉雅`,
+  name: '喜马拉雅',
   groups: [
     {
-      key: 0,
+      key: -1,
-      name: `首页右侧浮动广告`,
+      name: '开屏广告',
-      activityIds: `com.ximalaya.ting.android.host.activity.MainActivity`,
+      activityIds: [
-      rules: `[id="com.ximalaya.ting.android:id/main_ad_broadside_close_real"]`,
+        'com.ximalaya.ting.android.host.activity.MainActivity',
-      snapshotUrls: [
+        'com.ximalaya.ting.android.host.activity.SplashAdActivity',
-        `https://gkd-kit.gitee.io/import/38517192/45664dfb-b8e6-4bdb-b5bb-9852c7a86a2f`,
       ],
+      rules: [
+        {
+          matches:
+            '[id="com.ximalaya.ting.android:id/xm_ad_host_count_down_click_lay"]',
+          snapshotUrls: [
+            'https://gkd-kit.gitee.io/import/12506207',
+            'https://gkd-kit.gitee.io/import/12506273',
+          ],
+        },
+      ],
+    },
+    {
+      key: 0,
+      name: '首页右侧浮动广告',
+      activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+      rules: '[id="com.ximalaya.ting.android:id/main_ad_broadside_close_real"]',
+      snapshotUrls: [
+        'https://gkd-kit.gitee.io/import/38517192/45664dfb-b8e6-4bdb-b5bb-9852c7a86a2f',
+      ],
+    },
+    {
+      key: 1,
+      name: '播放页面-暂停按钮下面的广告',
+      activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+      rules: '[id="com.ximalaya.ting.android:id/x_play_ad_banner_close_real"]',
+      snapshotUrls: 'https://gkd-kit.gitee.io/import/12506218',
+    },
+    {
+      key: 2,
+      name: '播放页面-底部推荐列表-夹杂广告',
+      desc: '点击关闭-点击屏蔽',
+      rules: [
+        {
+          activityIds: 'com.ximalaya.ting.android.main.dialog',
+          matches: '@[clickable=true] > [text="屏蔽"] + [text="关闭当前广告"]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12506269',
+        },
+        {
+          activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+          matches: '[id="com.ximalaya.ting.android:id/main_close"]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12506225',
+        },
+      ],
+    },
+    {
+      key: 3,
+      name: '播放页面-播放前广告',
+      activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+      rules: '[id="com.ximalaya.ting.android:id/main_play_ad_close_real"]',
+      snapshotUrls: 'https://gkd-kit.gitee.io/import/12506250',
+    },
+    {
+      key: 4,
+      name: '首页-推荐列表广告',
+      desc: '点击关闭-点击屏蔽',
+      rules: [
+        {
+          activityIds:
+            'com.ximalaya.ting.android.adsdk.view.DislikeDialog.DislikeBottomDialog',
+          matches:
+            '[id="com.ximalaya.ting.android:id/xm_ad_main_ad_dislike_shield"]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12506258',
+        },
+        {
+          activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+          matches: '[id="com.ximalaya.ting.android:id/xm_ad_close_real"]',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12506253',
+        },
+      ],
+    },
+    {
+      key: 5,
+      name: '关闭热播推荐广告',
+      activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity',
+      rules: [
+        {
+          matches: '[text="热播推荐"] + ImageView + ImageView',
+          snapshotUrls: 'https://gkd-kit.gitee.io/import/12506270',
+          // 点击后出现 com.ximalaya.ting.android.main.dialog 弹窗
+        },
+      ],
+    },
+    {
+      key: 6,
+      name: '关闭更新弹窗',
+      rules: '[id="com.ximalaya.ting.android:id/host_tv_update_later"]',
+      snapshotUrls: 'https://gkd-kit.gitee.io/import/12506287',
     },
   ],
 });