feat(闲鱼): 功能类-删除首页[关注上新/俱乐部/闲鱼精选] 补充规则#08)

.gitattributes

@@ -0,0 +1,25 @@
+# .github/ISSUE_TEMPLATE
+.github/ISSUE_TEMPLATE/bug_report.yml merge=ours
+.github/ISSUE_TEMPLATE/config.yml merge=ours
+.github/ISSUE_TEMPLATE/feature_request.yml merge=ours
+
+# .github/workflows
+.github/workflows/build_release.yml merge=ours
+.github/workflows/check_fix_push.yml merge=ours
+.github/workflows/pull_request_check.yml merge=ours
+
+# dist
+dist/CHANGELOG.md merge=ours
+dist/README.md merge=ours
+
+# scripts
+scripts/check.ts merge=ours
+
+# ts
+src/apps/com.taobao.idlefish.ts merge=ours
+src/apps/com.tencent.mobileqq.ts merge=ours
+src/apps/com.tencent.qqlive.ts merge=ours
+
+package.json merge=ours
+README.md merge=ours
+Template.md merge=ours

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,40 +1,36 @@
 name: 报告 Bug
-description: 报告 失效/误触 规则Bug
+title: "[Bug] "
+description: 报告 误触/问题 规则
 body:
   - type: markdown
     attributes:
       value: |
