From 795d86005e6fada86057eacddfe95b10c4920b18 Mon Sep 17 00:00:00 2001
From: AIsouler <zy43220@gmail.com>
Date: Sun, 12 May 2024 20:11:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原定位提示规则移动到权限提示
---
 src/appDeprecatedKeys.ts                      |  5 ++++
 src/apps/cmb.pb.ts                            |  2 +-
 src/apps/cn.samsclub.app.ts                   |  2 +-
 src/apps/com.android.bankabc.ts               |  2 +-
 src/apps/com.baidu.BaiduMap.ts                |  2 +-
 src/apps/com.baseus.intelligent.ts            |  2 +-
 .../com.cmbchina.ccd.pluto.cmbActivity.ts     |  2 +-
 src/apps/com.cmi.jegotrip.ts                  |  2 +-
 src/apps/com.dep.biguo.ts                     |  2 +-
 src/apps/com.duokan.phone.remotecontroller.ts |  2 +-
 src/apps/com.eg.android.AlipayGphone.ts       |  2 +-
 src/apps/com.hihonor.phoneservice.ts          |  2 +-
 src/apps/com.ifeng.news2.ts                   |  2 +-
 src/apps/com.jd.pingou.ts                     |  2 +-
 src/apps/com.jingyao.easybike.ts              |  2 +-
 src/apps/com.maxhom.weibu.ts                  |  2 +-
 src/apps/com.sankuai.meituan.ts               |  2 +-
 src/apps/com.sina.weibo.ts                    |  2 +-
 src/apps/com.ss.android.ugc.aweme.mobile.ts   |  2 +-
 src/apps/com.unionpay.ts                      | 23 ++++++++-----------
 src/apps/com.woaika.kashen.ts                 |  2 +-
 src/apps/me.ele.ts                            |  4 ++--
 src/categories.ts                             | 17 +++++++-------
 23 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
index 2df09902..2962201f 100644
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -529,4 +529,9 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: 'AH视频',
     deprecatedKeys: [3, 5, 6],
   },
+  {
+    id: 'com.unionpay',
+    name: '云闪付',
+    deprecatedKeys: [11],
+  },
 ];
