tanjianbin/lzwcai-terminal-worktool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 修复暂停跳转问题

Browse Source
This commit is contained in:
gallonyin
2023-01-05 10:01:43 +08:00
parent 96d73355f4
commit 8d66f14b21
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
View File

@@ -11,6 +11,7 @@ import org.yameida.worktool.model.ExecCallbackBean
import org.yameida.worktool.model.WeworkMessageBean import org.yameida.worktool.model.WeworkMessageBean
import org.yameida.worktool.model.WeworkMessageListBean import org.yameida.worktool.model.WeworkMessageListBean
import org.yameida.worktool.utils.AccessibilityUtil import org.yameida.worktool.utils.AccessibilityUtil
import org.yameida.worktool.utils.FloatWindowHelper
import org.yameida.worktool.utils.Views import org.yameida.worktool.utils.Views
import java.lang.Exception import java.lang.Exception
@@ -106,10 +107,13 @@ fun getRoot(ignoreCheck: Boolean): AccessibilityNodeInfo {
if (System.currentTimeMillis() % 30 == 0L) { if (System.currentTimeMillis() % 30 == 0L) {
error("当前不在企业微信: ${root.packageName}") error("当前不在企业微信: ${root.packageName}")
if (!root.packageName.contains("(worktool)|(settings)".toRegex())) { if (!root.packageName.contains("(worktool)|(settings)".toRegex())) {
ToastUtils.show("当前不在企业微信: ${root.packageName}\n尝试跳转到企业微信") if (!FloatWindowHelper.isPause) {
Utils.getApp().packageManager.getLaunchIntentForPackage(Constant.PACKAGE_NAMES)?.apply { ToastUtils.show("当前不在企业微信: ${root.packageName}\n尝试跳转到企业微信")
this.flags = Intent.FLAG_ACTIVITY_NEW_TASK Utils.getApp().packageManager.getLaunchIntentForPackage(Constant.PACKAGE_NAMES)
Utils.getApp().startActivity(this) ?.apply {
this.flags = Intent.FLAG_ACTIVITY_NEW_TASK
Utils.getApp().startActivity(this)
}
} }
} }
} }

2
app/src/main/java/org/yameida/worktool/utils/WebSocketManager.java
View File

@@ -148,7 +148,7 @@ public class WebSocketManager {
lastConnectedTime = System.currentTimeMillis(); lastConnectedTime = System.currentTimeMillis();
Runnable r = () -> { Runnable r = () -> {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 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))) { if (!connecting && (socket == null || !socket.send(HEARTBEAT))) {
//断开链接后关闭新消息接收 //断开链接后关闭新消息接收
WeworkController.INSTANCE.setEnableLoopRunning(false); WeworkController.INSTANCE.setEnableLoopRunning(false);