From 043455192de11bb36832d0e2ded55dda37102d46 Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Thu, 8 Feb 2024 19:56:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(=E6=8B=9B=E5=95=86=E9=93=B6=E8=A1=8C)?=
 =?UTF-8?q?=20=E5=B1=80=E9=83=A8=E5=B9=BF=E5=91=8A-=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=82=AC=E6=B5=AE=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/cmb.pb.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/apps/cmb.pb.ts b/src/apps/cmb.pb.ts
index 33399dc3..fa8d5793 100644
--- a/src/apps/cmb.pb.ts
+++ b/src/apps/cmb.pb.ts
@@ -5,6 +5,14 @@ export default defineAppConfig({
   name: '招商银行',
   deprecatedKeys: [0],
   groups: [
+    {
+      key: 3,
+      name: '局部广告-首页活动悬浮广告',
+      quickFind: true,
+      activityIds: 'cmb.pb.app.mainframe.container.PBMainActivity',
+      rules: '[vid="float_window"] > [vid="ivCancle"][clickable=true]',
+      snapshotUrls: 'https://i.gkd.li/import/14208669',
+    },
     {
       key: 10,
       name: '全屏广告-广告弹窗',

From 229090b2f15b1b217884c84ab518e410d48b57ab Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:05:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20=E5=85=A8=E5=B1=8F=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?-=E5=B9=BF=E5=91=8A=E5=BC=B9=E7=AA=97=EF=BC=88=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E8=A7=84=E5=88=99=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/cmb.pb.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/apps/cmb.pb.ts b/src/apps/cmb.pb.ts
index fa8d5793..bbaaaa7c 100644
--- a/src/apps/cmb.pb.ts
+++ b/src/apps/cmb.pb.ts
@@ -16,10 +16,21 @@ export default defineAppConfig({
     {
       key: 10,
       name: '全屏广告-广告弹窗',
-      activityIds:
-        'cmb.pb.app.h5container.webviewcontainer.PBWebContainerActivity',
-      rules: '[id="cover-img"] + [text="关闭推荐"]',
-      snapshotUrls: 'https://i.gkd.li/import/12706022',
+      rules: [
+        {
+          key: 0,
+          activityIds:
+            'cmb.pb.app.h5container.webviewcontainer.PBWebContainerActivity',
+          matches: '[id="cover-img"] + [text="关闭推荐"]',
+          snapshotUrls: 'https://i.gkd.li/import/12706022',
+        },
+        {
+          key: 1,
+          activityIds: 'com.pb.marketing.PopupWindowActivity',
+          matches: '[desc^="活动图片"] + [desc="关闭"]',
+          snapshotUrls: 'https://i.gkd.li/import/14208693',
+        },
+      ],
     },
     {
       key: 11,

From abaee39eb84abfc5d57dc5836b68889b147a8efd Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:05:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E5=AE=9A=E4=BD=8D=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?-=E8=AF=B7=E6=B1=82=E5=AE=9A=E4=BD=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/cmb.pb.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/apps/cmb.pb.ts b/src/apps/cmb.pb.ts
index bbaaaa7c..357f01e3 100644
--- a/src/apps/cmb.pb.ts
+++ b/src/apps/cmb.pb.ts
@@ -36,16 +36,14 @@ export default defineAppConfig({
       key: 11,
       name: '定位提示-请求定位权限弹窗',
       quickFind: true,
-      activityIds: [
-        'cmb.pb.app.h5container.webviewcontainer.PBWebContainerActivity',
-        'cmb.pb.app.search.PBSearchWebActivity',
-      ],
-      rules:
-        '@[id="cmb.pb:id/ivDelete"][desc="关闭"] - FrameLayout > [id="cmb.pb:id/tvDescription"][text*="获取您的位置"]',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '@[desc="关闭"] - * > [text*="开启"][text*="定位"]',
       snapshotUrls: [
         'https://i.gkd.li/import/12706029',
         'https://i.gkd.li/import/13248893',
         'https://i.gkd.li/import/13897345',
+        'https://i.gkd.li/import/14208717',
       ],
     },
   ],