|
@@ -124,7 +124,7 @@ class TaskRunner(
|
|
|
delay(1000)
|
|
delay(1000)
|
|
|
var success = false
|
|
var success = false
|
|
|
var traverseResult = TraverseResult()
|
|
var traverseResult = TraverseResult()
|
|
|
- withTimeoutOrNull(taskConfig.rcsWait) {
|
|
|
|
|
|
|
+ withTimeoutOrNull(taskConfig.singleTimeout) {
|
|
|
repeat(999) {
|
|
repeat(999) {
|
|
|
traverseResult = TraverseResult()
|
|
traverseResult = TraverseResult()
|
|
|
screenInspector.traverseNode(traverseResult)
|
|
screenInspector.traverseNode(traverseResult)
|
|
@@ -155,9 +155,9 @@ class TaskRunner(
|
|
|
Log.i(TAG, "Clicking send button")
|
|
Log.i(TAG, "Clicking send button")
|
|
|
|
|
|
|
|
val dt = System.currentTimeMillis() - lastSend
|
|
val dt = System.currentTimeMillis() - lastSend
|
|
|
- if (taskConfig.rcsInterval > 0 && dt < taskConfig.rcsInterval) {
|
|
|
|
|
|
|
+ if (taskConfig.singleDelay > 0 && dt < taskConfig.singleDelay) {
|
|
|
Log.i(TAG, "Waiting for RCS interval")
|
|
Log.i(TAG, "Waiting for RCS interval")
|
|
|
- delay(taskConfig.rcsInterval - dt)
|
|
|
|
|
|
|
+ delay(taskConfig.singleDelay - dt)
|
|
|
}
|
|
}
|
|
|
traverseResult.sendBtn!!.performAction(AccessibilityNodeInfo.ACTION_CLICK)
|
|
traverseResult.sendBtn!!.performAction(AccessibilityNodeInfo.ACTION_CLICK)
|
|
|
lastSend = System.currentTimeMillis()
|
|
lastSend = System.currentTimeMillis()
|
|
@@ -234,7 +234,7 @@ class TaskRunner(
|
|
|
shellRun(CMD_BACK)
|
|
shellRun(CMD_BACK)
|
|
|
delay(5000)
|
|
delay(5000)
|
|
|
onSuccess(results)
|
|
onSuccess(results)
|
|
|
- if (taskConfig.requestNumberInterval in 1..appStateRepo.appState.value.successNum) {
|
|
|
|
|
|
|
+ if (taskConfig.singleQty in 1..appStateRepo.appState.value.successNum) {
|
|
|
delay(3000)
|
|
delay(3000)
|
|
|
requestNumberOnTask()
|
|
requestNumberOnTask()
|
|
|
} else if (taskConfig.cleanCount in 1..appStateRepo.appState.value.executedNum && !appPrefsRepo.appPrefs.value.preventClean) {
|
|
} else if (taskConfig.cleanCount in 1..appStateRepo.appState.value.executedNum && !appPrefsRepo.appPrefs.value.preventClean) {
|
|
@@ -445,7 +445,6 @@ class TaskRunner(
|
|
|
gmsAid = genAndroidId(),
|
|
gmsAid = genAndroidId(),
|
|
|
rootAid = genAndroidId(),
|
|
rootAid = genAndroidId(),
|
|
|
)
|
|
)
|
|
|
-
|
|
|
|
|
)
|
|
)
|
|
|
val tosAgreeJob = CoroutineScope(coroutineContext).launch {
|
|
val tosAgreeJob = CoroutineScope(coroutineContext).launch {
|
|
|
run tos@{
|
|
run tos@{
|