chore: sync

dist/gkd.json

@@ -1,7 +1,7 @@
 {
   "id": 0,
   "name": "默认订阅",
-  "version": 7,
+  "version": 8,
   "author": "lisonge",
   "supportUrl": "https://github.com/gkd-kit/subscription",
   "apps": [
@@ -127,7 +127,10 @@
           "key": 0,
           "name": "百度地图-开屏广告",
           "activityIds": "com.baidu.baidumaps.MapsActivity",
-          "rules": "@TextView[text^=`跳过`] + TextView[text=`广告`]"
+          "rules": [
+            "@TextView[text^=`跳过`] + TextView[text=`广告`]",
+            "ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]"
+          ]
         }
       ]
     },
@@ -270,6 +273,7 @@
               ],
               "matches": "@LinearLayout > TextView[id=`com.byted.pangle:id/tt_item_tv`][text=`不感兴趣`]"
             },
+            "Button[text$=\"免广告\"] + Button[text=\"不感兴趣\"]",
             "Button[text$=`去广告`] - Button[text=`不感兴趣`]",
             "[id=`com.coolapk.market:id/close_view`]"
           ]
@@ -677,7 +681,7 @@
         {
           "key": 0,
           "name": "微博-开屏广告",
-          "activityIds": "com.sina.weibo.mobileads.view.a",
+          "activityIds": "com.sina.weibo.mobileads.view.",
           "rules": [
             "@RelativeLayout > TextView[text=`跳过`]"
           ]
@@ -687,6 +691,17 @@
           "name": "微博-评论区顶部-相关推荐",
           "activityIds": "com.sina.weibo.feed.DetailWeiboActivity",
           "rules": "ImageView[id=`com.sina.weibo:id/iv_ad_x`]"
+        },
+        {
+          "key": 2,
+          "name": "微博-关闭不感兴趣广告弹窗",
+          "activityIds": "com.sina.weibo.view.bottomsheet.dialog.",
+          "rules": [
+            [
+              "[text=\"为何会看到此广告\"]",
+              "[text=\"不感兴趣\"]"
+            ]
+          ]
         }
       ]
     },
@@ -831,6 +846,20 @@
           "rules": [
             "ImageView[id!=null][desc='关闭'][isClickable=true]"
           ]
+        },
+        {
+          "key": 2,
+          "name": "QQ-好友动态-广告卡片",
+          "rules": [
+            {
+              "activityIds": "com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog",
+              "matches": "[isClickable=true] > ImageView + TextView[text=\"关闭此条广告\"]"
+            },
+            {
+              "activityIds": "com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity",
+              "matches": "View[desc=\"广告\"] + ImageView[isClickable=true]"
+            }
+          ]
         }
       ]
     },
@@ -871,14 +900,20 @@
         {
           "key": 0,
           "name": "QQ音乐-开屏广告",
-          "activityIds": "com.tencent.qqmusic.activity.AppStarterActivity",
+          "activityIds": [
-          "rules": "TextView[text=`跳过`]"
+            "com.tencent.qqmusic.activity.AppStarterActivity",
+            "com.tencent.qqmusic.business.splash.thirdpartsplash.tme.union.SplashDialog"
+          ],
+          "rules": "TextView[text=`跳过`][clickable=true]"
         },
         {
           "key": 1,
           "name": "QQ音乐-推荐页-广告卡片",
           "activityIds": "com.tencent.qqmusic.activity.AppStarterActivity",
-          "rules": "@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView"
+          "rules": [
+            "@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView",
+            "TextView[text=\"广告 | 关闭\"][isClickable=true]"
+          ]
         }
       ]
     },
@@ -1121,7 +1156,7 @@
           "rules": [
             {
               "activityIds": "com.bilibili.lib.ui.menu",
-              "matches": "TextView[text='广告质量差'][id^='tv.danmaku.bili:id/reason']"
+              "matches": "TextView[text='广告质量差'||text='推广质量差'][id^='tv.danmaku.bili:id/reason']"
             }
           ]
         },

package.json

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

src/apps/com.baidu.BaiduMap.ts

