From 9c1befc2ddc13a9d997ac84441f4f14dba500439 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Mon, 31 Jul 2023 20:15:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E7=BD=AE=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96;=E5=BE=AE=E7=9B=98?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yameida/worktool/service/WeworkOperationImpl.kt   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
index 93f681b..87ea07c 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -420,6 +420,11 @@ object WeworkOperationImpl {
     ): Boolean {
         val retryCount = maxRetryCount ?: 2
         val startTime = System.currentTimeMillis()
+        if (!PermissionUtils.isGrantedDrawOverlays()) {
+            LogUtils.e("未打开悬浮窗权限")
+            uploadCommandResult(message, ExecCallbackBean.ERROR_ILLEGAL_PERMISSION, "未打开悬浮窗权限", startTime, listOf(), titleList)
+            return false
+        }
         goHomeTab("工作台")
         val node = AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "微盘", exact = true)
         if (node != null) {
@@ -2642,7 +2647,11 @@ object WeworkOperationImpl {
      */
     fun setFriendTags(tagList: List<String>): Boolean {
         val tagList = if (tagList.size > 5) tagList.subList(0, 5) else tagList
-        val tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签").lastOrNull()
+        var tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签", exact = true).lastOrNull()
+        if (tvTag == null) {
+            AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "个人标签")
+            tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签", exact = true).lastOrNull()
+        }
         val oldTagList = arrayListOf<String>()
         val list = AccessibilityUtil.findBackNode(tvTag)
         if (list != null && list.childCount > 0) {