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

Merge branch 'master' of https://github.com/gallonyin/worktool into master

Browse Source
This commit is contained in:
gallonyin
2023-07-31 22:13:23 +08:00
parent 072ac6afa4 88bef6e456
commit 8a11b10196
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,6 +421,11 @@ object WeworkOperationImpl {
): Boolean { ): Boolean {
val retryCount = maxRetryCount ?: 2 val retryCount = maxRetryCount ?: 2
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
if (!PermissionUtils.isGrantedDrawOverlays()) {
LogUtils.e("未打开悬浮窗权限")
uploadCommandResult(message, ExecCallbackBean.ERROR_ILLEGAL_PERMISSION, "未打开悬浮窗权限", startTime, listOf(), titleList)
return false
}
goHomeTab("工作台") goHomeTab("工作台")
val node = AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "微盘", exact = true) val node = AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "微盘", exact = true)
if (node != null) { if (node != null) {
@@ -2643,7 +2648,11 @@ object WeworkOperationImpl {
*/ */
fun setFriendTags(tagList: List<String>): Boolean { fun setFriendTags(tagList: List<String>): Boolean {
val tagList = if (tagList.size > 5) tagList.subList(0, 5) else tagList val tagList = if (tagList.size > 5) tagList.subList(0, 5) else tagList
val tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签").lastOrNull() var tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签", exact = true).lastOrNull()
if (tvTag == null) {
AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "个人标签")
tvTag = AccessibilityUtil.findAllByText(getRoot(), "个人标签", exact = true).lastOrNull()
}
val oldTagList = arrayListOf<String>() val oldTagList = arrayListOf<String>()
val list = AccessibilityUtil.findBackNode(tvTag) val list = AccessibilityUtil.findBackNode(tvTag)
if (list != null && list.childCount > 0) { if (list != null && list.childCount > 0) {