From 8596ca9dbc34aa9ce816cb94b27f3cd57d95c1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E7=94=B2=E4=BB=91?= Date: Fri, 26 Aug 2022 17:36:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=B2=BE=E7=A1=AE=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../yameida/worktool/service/WeworkGetImpl.kt | 6 +++--- .../yameida/worktool/service/WeworkLoopImpl.kt | 2 +- .../worktool/service/WeworkOperationImpl.kt | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3df54eb..17ed2ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.yameida.worktool" minSdkVersion 23 targetSdkVersion 30 - versionCode 221 - versionName "2.2.1" + versionCode 223 + versionName "2.2.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt index a032ebb..880967d 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt @@ -154,7 +154,7 @@ object WeworkGetImpl { } } if (weworkMessageBean.groupName.isNullOrEmpty()) { - val groupNameTv = AccessibilityUtil.findOnceByText(getRoot(), "群聊名称") + val groupNameTv = AccessibilityUtil.findOnceByText(getRoot(), "群聊名称", exact = true) if (groupNameTv != null) { val tvList = AccessibilityUtil.findAllOnceByClazz( groupNameTv.parent.parent.parent, @@ -175,14 +175,14 @@ object WeworkGetImpl { weworkMessageBean.groupOwner = tvOwnerName.text.toString() } } - val tvCountFlag = AccessibilityUtil.findOnceByText(getRoot(), "查看全部群成员") + val tvCountFlag = AccessibilityUtil.findOnceByText(getRoot(), "查看全部群成员", exact = true) val tvCount = AccessibilityUtil.findBackNode(tvCountFlag) if (tvCount != null && tvCount.text != null) { LogUtils.d("群成员: " + tvCount.text) val count = tvCount.text.toString().replace("人", "") weworkMessageBean.groupNumber = count.toIntOrNull() } - val tvAnnouncementFlag = AccessibilityUtil.findOnceByText(getRoot(), "群公告") + val tvAnnouncementFlag = AccessibilityUtil.findOnceByText(getRoot(), "群公告", exact = true) val tvAnnouncement = AccessibilityUtil.findBackNode(tvAnnouncementFlag) if (tvAnnouncement != null && tvAnnouncement.text != null) { LogUtils.d("群公告: " + tvAnnouncement.text) 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 fedb56d..a088247 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -185,7 +185,7 @@ object WeworkLoopImpl { //回到上一页 var retry = 5 while (retry-- > 0 && !isAtHome()) { - val textView = AccessibilityUtil.findOnceByText(getRoot(), "新的客户", "新的居民") + val textView = AccessibilityUtil.findOnceByText(getRoot(), "新的客户", "新的居民", exact = true) if (textView == null) { backPress() } diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt index b03a94b..14ad967 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -225,7 +225,7 @@ object WeworkOperationImpl { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { AccessibilityUtil.performClick(node) sleep(Constant.POP_WINDOW_INTERVAL) - if (AccessibilityUtil.findOnceByText(getRoot(), "微盘") != null) { + if (AccessibilityUtil.findOnceByText(getRoot(), "微盘", exact = true) != null) { AccessibilityUtil.clickByNode(WeworkController.weworkService, node) } } else { @@ -275,7 +275,7 @@ object WeworkOperationImpl { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { AccessibilityUtil.performClick(node) sleep(Constant.POP_WINDOW_INTERVAL) - if (AccessibilityUtil.findOnceByText(getRoot(), "微盘") != null) { + if (AccessibilityUtil.findOnceByText(getRoot(), "微盘", exact = true) != null) { AccessibilityUtil.clickByNode(WeworkController.weworkService, node) } } else { @@ -406,7 +406,7 @@ object WeworkOperationImpl { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { AccessibilityUtil.performClick(button) sleep(Constant.POP_WINDOW_INTERVAL) - if (AccessibilityUtil.findOnceByText(list, "添加客户", "添加居民", "加微信") != null) { + if (AccessibilityUtil.findOnceByText(list, "添加客户", "添加居民", "加微信", exact = true) != null) { AccessibilityUtil.clickByNode(WeworkController.weworkService, button) } } else { @@ -426,12 +426,12 @@ object WeworkOperationImpl { ) } if (AccessibilityUtil.findOneByText(getRoot(), "标签", "电话") != null) { - var markTv = AccessibilityUtil.findOnceByText(getRoot(), "设置备注和描述") + var markTv = AccessibilityUtil.findOnceByText(getRoot(), "设置备注和描述", exact = true) if (markTv == null) { - markTv = AccessibilityUtil.findOnceByText(getRoot(), "企业") + markTv = AccessibilityUtil.findOnceByText(getRoot(), "企业", exact = true) } if (markTv == null) { - markTv = AccessibilityUtil.findOnceByText(getRoot(), "描述") + markTv = AccessibilityUtil.findOnceByText(getRoot(), "描述", exact = true) } //设置备注 if (markTv != null && (friend.markName != null @@ -480,7 +480,7 @@ object WeworkOperationImpl { LogUtils.d("发送添加邀请成功: " + friend.phone) } } else { - if (AccessibilityUtil.findOnceByText(getRoot(), "发消息") != null) { + if (AccessibilityUtil.findOnceByText(getRoot(), "发消息", exact = true) != null) { LogUtils.e("已经添加联系人，请勿重复添加") } else { LogUtils.e("未找到添加为联系人") @@ -603,7 +603,7 @@ object WeworkOperationImpl { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { AccessibilityUtil.performClick(node) sleep(Constant.POP_WINDOW_INTERVAL) - if (AccessibilityUtil.findOnceByText(getRoot(), "客户群", "居民群") != null) { + if (AccessibilityUtil.findOnceByText(getRoot(), "客户群", "居民群", exact = true) != null) { if (AccessibilityUtil.clickByNode(WeworkController.weworkService, node)) { LogUtils.d("进入客户群应用") val textView = @@ -805,7 +805,7 @@ object WeworkOperationImpl { private fun groupChangeAnnouncement(groupAnnouncement: String? = null): Boolean { if (groupAnnouncement == null) return true if (WeworkRoomUtil.intoGroupManager()) { - val textView = AccessibilityUtil.findOneByText(getRoot(), "群公告") + val textView = AccessibilityUtil.findOneByText(getRoot(), "群公告", exact = true) if (textView != null) { AccessibilityUtil.performClick(textView) val editButton = AccessibilityUtil.findOneByText(getRoot(), "编辑", timeout = 2000, exact = true)