diff --git a/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/AppScope.kt b/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/AppScope.kt index edbe561..0fa6fe2 100644 --- a/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/AppScope.kt +++ b/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/AppScope.kt @@ -4,7 +4,7 @@ package cn.vove7.andro_accessibility_api * # AppScope * * @property packageName String app pkg - * @property pageName String class name of Activity or Dialog + * @property pageName String class name of Activity or Dialog (empty means any page) * @constructor */ data class AppScope( @@ -22,4 +22,4 @@ data class AppScope( that.pageName.endsWith("$$pageName") } -} \ No newline at end of file +} diff --git a/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/utils/ScreenAdapter.kt b/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/utils/ScreenAdapter.kt index 1e31d78..1b0e7b8 100644 --- a/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/utils/ScreenAdapter.kt +++ b/accessibility-api/src/main/java/cn/vove7/andro_accessibility_api/utils/ScreenAdapter.kt @@ -52,18 +52,9 @@ object ScreenAdapter { fun scalePoints(points: Array>): Array> { - - val ps = Array(points.size) { Pair(0f, 0f) } - - val index = 0 - points.forEach { - val x = - scaleX(it.first) - val y = - scaleY(it.second) - ps[index] = Pair(x, y) - } - return ps + return points.map { point -> + Pair(scaleX(point.first), scaleY(point.second)) + }.toTypedArray() } fun scaleX(x: Int): Float = scaleX(x.toFloat()) @@ -106,4 +97,3 @@ class AdapterRectF : RectF { ) } } - diff --git a/accessibility-api/src/test/java/cn/vove7/andro_accessibility_api/utils/ResultBoxTest.kt b/accessibility-api/src/test/java/cn/vove7/andro_accessibility_api/utils/ResultBoxTest.kt new file mode 100644 index 0000000..f6d7090 --- /dev/null +++ b/accessibility-api/src/test/java/cn/vove7/andro_accessibility_api/utils/ResultBoxTest.kt @@ -0,0 +1,25 @@ +package cn.vove7.andro_accessibility_api.utils + +import org.junit.Assert.assertEquals +import org.junit.Test + +class ResultBoxTest { + @Test + fun setAndNotify_releasesLatchAndReturnsValue() { + val box = ResultBox() + + box.setAndNotify("done") + + assertEquals(0, box.lock.count) + assertEquals("done", box.blockedGet()) + } + + @Test + fun blockedGet_returnsValueWithoutThrowingWhenAlreadySet() { + val box = ResultBox(42) + + box.setAndNotify(7) + + assertEquals(7, box.blockedGet(safely = false)) + } +} diff --git a/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt b/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt index c526d1c..31523ed 100644 --- a/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt +++ b/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.withContext /** - * # actoins + * # actions * * Created on 2020/6/10 * @author Vove @@ -271,4 +271,4 @@ class TraverseAllAction : Action { // assert = [ Bottom, SubView ] } -} \ No newline at end of file +}