fix 优化后退按钮

This commit is contained in:
尹甲仑
2022-06-06 14:10:41 +08:00
parent bceaa28d15
commit 097a917349

View File

@@ -107,9 +107,8 @@ fun getRoot(ignoreCheck: Boolean): AccessibilityNodeInfo {
*/ */
fun backPress() { fun backPress() {
val textView = AccessibilityUtil.findOneByClazz(getRoot(), Views.TextView) val textView = AccessibilityUtil.findOneByClazz(getRoot(), Views.TextView)
if (textView != null && textView.text.isNullOrBlank()) { if (textView != null && textView.text.isNullOrBlank() && AccessibilityUtil.performClick(textView)) {
LogUtils.d("找到回退按钮") LogUtils.v("找到回退按钮")
AccessibilityUtil.performClick(textView)
} else { } else {
val ivButton = AccessibilityUtil.findOneByClazz(getRoot(), Views.ImageView) val ivButton = AccessibilityUtil.findOneByClazz(getRoot(), Views.ImageView)
if (ivButton != null && ivButton.isClickable && AccessibilityUtil.findFrontNode(ivButton) == null) { if (ivButton != null && ivButton.isClickable && AccessibilityUtil.findFrontNode(ivButton) == null) {
@@ -120,8 +119,13 @@ fun backPress() {
val button = AccessibilityUtil.findOneByClazz(getRoot(), Views.Button) val button = AccessibilityUtil.findOneByClazz(getRoot(), Views.Button)
if (button != null && button.childCount > 0) { if (button != null && button.childCount > 0) {
AccessibilityUtil.performClick(button.getChild(0)) AccessibilityUtil.performClick(button.getChild(0))
} else { } else if (button != null) {
AccessibilityUtil.performClick(button) AccessibilityUtil.performClick(button)
} else {
LogUtils.d("未找到BT按钮")
if (AccessibilityUtil.findTextAndClick(getRoot(), "确定")) {
LogUtils.d("尝试点击确定")
}
} }
} }
} }