From 3caee4a507236112fc702f2d311363e24869eed3 Mon Sep 17 00:00:00 2001 From: Cluster Pleiades Date: Wed, 12 Jan 2022 15:52:39 +0900 Subject: [PATCH] Balancing Threshold --- .../java/com/speedroid/macroid/Configs.kt | 4 ++-- .../macroid/macro/ImageController.kt | 23 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/speedroid/macroid/Configs.kt b/app/src/main/java/com/speedroid/macroid/Configs.kt index 2d036c6..869a059 100644 --- a/app/src/main/java/com/speedroid/macroid/Configs.kt +++ b/app/src/main/java/com/speedroid/macroid/Configs.kt @@ -30,8 +30,8 @@ class Configs { const val DELAY_DOUBLE = 1000L const val DELAY_STANDBY = 7000L - const val THRESHOLD_DISTANCE_DEFAULT = 3000000L - const val THRESHOLD_DISTANCE_STRICT = 1500000L + const val THRESHOLD_DISTANCE_DEFAULT = 150L + const val THRESHOLD_DISTANCE_STRICT = 100L const val DURATION_DRAG = 250L const val DURATION_CLICK = 100L diff --git a/app/src/main/java/com/speedroid/macroid/macro/ImageController.kt b/app/src/main/java/com/speedroid/macroid/macro/ImageController.kt index aa50a28..a0b8365 100644 --- a/app/src/main/java/com/speedroid/macroid/macro/ImageController.kt +++ b/app/src/main/java/com/speedroid/macroid/macro/ImageController.kt @@ -195,8 +195,25 @@ open class ImageController { val imagePixels = pixelsHashMap[drawableResId] ?: return null val croppedPixels = getCroppedPixels(screenBitmap, drawableResId) ?: return null val threshold = if (strictHashSet.contains(drawableResId)) THRESHOLD_DISTANCE_STRICT else THRESHOLD_DISTANCE_DEFAULT - - return if (getDistanceAverage(imagePixels, croppedPixels) > threshold) null else DetectResult(drawableResId) + val distanceAverage = getDistanceAverage(imagePixels, croppedPixels) + + return if (distanceAverage > threshold) null else { +// when (drawableResId) { +// R.drawable.image_background_player -> Log.d("test", "image_background_player $distanceAverage") +// R.drawable.image_background_draw_1 -> Log.d("test", "image_background_draw_1 $distanceAverage") +// R.drawable.image_background_draw_2 -> Log.d("test", "image_background_draw_2 $distanceAverage") +// R.drawable.image_button_win -> Log.d("test", "image_button_win $distanceAverage") +// R.drawable.image_button_retry_l -> Log.d("test", "image_button_retry_l $distanceAverage") +// R.drawable.image_button_retry_s -> Log.d("test", "image_button_retry_s $distanceAverage") +// R.drawable.image_button_back -> Log.d("test", "image_button_back $distanceAverage") +// R.drawable.image_button_gate -> Log.d("test", "image_button_gate $distanceAverage") +// R.drawable.image_button_appear_1 -> Log.d("test", "image_button_appear_1 $distanceAverage") +// R.drawable.image_button_appear_2 -> Log.d("test", "image_button_appear_2 $distanceAverage") +// R.drawable.image_button_double -> Log.d("test", "image_button_double $distanceAverage") +// } + + DetectResult(drawableResId) + } } fun detectRetryImage(screenBitmap: Bitmap): DetectResult? { @@ -217,7 +234,7 @@ open class ImageController { val draw1DistanceAverage = getDistanceAverage(pixelsHashMap[R.drawable.image_background_draw_1]!!, croppedPixels) val draw2DistanceAverage = getDistanceAverage(pixelsHashMap[R.drawable.image_background_draw_2]!!, croppedPixels) - Log.d("test", "player,draw1,draw2 $playerDistanceAverage $draw1DistanceAverage $draw2DistanceAverage") +// Log.d("test", "player,draw1,draw2 $playerDistanceAverage $draw1DistanceAverage $draw2DistanceAverage") var minDistanceAverage = Long.MAX_VALUE var drawableResId = 0