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 519e458..9e2c570 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -542,7 +542,7 @@ object WeworkLoopImpl { val lastPicPath = MultiFileObserver.lastPicPath LogUtils.d("发现图片类型应该点击") AccessibilityUtil.performClickWithSon(relativeLayoutContent) - AccessibilityExtraUtil.loadingPage("com.tencent.wework.msg.controller.ShowImageController", Constant.CHANGE_PAGE_INTERVAL) + AccessibilityExtraUtil.loadingPage("ShowImageController", Constant.CHANGE_PAGE_INTERVAL) LogUtils.d("发现图片类型 查看图片检查有无新图片产生") if (MultiFileObserver.lastPicCreateTime > lastPicCreateTime) { LogUtils.d("正在下载图片...") diff --git a/app/src/main/java/org/yameida/worktool/utils/AccessibilityExtraUtil.kt b/app/src/main/java/org/yameida/worktool/utils/AccessibilityExtraUtil.kt index e4b3fdd..10a6d88 100644 --- a/app/src/main/java/org/yameida/worktool/utils/AccessibilityExtraUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/AccessibilityExtraUtil.kt @@ -28,7 +28,7 @@ object AccessibilityExtraUtil { val startTime = System.currentTimeMillis() var currentTime = startTime while (currentTime - startTime <= timeout) { - if (service.currentClass == clazz) { + if (service.currentClass == clazz || service.currentClass.split(".").last() == clazz) { Log.v(tag, "loadingPage: $clazz") return true } diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt index 916eda6..b3a49bc 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt @@ -112,7 +112,7 @@ object WeworkRoomUtil { val needTrim = title.contains(Constant.regTrimTitle) val trimTitle = title.replace(Constant.regTrimTitle, "") AccessibilityUtil.findTextInput(getRoot(), trimTitle) - if (!AccessibilityExtraUtil.loadingPage("com.tencent.wework.contact.controller.GlobalSearchActivity")) { + if (!AccessibilityExtraUtil.loadingPage("GlobalSearchActivity")) { LogUtils.e("未找到搜索页") return false }