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-09-07 23:01:09 +08:00
parent 782aef4b03
commit 995758274e
1 changed files with 96 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,7 +442,10 @@ object WeworkOperationImpl {
AccessibilityUtil.performClick(imageViewList[1])
val shareFileButton = AccessibilityUtil.findOneByDesc(getRoot(), "以原文件分享", "用其他应用打开")
AccessibilityUtil.performClick(shareFileButton)
var shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事")
val tvFlag = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事", "选择联系人", "选择参与人")
val flagText = tvFlag?.text?.toString() ?: ""
if (flagText.contains("发送给同事")) {
var shareToWorkButton = tvFlag
sleep(Constant.POP_WINDOW_INTERVAL)
if (shareToWorkButton == null) {
LogUtils.e("未找到发送给同事: $objectName")
@@ -470,6 +473,14 @@ object WeworkOperationImpl {
}
currentTime = System.currentTimeMillis()
}
} else if (flagText !in arrayOf("选择联系人", "选择参与人")) {
LogUtils.e("未找到发送给同事: $objectName")
if (retryCount > 0) {
return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1)
}
uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "未找到发送给同事: $objectName", startTime, listOf(), titleList)
return false
}
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)
@@ -710,7 +721,10 @@ object WeworkOperationImpl {
newFile.writeBytes(body.bytes())
LogUtils.i("文件存储本地成功 $filePath")
ShareUtil.share("${if (fileType.isBlank()) "*" else fileType}/*", newFile)
var shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事")
val tvFlag = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事", "选择联系人", "选择参与人")
val flagText = tvFlag?.text?.toString() ?: ""
if (flagText.contains("发送给同事")) {
var shareToWorkButton = tvFlag
sleep(Constant.POP_WINDOW_INTERVAL)
if (shareToWorkButton == null) {
LogUtils.e("未找到发送给同事: $objectName")
@@ -738,6 +752,14 @@ object WeworkOperationImpl {
}
currentTime = System.currentTimeMillis()
}
} else if (flagText !in arrayOf("选择联系人", "选择参与人")) {
LogUtils.e("未找到发送给同事: $objectName")
if (retryCount > 0) {
return pushFile(message, titleList, objectName, fileUrl, fileBase64, fileType, extraText, retryCount - 1)
}
uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "未找到发送给同事: $objectName", startTime, listOf(), titleList)
return false
}
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)
@@ -780,7 +802,10 @@ object WeworkOperationImpl {
newFile.writeBytes(EncodeUtils.base64Decode(fileBase64))
LogUtils.i("文件存储本地成功 $filePath")
ShareUtil.share("${if (fileType.isBlank()) "*" else fileType}/*", newFile)
var shareToWorkButton = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事")
val tvFlag = AccessibilityUtil.findOneByText(getRoot(true, share = true), "发送给同事", "选择联系人", "选择参与人")
val flagText = tvFlag?.text?.toString() ?: ""
if (flagText.contains("发送给同事")) {
var shareToWorkButton = tvFlag
sleep(Constant.POP_WINDOW_INTERVAL)
if (shareToWorkButton == null) {
LogUtils.e("未找到发送给同事: $objectName")
@@ -808,6 +833,14 @@ object WeworkOperationImpl {
}
currentTime = System.currentTimeMillis()
}
} else if (flagText !in arrayOf("选择联系人", "选择参与人")) {
LogUtils.e("未找到发送给同事: $objectName")
if (retryCount > 0) {
return pushFile(message, titleList, objectName, fileUrl, fileBase64, fileType, extraText, retryCount - 1)
}
uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "未找到发送给同事: $objectName", startTime, listOf(), titleList)
return false
}
if (relaySelectTarget(titleList, extraText, timeout = 10000)) {
val stayButton = AccessibilityUtil.findOneByText(getRoot(), "留在企业微信")
AccessibilityUtil.performClick(stayButton)