diff --git a/src/apps/cmb.pb.ts b/src/apps/cmb.pb.ts
index fc376f60..d7aaa604 100644
--- a/src/apps/cmb.pb.ts
+++ b/src/apps/cmb.pb.ts
@@ -33,7 +33,7 @@ export default defineGkdApp({
     },
     {
       key: 11,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/cn.samsclub.app.ts b/src/apps/cn.samsclub.app.ts
index c446df63..2ef00dd9 100644
--- a/src/apps/cn.samsclub.app.ts
+++ b/src/apps/cn.samsclub.app.ts
@@ -21,7 +21,7 @@ export default defineGkdApp({
     },
     {
       key: 1,
-      name: '定位提示-关闭「系统位置服务未打开」通知条',
+      name: '权限提示-定位权限',
       actionMaximum: 1,
       resetMatch: 'app',
       activityIds: 'cn.samsclub.app.ui.MainActivity',
diff --git a/src/apps/com.android.bankabc.ts b/src/apps/com.android.bankabc.ts
index 171b5fd6..42f79b0d 100644
--- a/src/apps/com.android.bankabc.ts
+++ b/src/apps/com.android.bankabc.ts
@@ -38,7 +38,7 @@ export default defineGkdApp({
     },
     {
       key: 3,
-      name: '定位提示',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.baidu.BaiduMap.ts b/src/apps/com.baidu.BaiduMap.ts
index 4478ff76..5b99b15b 100644
--- a/src/apps/com.baidu.BaiduMap.ts
+++ b/src/apps/com.baidu.BaiduMap.ts
@@ -46,7 +46,7 @@ export default defineGkdApp({
     },
     {
       key: 5,
-      name: '定位提示-请求定位弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.baseus.intelligent.ts b/src/apps/com.baseus.intelligent.ts
index 8a835e38..6eb8432a 100644
--- a/src/apps/com.baseus.intelligent.ts
+++ b/src/apps/com.baseus.intelligent.ts
@@ -6,7 +6,7 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '定位提示-定位请求',
+      name: '权限提示-定位请求',
       desc: '点击取消-点击取消',
       quickFind: true,
       actionMaximum: 1,
diff --git a/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts b/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts
index f0e170fb..9d5465d6 100644
--- a/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts
+++ b/src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts
@@ -92,7 +92,7 @@ export default defineGkdApp({
     },
     {
       key: 5,
-      name: '定位提示-请求开启定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.cmi.jegotrip.ts b/src/apps/com.cmi.jegotrip.ts
index c2d31706..16591806 100644
--- a/src/apps/com.cmi.jegotrip.ts
+++ b/src/apps/com.cmi.jegotrip.ts
@@ -19,7 +19,7 @@ export default defineGkdApp({
     },
     {
       key: 3,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
diff --git a/src/apps/com.dep.biguo.ts b/src/apps/com.dep.biguo.ts
index 1f4dd8fb..9b7ba078 100644
--- a/src/apps/com.dep.biguo.ts
+++ b/src/apps/com.dep.biguo.ts
@@ -23,7 +23,7 @@ export default defineGkdApp({
     },
     {
       key: 10,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       actionMaximum: 1,
       resetMatch: 'app',
       activityIds: 'com.dep.biguo.mvp.ui.activity.MainActivity',
diff --git a/src/apps/com.duokan.phone.remotecontroller.ts b/src/apps/com.duokan.phone.remotecontroller.ts
index 3eef025a..adacb6a9 100644
--- a/src/apps/com.duokan.phone.remotecontroller.ts
+++ b/src/apps/com.duokan.phone.remotecontroller.ts
@@ -14,7 +14,7 @@ export default defineGkdApp({
     },
     {
       key: 4,
-      name: '定位提示',
+      name: '权限提示-定位权限',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts
index a18f25f9..dd2d8025 100644
--- a/src/apps/com.eg.android.AlipayGphone.ts
+++ b/src/apps/com.eg.android.AlipayGphone.ts
@@ -48,7 +48,7 @@ export default defineGkdApp({
     },
     {
       key: 1,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.hihonor.phoneservice.ts b/src/apps/com.hihonor.phoneservice.ts
index 862eb756..7c452ad6 100644
--- a/src/apps/com.hihonor.phoneservice.ts
+++ b/src/apps/com.hihonor.phoneservice.ts
@@ -6,7 +6,7 @@ export default defineGkdApp({
   groups: [
     {
       key: 10,
-      name: '定位提示-请求位置权限提示信息',
+      name: '权限提示-定位权限',
       actionMaximum: 1,
       resetMatch: 'app',
       activityIds: 'com.hihonor.phoneservice.main.MainActivity',
diff --git a/src/apps/com.ifeng.news2.ts b/src/apps/com.ifeng.news2.ts
index 483e52d9..daa6b726 100644
--- a/src/apps/com.ifeng.news2.ts
+++ b/src/apps/com.ifeng.news2.ts
@@ -50,7 +50,7 @@ export default defineGkdApp({
     },
     {
       key: 10,
-      name: '定位提示-请求位置权限弹窗',
+      name: '权限提示-定位权限',
       desc: '自动点击取消',
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.jd.pingou.ts b/src/apps/com.jd.pingou.ts
index c7a07679..67a7f3c8 100644
--- a/src/apps/com.jd.pingou.ts
+++ b/src/apps/com.jd.pingou.ts
@@ -6,7 +6,7 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '定位提示-底部申请定位浮窗',
+      name: '权限提示-定位权限',
       actionMaximum: 1,
       resetMatch: 'app',
       activityIds: 'com.jd.jdlite.MainFrameActivity',
diff --git a/src/apps/com.jingyao.easybike.ts b/src/apps/com.jingyao.easybike.ts
index 8c045955..6294c72d 100644
--- a/src/apps/com.jingyao.easybike.ts
+++ b/src/apps/com.jingyao.easybike.ts
@@ -20,7 +20,7 @@ export default defineGkdApp({
     },
     {
       key: 9,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.maxhom.weibu.ts b/src/apps/com.maxhom.weibu.ts
index 3e63243a..7a6f3154 100644
--- a/src/apps/com.maxhom.weibu.ts
+++ b/src/apps/com.maxhom.weibu.ts
@@ -64,7 +64,7 @@ export default defineGkdApp({
     },
     {
       key: 5,
-      name: '定位提示-漂流瓶-定位弹窗',
+      name: '权限提示-定位权限',
       desc: '自动点击取消',
       quickFind: true,
       actionMaximum: 1,
diff --git a/src/apps/com.sankuai.meituan.ts b/src/apps/com.sankuai.meituan.ts
index 54f4d8a8..c0465727 100644
--- a/src/apps/com.sankuai.meituan.ts
+++ b/src/apps/com.sankuai.meituan.ts
@@ -119,7 +119,7 @@ export default defineGkdApp({
     },
     {
       key: 7,
-      name: '定位提示',
+      name: '权限提示-定位权限',
       desc: '首页/外卖界面-"打开位置开关弹窗"-点击右侧x关闭',
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.sina.weibo.ts b/src/apps/com.sina.weibo.ts
index 1f83362f..a8cdf3ab 100644
--- a/src/apps/com.sina.weibo.ts
+++ b/src/apps/com.sina.weibo.ts
@@ -218,7 +218,7 @@ export default defineGkdApp({
     },
     {
       key: 14,
-      name: '定位提示-请求定位权限弹窗',
+      name: '权限提示-定位权限',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/com.ss.android.ugc.aweme.mobile.ts b/src/apps/com.ss.android.ugc.aweme.mobile.ts
index 07e2bd70..093537a9 100644
--- a/src/apps/com.ss.android.ugc.aweme.mobile.ts
+++ b/src/apps/com.ss.android.ugc.aweme.mobile.ts
@@ -33,7 +33,7 @@ export default defineGkdApp({
     },
     {
       key: 3,
-      name: '定位提示-请求位置权限弹窗',
+      name: '权限提示-定位权限',
       desc: '点击[以后再说]',
       matchTime: 10000,
       actionMaximum: 1,
diff --git a/src/apps/com.unionpay.ts b/src/apps/com.unionpay.ts
index acddb53a..c6c02837 100644
--- a/src/apps/com.unionpay.ts
+++ b/src/apps/com.unionpay.ts
@@ -60,25 +60,20 @@ export default defineGkdApp({
     },
     {
       key: 10,
-      name: '定位提示-定位权限悬浮弹窗',
+      name: '权限提示-定位权限',
+      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      quickFind: true,
-      activityIds: 'com.unionpay.activity.UPActivityMain',
-      rules: '[id="com.unionpay:id/view_locate_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13634882',
-    },
-    {
-      key: 11,
-      name: '定位提示-访问位置请求弹窗',
-      desc: '自动点击"不允许"',
-      quickFind: true,
-      actionMaximum: 1,
-      resetMatch: 'app',
       rules: [
         {
-          matches: '[text*="访问您的位置信息"] < * +n * > [text="不允许"]',
+          key: 0,
+          matches: '[id="com.unionpay:id/view_locate_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13634882',
+        },
+        {
+          key: 1,
+          matches: ['[text*="访问您的位置信息"]', '[text="不允许"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/12695773',
             'https://i.gkd.li/i/14209001',
diff --git a/src/apps/com.woaika.kashen.ts b/src/apps/com.woaika.kashen.ts
index 199bcdf5..b2a60c8f 100644
--- a/src/apps/com.woaika.kashen.ts
+++ b/src/apps/com.woaika.kashen.ts
@@ -6,7 +6,7 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '定位提示',
+      name: '权限提示-定位权限',
       desc: '点击"暂不"',
       quickFind: true,
       matchTime: 10000,
diff --git a/src/apps/me.ele.ts b/src/apps/me.ele.ts
index 97866415..042d637a 100644
--- a/src/apps/me.ele.ts
+++ b/src/apps/me.ele.ts
@@ -136,8 +136,8 @@ export default defineGkdApp({
     },
     {
       key: 8,
-      name: '定位提示',
-      desc: '自动点击X',
+      name: '权限提示-定位权限',
+      desc: '点击关闭',
       quickFind: true,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/categories.ts b/src/categories.ts
index edb3b920..34b36ca3 100644
--- a/src/categories.ts
+++ b/src/categories.ts
@@ -20,39 +20,38 @@ export default defineGkdCategories([
   {
     key: 4,
     name: '通知提示',
+    // 软件用于告知用户信息的弹窗
+    // 具体体现为公告弹窗一类
   },
   {
     key: 5,
-    name: '定位提示',
+    name: '权限提示',
+    // 各种权限请求
   },
   {
     key: 6,
-    name: '权限提示',
-  },
-  {
-    key: 7,
     name: '局部广告',
     // 不影响使用的广告, 所有的广告卡片及悬浮广告按钮
   },
   {
-    key: 8,
+    key: 7,
     name: '全屏广告',
     // 不关闭广告就无法进行其它操作的广告弹窗, 它阻碍用户操作
     // 一般是刚进入APP时显示的全屏弹窗
   },
   {
-    key: 9,
+    key: 8,
     name: '分段广告',
     // 如微信朋友圈广告/酷安帖子广告/贴吧帖子广告
     // 需要分阶段多步操作才能关闭, 会造成屏幕略微闪烁, 稍微影响用户体验
   },
   {
-    key: 10,
+    key: 9,
     name: '功能类',
     // 非广告, 点击某些功能按钮
   },
   {
-    key: 11,
+    key: 10,
     name: '其他', // 分类不明确
   },
 ]);