From 54fc206cb0b28c97cc67bbca0cf4a34ca0f72c35 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Mon, 10 Jul 2023 18:15:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=AA=E9=80=89=E6=8B=A9=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E8=80=85=E4=B8=AD=E6=AD=A2;=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=BF=83=E8=B7=B3=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 +++++++++--
 .../org/yameida/worktool/utils/WebSocketManager.java  |  3 +++
 2 files changed, 12 insertions(+), 2 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 1da87d7..79b1548 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -695,7 +695,7 @@ object WeworkOperationImpl {
                     if (shareToWorkButton == null) {
                         LogUtils.e("未找到发送给同事: $objectName")
                         if (retryCount > 0) {
-                            return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1)
+                            return pushFile(message, titleList, objectName, fileUrl, fileBase64, fileType, extraText, retryCount - 1)
                         }
                         uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "未找到发送给同事: $objectName", startTime, listOf(), titleList)
                         return false
@@ -763,7 +763,7 @@ object WeworkOperationImpl {
                 if (shareToWorkButton == null) {
                     LogUtils.e("未找到发送给同事: $objectName")
                     if (retryCount > 0) {
-                        return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1)
+                        return pushFile(message, titleList, objectName, fileUrl, fileBase64, fileType, extraText, retryCount - 1)
                     }
                     uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "未找到发送给同事: $objectName", startTime, listOf(), titleList)
                     return false
@@ -1823,6 +1823,7 @@ object WeworkOperationImpl {
                 val multiButton: AccessibilityNodeInfo = textViewList[textViewList.size - 1]
                 AccessibilityUtil.performClick(multiButton)
                 AccessibilityUtil.performClick(searchButton)
+                var isSelect = false
                 for (select in selectList) {
                     val needTrim = select.contains(Constant.regTrimTitle)
                     val trimTitle = select.replace(Constant.regTrimTitle, "")
@@ -1850,6 +1851,7 @@ object WeworkOperationImpl {
                                 val imageView =
                                     AccessibilityUtil.findOneByClazz(item, Views.ImageView, root = false)
                                 AccessibilityUtil.performClick(imageView)
+                                isSelect = true
                                 break
                             }
                         }
@@ -1862,6 +1864,11 @@ object WeworkOperationImpl {
                     }
                     sleep(Constant.POP_WINDOW_INTERVAL)
                 }
+                if (!isSelect) {
+                    LogUtils.e("未选择接收者")
+                    error("未选择接收者")
+                    return false
+                }
                 val confirmButton =
                     AccessibilityUtil.findOneByTextRegex(getRoot(), "^确定(\\(.*?\\))?\$")
                 if (confirmButton != null) {
diff --git a/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java b/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
index 2d05a9f..74aa996 100644
--- a/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
+++ b/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
@@ -140,6 +140,7 @@ public class WebSocketManager {
         WebSocket s = new OkHttpClient().newWebSocket(new Request.Builder().url(url).build(), listener);
         if (s.send(WebSocketManager.HEARTBEAT)) {
             this.socket = s;
+            s.send("{\"td\":" + System.currentTimeMillis() + "}");
             return true;
         }
         return false;
@@ -157,6 +158,8 @@ public class WebSocketManager {
                 reConnect();
                 //重连后刷新连接时间
                 lastConnectedTime = System.currentTimeMillis();
+            } else {
+                socket.send("{\"td\":" + System.currentTimeMillis() + "}");
             }
             if (!Constant.INSTANCE.getEnableMediaProject()) {
                 if (System.currentTimeMillis() - lastConnectedTime > heartBeatRate * 3000 && !FloatWindowHelper.INSTANCE.isPause()) {