From ddf389297beca10d140753dbe3a9dc6b42f386ea Mon Sep 17 00:00:00 2001 From: gallonyin Date: Mon, 6 Mar 2023 15:07:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=86=E5=88=AB(=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/yameida/worktool/service/WeworkLoopImpl.kt | 1 - .../org/yameida/worktool/utils/WeworkTextUtil.kt | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt index 5092da0..5ababb3 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -642,7 +642,6 @@ object WeworkLoopImpl { } } } - //todo 发视频和文件也可能存在上传中状态 if (textType == WeworkMessageBean.TEXT_TYPE_LINK && itemMessageList.size == 1 && itemMessageList[0].text.matches("[0-9]+%".toRegex())) { textType = WeworkMessageBean.TEXT_TYPE_IMAGE diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt index 3f87438..02ebd00 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkTextUtil.kt @@ -209,6 +209,13 @@ object WeworkTextUtil { */ fun getTextType(node: AccessibilityNodeInfo?, isGroup: Boolean = true): Int { if (node == null) return WeworkMessageBean.TEXT_TYPE_UNKNOWN + val startTime = System.currentTimeMillis() + while (System.currentTimeMillis() - startTime <= Constant.LONG_INTERVAL) { + node.refresh() + AccessibilityUtil.findOnceByClazz(node, Views.ProgressBar) ?: break + LogUtils.e("发现加载项 等待加载完成...") + sleep(Constant.POP_WINDOW_INTERVAL / 5) + } val tvList = findAllOnceByClazz(node, Views.TextView) val tvCount = tvList.size val ivCount = findAllOnceByClazz(node, Views.ImageView).size @@ -246,7 +253,12 @@ object WeworkTextUtil { } tvCount == 4 && ivCount == 2 -> WeworkMessageBean.TEXT_TYPE_VOICE tvCount == 5 && ivCount == 1 -> WeworkMessageBean.TEXT_TYPE_CARD - tvCount == 1 && ivCount == 2 -> WeworkMessageBean.TEXT_TYPE_LOCATION + tvCount == 1 && ivCount == 2 -> { + if ((tvList[0].text?.toString() ?: "").matches("[0-9]+:[0-9]+".toRegex())) + WeworkMessageBean.TEXT_TYPE_VIDEO + else + WeworkMessageBean.TEXT_TYPE_LOCATION + } tvCount == 3 && ivCount == 0 -> WeworkMessageBean.TEXT_TYPE_REPLY else -> WeworkMessageBean.TEXT_TYPE_UNKNOWN }