-        请按照此模版填写 BUG 界面的快照
-  - type: checkboxes
-    id: checkboxes
-    attributes:
-      label: 一些验证
-      description: 在提交问题之前，请确保您完成以下操作
-      options:
-        - label: 搜索检查是否已经存在请求相同功能的问题/讨论，以避免重复创建issue
-          required: true
-        - label: |
-            检查这个问题是否属于 [本项目维护的规则](https://github.com/MengNianxiaoyao/gkd-subscription) 导致的
-          required: true
-        - label: 我确认知晓并同意维护者直接关闭不符合规范的issue
-          required: true
-        - label: 我确保提供下列BUG描述及其复现步骤, 否则我同意维护者直接关闭issue
-          required: true
-        - label: 我确保提供 误触/不执行规则 的界面的快照, 否则我同意维护者直接关闭issue
-          required: true
+        ## 在提交问题之前，请确保您完成以下操作
+        1. 我确保 **提供 误触/出现问题 界面的快照（不要提供截图，截图没有任何作用），并说明是哪一条规则 误触/出现问题**
+        2. 我确保使用的是 [最新版订阅](https://github.com/mrlctate/gkd-mrlc/releases/latest) 和 [最新版GKD](https://github.com/gkd-kit/gkd/releases/latest)
+        3. 检查这个问题是否属于 [本项目维护的规则](https://github.com/mrlctate/gkd-mrlc) 导致的
+        4. 如果你的issue被受理，受理者提出的问题、要求，应在3日内予以回复，否则会被关闭
+
+        #### 检查问题是否属于以下几种之一，如果属于请说明是哪一种（误触问题可忽略这条）
+        1. 规则不生效，但是截取快照时生效/回到桌面（不杀后台）再进入软件后生效
+        2. 规则触发了（有点击提示），但实际并不能生效（没有达到预期行为）
   - type: textarea
-    id: feature-description
+    id: bug-1
     attributes:
       label: |
-        请输入 误触/不执行规则 的界面的快照, BUG描述及其复现步骤(视频/截图)或者生成的快照链接, 也可在后面补充其它信息
-        请注意: 
-        1. 不提供快照或者仅提供截图的 issue 将被自动关闭
-        2. 如果你的issue被受理，受理者提出的问题、要求，应在3日内予以回复，否则会被关闭
+        请提供 误触界面/出现问题界面 的快照，也可补充说明
       description: |
-        快照是一个 zip 文件, 快照链接是类似 "https://i.gkd.li/i/XXXXXXXX" 的文本, 按照如下方式可获得快照信息
+        快照是一个 zip 文件，快照链接是类似 "https://i.gkd.li/i/XXXXXXXX" 的文本，按照如下方式可获得快照信息
 
-        按照下面的截图示例来获取界面快照, 上传文件或者生成链接并粘贴到下面的输入框\
-        ![img](https://user-images.githubusercontent.com/45487685/270372181-9e05a475-6664-4e1b-adc7-1e3973fff01f.png)\
+        按照下面的截图示例来获取界面快照，上传文件或者生成链接并粘贴到下面的输入框\
+        ![img](https://user-images.githubusercontent.com/45487685/270372181-9e05a475-6664-4e1b-adc7-1e3973fff01f.png)
         此外需提供 [主页-点击记录] 的截图\
     validations:
       required: true
+  - type: textarea
+    id: bug-2
+    attributes:
+      label: |
+        请说明是哪一条规则 误触/出现问题（文字/触发记录界面截图）
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -15,7 +15,7 @@ body:
         快照是一个 zip 文件, 快照链接是类似 https://i.gkd.li/i/13474517 的文本, 按照如下方式可获得快照信息
 
         按照此教程 [CONTRIBUTING.md](https://github.com/gkd-kit/subscription/blob/main/CONTRIBUTING.md) 或者下面的截图示例 来给界面打快照, 上传文件或者生成链接并粘贴到下面的输入框\
-        ![img](https://user-images.githubusercontent.com/45487685/270372181-9e05a475-6664-4e1b-adc7-1e3973fff01f.png)\
+        ![img](https://user-images.githubusercontent.com/45487685/270372181-9e05a475-6664-4e1b-adc7-1e3973fff01f.png)
         如果是需要多个点击如 [点击关闭按钮->出现关闭弹窗->点击关闭原因] 这种类型, 则需要填写每个点击界面的快照
     validations:
       required: true

.github/workflows/pull_request_check.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   check:
-    if: github.repository == 'mrlc/gkd-mrlc' && github.event.pull_request.user.login != 'renovate[bot]'
+    if: github.repository == 'mrlctate/gkd-mrlc' && github.event.pull_request.user.login != 'renovate[bot]'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

src/apps/com.taobao.idlefish.ts

@@ -53,12 +53,12 @@ export default defineGkdApp({
     {
       key: 5,
       name: '分段广告-搜索结果页广告',
+      activityIds:
+        'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity',
       rules: [
         {
           key: 0,
-          activityIds:
-            'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity',
-          matches: '@[clickable=true] > [desc$="广告"]',
+          matches: '@View[clickable=true] > ImageView[index=2][desc$="广告"]',
           excludeMatches: '@[clickable=true] > [desc^="反馈成功"]',
           action: 'longClick',
           snapshotUrls: [
@@ -67,12 +67,10 @@ export default defineGkdApp({
           ],
         },
         {
+          preKeys: [0],
           key: 1,
-          preKeys: 0,
-          activityIds:
-            'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity',
           matches:
-            '[desc^="不喜欢该商品"] > ImageView[index=1][visibleToUser=true]',
+            'View[desc^="不喜欢该商品"] > ImageView[index=1][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/14723632',
         },
       ],
@@ -93,73 +91,52 @@ export default defineGkdApp({
     },
     {
       key: 7,
-      name: '功能类-闲鱼币',
-      desc: '领取奖励-扱骰子',
+      name: '功能类-领取奖励',
       activityIds: '.webview.WebHybridActivity',
       rules: [
         {
           key: 1,
-          name: '点击x[关闭]-弹窗',
-          matches: 'View[childCount=3] > Image[index=2][clickable=true]',
-          snapshotUrls: 'https://i.gkd.li/i/17606064',
-        },
-        {
-          key: 2,
-          actionDelay: 3000,
-          name: '点击[扱骰子寻宝]',
-          matches: '@View[id="mapDiceBtn"] > View[text.length>1]',
-          snapshotUrls: 'https://i.gkd.li/i/17606060',
-        },
-        {
-          key: 3,
-          actionDelay: 1000,
+          actionDelay: 1200,
           name: '点击[赚骰子]-有领取奖励',
           matches:
             'View[text="领"] <2 @View[index=1] +3 View > View[text="赚"]',
           snapshotUrls: 'https://i.gkd.li/i/17634886',
         },
         {
-          key: 4,
+          key: 2,
           actionMaximum: 1,
           name: '签到',
           matches: 'View[text="签到"][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/17606057',
         },
         {
-          key: 5,
-          actionDelay: 200,
+          key: 3,
+          actionDelay: 1000,
           name: '领取任务',
-          matches: 'View[index=9 || index=5][text="领取奖励"]',
+          matches: '[id="taskWrap"] >3 [text="领取奖励"]',
           snapshotUrls: [
             'https://i.gkd.li/i/17606051',
             'https://i.gkd.li/i/17606057',
           ],
         },
         {
-          preKeys: [5],
-          key: 6,
+          preKeys: [3],
+          key: 4,
           name: '点击x[关闭底部弹窗]',
           matches:
-            'View[id="taskWrap"] > @View[index=1] +3 View[index=4] >2 View[index=9 || index=5][text!="领取奖励"]',
+            'View[id="taskWrap"] > @View[index=1] +3 View >2 View[text!="领取奖励"]',
           snapshotUrls: 'https://i.gkd.li/i/17606054',
         },
-        {
-          key: 7,
-          name: '点击[全部收下]',
-          matches: 'View[text^="全部收下"]',
-          snapshotUrls: 'https://i.gkd.li/i/17606050',
-        },
       ],
     },
     {
       key: 8,
-      name: '功能类-点击背包使用道具',
-      desc: '使用道具',
+      name: '功能类-背包使用道具',
       activityIds: '.webview.WebHybridActivity',
       rules: [
         {
           key: 1,
-          actionDelay: 2000,
+          actionDelay: 3000,
           name: '点击[背包]',
           matches:
             'View[childCount=5] > View[index=1][childCount=1] +3 View > View[text="赚"] <2 View - View > Image',
@@ -171,13 +148,66 @@ export default defineGkdApp({
         {
           preKeys: [1],
           key: 2,
-          actionDelay: 200,
+          actionDelay: 300,
           name: '使用[道具]',
           matches:
-            'View[index=2] >3 View[index=1 || index=0] > View[index=1][text!="加点卡"] + [text="使用"]',
+            'View[clickable=true] >4 View[index=1][text!="加点卡"] + [text="使用"]',
           snapshotUrls: 'https://i.gkd.li/i/17606047',
         },
       ],
     },
+    {
+      key: 9,
+      name: '功能类-扱骰子',
+      activityIds: '.webview.WebHybridActivity',
+      rules: [
+        {
+          key: 1,
+          name: '点击x[关闭]-弹窗',
+          matches:
+            'View[childCount=3][clickable=true] > Image + View + Image[clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/17606064',
+        },
+        {
+          key: 2,
+          actionDelay: 3000,
+          name: '点击[扱骰子]',
+          matches: '@View[id="mapDiceBtn"] > View[text.length>1]',
+          snapshotUrls: 'https://i.gkd.li/i/17606060',
+        },
+        {
+          key: 3,
+          name: '点击[全部收下]',
+          matches: 'View[text^="全部收下"]',
+          snapshotUrls: 'https://i.gkd.li/i/17606050',
+        },
+      ],
+    },
+    {
+      key: 10,
+      name: '功能类-删除首页[关注上新/俱乐部/闲鱼精选]',
+      activityIds: '.maincontainer.activity.MainActivity',
+      rules: [
+        {
+          key: 0,
+          matches:
+            'ScrollView > @* > [desc="关注上新" || desc$="俱乐部" || desc="闲鱼精选"]',
+          action: 'longClick',
+          snapshotUrls: 'https://i.gkd.li/i/17690274',
+          exampleUrls: 'https://e.gkd.li/da3b020c-b649-434f-a984-35b9e025023b',
+        },
+        {
+          key: 1,
+          matches: '[vid="id_pager"] >9 [desc="删除"]',
+          snapshotUrls: 'https://i.gkd.li/i/17690302',
+        },
+        {
+          preKeys: [1],
+          key: 2,
+          matches: '[desc^="确认删除"] > [desc="取消"] + [desc="确定"]',
+          snapshotUrls: 'https://i.gkd.li/i/17690308',
+        },
+      ],
+    },
   ],
 });

src/apps/com.tencent.mobileqq.ts

@@ -726,19 +726,20 @@ export default defineGkdApp({
     },
     {
       key: 26,
-      name: '功能类-QQ自动进入打卡页立即打卡',
+      name: '功能类-QQ打卡',
       desc: '点击打卡-进入-立即打卡',
       activityIds: ['.activity.SplashActivity', '.activity.QQBrowserActivity'],
       rules: [
         {
           key: 1,
-          actionDelay: 600,
+          actionDelay: 500,
           name: '点击[打卡]',
           matches: '@LinearLayout[clickable=true] > TextView[text^="打卡"]',
           snapshotUrls: 'https://i.gkd.li/i/17566121',
         },
         {
           key: 2,
+          actionDelay: 100,
           name: '点击[立即打卡]',
           matches: '[text="立即打卡"][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/17552369',
@@ -748,7 +749,6 @@ export default defineGkdApp({
           actionDelay: 300,
           name: '点击[返回]',
           matches: 'TextView[desc="返回"][clickable=true]',
-          // 'Button[text="分享"] <<n FrameLayout + RelativeLayout >3 TextView[desc="返回"]',
           snapshotUrls: 'https://i.gkd.li/i/17568038',
         },
       ],