From 8d66f14b21799e2f02bee5568828ac51aac2bfb5 Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Thu, 5 Jan 2023 10:01:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E6=9A=82=E5=81=9C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/yameida/worktool/service/GlobalMethod.kt     | 12 ++++++++----
 .../org/yameida/worktool/utils/WebSocketManager.java |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
index e16c521..8c321b6 100644
--- a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
+++ b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
@@ -11,6 +11,7 @@ import org.yameida.worktool.model.ExecCallbackBean
 import org.yameida.worktool.model.WeworkMessageBean
 import org.yameida.worktool.model.WeworkMessageListBean
 import org.yameida.worktool.utils.AccessibilityUtil
+import org.yameida.worktool.utils.FloatWindowHelper
 import org.yameida.worktool.utils.Views
 import java.lang.Exception
 
@@ -106,10 +107,13 @@ fun getRoot(ignoreCheck: Boolean): AccessibilityNodeInfo {
                 if (System.currentTimeMillis() % 30 == 0L) {
                     error("当前不在企业微信: ${root.packageName}")
                     if (!root.packageName.contains("(worktool)|(settings)".toRegex())) {
-                        ToastUtils.show("当前不在企业微信: ${root.packageName}\n尝试跳转到企业微信")
-                        Utils.getApp().packageManager.getLaunchIntentForPackage(Constant.PACKAGE_NAMES)?.apply {
-                            this.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                            Utils.getApp().startActivity(this)
+                        if (!FloatWindowHelper.isPause) {
+                            ToastUtils.show("当前不在企业微信: ${root.packageName}\n尝试跳转到企业微信")
+                            Utils.getApp().packageManager.getLaunchIntentForPackage(Constant.PACKAGE_NAMES)
+                                ?.apply {
+                                    this.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                                    Utils.getApp().startActivity(this)
+                                }
                         }
                     }
                 }
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 8768793..2f43fe0 100644
--- a/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
+++ b/app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
@@ -148,7 +148,7 @@ public class WebSocketManager {
         lastConnectedTime = System.currentTimeMillis();
         Runnable r = () -> {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
-            Log.e(url, "心跳检测" + df.format(new Date()));// new Date()为获取当前系统时间
+            Log.d(url, "心跳检测" + df.format(new Date()));// new Date()为获取当前系统时间
             if (!connecting && (socket == null || !socket.send(HEARTBEAT))) {
                 //断开链接后关闭新消息接收
                 WeworkController.INSTANCE.setEnableLoopRunning(false);