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
2022-12-07 17:01:26 +08:00
parent 57cbcfeb24
commit b4b5746f5c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt
View File

@@ -303,7 +303,6 @@ class ListenActivity : AppCompatActivity() {
this.flags = Intent.FLAG_ACTIVITY_NEW_TASK
startActivity(this)
}
com.hjq.toast.ToastUtils.show("机器人运行中 请勿人工操作手机~")
}, 5000)
}

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

@@ -379,7 +379,7 @@ object WeworkOperationImpl {
AccessibilityUtil.performClick(shareFileButton)
val shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true), "发送给同事")
AccessibilityUtil.performClick(shareToWorkButton)
if (relaySelectTarget(titleList, extraText)) {
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)
return true
@@ -578,7 +578,7 @@ object WeworkOperationImpl {
ShareUtil.share("${if (fileType.isBlank()) "*" else fileType}/*", newFile)
val shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true), "发送给同事")
AccessibilityUtil.performClick(shareToWorkButton)
if (relaySelectTarget(titleList, extraText)) {
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)
uploadCommandResult(message, ExecCallbackBean.SUCCESS, "", startTime)
@@ -626,7 +626,7 @@ object WeworkOperationImpl {
ShareUtil.share("${if (fileType.isBlank()) "*" else fileType}/*", newFile)
val shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true), "发送给同事")
AccessibilityUtil.performClick(shareToWorkButton)
if (relaySelectTarget(titleList, extraText)) {
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)
uploadCommandResult(message, ExecCallbackBean.SUCCESS, "", startTime)
@@ -1036,7 +1036,11 @@ object WeworkOperationImpl {
* selectList 昵称或群名列表
* extraText 转发是否附加一条文本
*/
private fun relaySelectTarget(selectList: List<String>, extraText: String? = null, needSend: Boolean = true): Boolean {
private fun relaySelectTarget(selectList: List<String>, extraText: String? = null, needSend: Boolean = true, timeout: Long = 5000): Boolean {
if (AccessibilityUtil.findOneByText(getRoot(), "选择联系人", "选择参与人", exact = true, timeout = timeout) == null) {
LogUtils.e("未找到选择联系人/选择参与人")
return false
}
//聊天消息列表 1ListView 0RecycleView xViewGroup
val list = AccessibilityUtil.findOneByClazz(getRoot(), Views.ListView)
if (list != null) {

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

@@ -146,7 +146,7 @@ public class WebSocketManager {
//断开链接后进入重连
reConnect();
}
ToastUtils.show("机器人运行中 请勿人工操作手机~");
// ToastUtils.show("机器人运行中 请勿人工操作手机~");
};
//每heartBeatRate秒发一次心跳包