From 67824ac79fa93e5b8efd60baab6e7fb5a046ba3c Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Sun, 24 Dec 2023 19:57:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=8F=9C=E9=B8=9F):=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=89=E3=80=81=E8=AF=B7=E6=B1=82=E5=A5=BD=E8=AF=84=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=20(#3232)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 弹窗广告（优化规则）

* feat 请求好评弹窗
---
 src/apps/com.cainiao.wireless.ts | 45 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
index cbb76eae..cb4cfe7a 100644
--- a/src/apps/com.cainiao.wireless.ts
+++ b/src/apps/com.cainiao.wireless.ts
@@ -3,6 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.cainiao.wireless',
   name: '菜鸟',
+  deprecatedKeys: [3],
   groups: [
     {
       key: 0,
@@ -31,13 +32,28 @@ export default defineAppConfig({
     },
     {
       key: 1,
-      name: '包裹页面-弹窗广告',
-      quickFind: true,
-      activityIds: [
-        'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+      name: '弹窗广告',
+      rules: [
+        {
+          key: 0,
+          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/import/12914371',
+            'https://i.gkd.li/import/13692758',
+          ],
+        },
+        {
+          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',
+        },
       ],
-      rules: 'RelativeLayout > ImageView[desc="关闭"]',
-      snapshotUrls: ['https://i.gkd.li/import/12914371'],
     },
     {
       key: 2,
@@ -48,16 +64,6 @@ export default defineAppConfig({
       rules: 'View[desc="立即查看"] +2 ImageView[id=null]',
       snapshotUrls: ['https://i.gkd.li/import/12914450'],
     },
-    {
-      key: 3,
-      name: '寄包裹-弹窗广告',
-      enable: false,
-      activityIds: [
-        'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
-      ],
-      rules: 'View + Image + View[text.length>0]',
-      snapshotUrls: ['https://i.gkd.li/import/13042279'],
-    },
     {
       key: 4,
       name: '升级提示',
@@ -81,5 +87,12 @@ export default defineAppConfig({
       rules: '[id="com.cainiao.wireless:id/gg_dialog_base_close"]',
       snapshotUrls: ['https://i.gkd.li/import/13068573'],
     },
+    {
+      key: 6,
+      name: '请求好评弹窗',
+      activityIds: 'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+      rules: '@[text="取消"] + [text="好评"]',
+      snapshotUrls: 'https://i.gkd.li/import/13692761',
+    },
   ],
 });