From 47a529cac460c01fa2616bfad2e3b86ca60259da Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Wed, 29 Mar 2023 00:01:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BD=AC=E5=8F=91=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E8=BD=AC=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worktool/service/WeworkOperationImpl.kt   | 55 ++++++++++++++-----
 1 file changed, 40 insertions(+), 15 deletions(-)

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 a772487..21aed82 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -158,7 +158,7 @@ object WeworkOperationImpl {
     fun relayMessage(
         message: WeworkMessageBean,
         titleList: List<String>,
-        receivedName: String,
+        receivedName: String?,
         originalContent: String,
         textType: Int,
         nameList: List<String>,
@@ -167,21 +167,46 @@ object WeworkOperationImpl {
         val startTime = System.currentTimeMillis()
         for (title in titleList) {
             if (WeworkRoomUtil.intoRoom(title)) {
-                if (WeworkTextUtil.longClickMessageItem(
-                        //聊天消息列表 1ListView 0RecycleView xViewGroup
-                        AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView),
-                        textType,
-                        receivedName,
-                        originalContent,
-                        "转发"
-                    )
-                ) {
-                    LogUtils.d("开始转发")
-                    if (relaySelectTarget(nameList, extraText)) {
-                        LogUtils.d("$title: 转发成功")
+                if (!receivedName.isNullOrEmpty()) {
+                    if (WeworkTextUtil.longClickMessageItem(
+                            //聊天消息列表 1ListView 0RecycleView xViewGroup
+                            AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView),
+                            textType,
+                            receivedName,
+                            originalContent,
+                            "转发"
+                        )
+                    ) {
+                        LogUtils.d("开始转发")
+                        if (relaySelectTarget(nameList, extraText)) {
+                            LogUtils.d("$title: 转发成功")
+                        } else {
+                            LogUtils.e("$title: 转发失败")
+                            error("$title: 转发失败 $originalContent")
+                        }
                     } else {
-                        LogUtils.d("$title: 转发失败")
-                        error("$title: 转发失败 $originalContent")
+                        LogUtils.e("$title: 长按条目失败")
+                        error("$title: 长按条目失败 $originalContent")
+                    }
+                } else {
+                    if (WeworkTextUtil.longClickMyMessageItem(
+                            //聊天消息列表 1ListView 0RecycleView xViewGroup
+                            AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView),
+                            textType,
+                            originalContent,
+                            "转发"
+                        )
+                    ) {
+                        LogUtils.d("开始转发")
+                        if (relaySelectTarget(nameList, extraText)) {
+                            LogUtils.d("$title: 转发成功")
+                        } else {
+                            LogUtils.d("$title: 转发失败")
+                            error("$title: 转发失败 $originalContent")
+                        }
+                    } else {
+                        LogUtils.e("$title: 长按条目失败")
+                        error("$title: 长按条目失败 $originalContent")
                     }
                 }
             } else {