@@ -7,7 +7,10 @@ export default <AppConfig>{
       key: 0,
       name: '百度地图-开屏广告',
       activityIds: 'com.baidu.baidumaps.MapsActivity',
-      rules: '@TextView[text^=`跳过`] + TextView[text=`广告`]',
+      rules: [
+        '@TextView[text^=`跳过`] + TextView[text=`广告`]',
+        `ImageView[isClickable=false] + TextView[text^='跳过'][isClickable=true]`, // 1689423368140
+      ],
     },
   ],
 };

src/apps/com.coolapk.market.ts

@@ -21,6 +21,7 @@ export default <AppConfig>{
           matches:
             '@LinearLayout > TextView[id=`com.byted.pangle:id/tt_item_tv`][text=`不感兴趣`]',
         },
+        `Button[text$="免广告"] + Button[text="不感兴趣"]`, // 1692148279610
         'Button[text$=`去广告`] - Button[text=`不感兴趣`]',
         '[id=`com.coolapk.market:id/close_view`]',
       ],

src/apps/com.sina.weibo.ts

@@ -6,7 +6,7 @@ export default <AppConfig>{
     {
       key: 0,
       name: '微博-开屏广告',
-      activityIds: 'com.sina.weibo.mobileads.view.a',
+      activityIds: 'com.sina.weibo.mobileads.view.',
       rules: ['@RelativeLayout > TextView[text=`跳过`]'],
     },
     {
@@ -15,5 +15,11 @@ export default <AppConfig>{
       activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
       rules: 'ImageView[id=`com.sina.weibo:id/iv_ad_x`]',
     },
+    {
+      key: 2,
+      name: `微博-关闭不感兴趣广告弹窗`,
+      activityIds: `com.sina.weibo.view.bottomsheet.dialog.`,
+      rules: [[`[text="为何会看到此广告"]`, `[text="不感兴趣"]`]], // 1688889362832
+    },
   ],
 };

src/apps/com.tencent.mobileqq.ts

@@ -17,5 +17,19 @@ export default <AppConfig>{
         `ImageView[id!=null][desc='关闭'][isClickable=true]`, // 1687669217838
       ],
     },
+    {
+      key: 2,
+      name: `QQ-好友动态-广告卡片`,
+      rules: [
+        {
+          activityIds: `com.tencent.qqlive.module.videoreport.inject.dialog.ReportDialog`,
+          matches: `[isClickable=true] > ImageView + TextView[text="关闭此条广告"]`, // 1689050230463
+        },
+        {
+          activityIds: `com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity`,
+          matches: `View[desc="广告"] + ImageView[isClickable=true]`, // 1689050226722
+        },
+      ],
+    },
   ],
 };

src/apps/com.tencent.qqmusic.ts

@@ -6,14 +6,20 @@ export default <AppConfig>{
     {
       key: 0,
       name: 'QQ音乐-开屏广告',
-      activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity',
+      activityIds: [
-      rules: 'TextView[text=`跳过`]',
+        'com.tencent.qqmusic.activity.AppStarterActivity',
+        'com.tencent.qqmusic.business.splash.thirdpartsplash.tme.union.SplashDialog',
+      ],
+      rules: 'TextView[text=`跳过`][clickable=true]',
     },
     {
       key: 1,
       name: 'QQ音乐-推荐页-广告卡片',
       activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity',
-      rules: `@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846
+      rules: [
+        `@LinearLayout[isClickable=true] > TextView[text='广告'] + ImageView`, // 1688045698846
+        `TextView[text="广告 | 关闭"][isClickable=true]`,
+      ],
     },
   ],
 };

src/apps/tv.danmaku.bili.ts

@@ -40,7 +40,7 @@ export default <AppConfig>{
         {
           activityIds: 'com.bilibili.lib.ui.menu',
           matches:
-            "TextView[text='广告质量差'][id^='tv.danmaku.bili:id/reason']",
+            "TextView[text='广告质量差'||text='推广质量差'][id^='tv.danmaku.bili:id/reason']", // 1691203420529
         },
       ],
     },