diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt index c9fdec61ae826a730aa4819541dcfc20c100a5e1..a675333934d51ef2b558042630252ca04d31bd5f 100644 --- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt +++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt @@ -64,6 +64,8 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { textView.setText(R.string.tips_device_not_root) } + AdbUtil.exeCmdEcho("ls", true) + startRobotService() startBtn.setOnClickListener{ diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt index afeb7c8deb0651a399b3b4184c06921d3f68e1d1..4881f6505da9c5f5ce01a6b4371fae1c4d2012dd 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -23,7 +23,7 @@ import kotlin.collections.ArrayList class Task : IAppBaseCallback { - private val TAG = "Task" + private val TAG = "RobotTask" val STATUS_MAP = mapOf( "0" to "未处理", @@ -84,7 +84,7 @@ class Task : IAppBaseCallback { this.status = "1" this.prepareReport() // 启动应用 - this.launchApp() + this.launchApp(true) // 频道轮询处理 try { val success = this.processChannels(0) @@ -170,7 +170,7 @@ class Task : IAppBaseCallback { capture(apkInfo.captureDelay) AdbUtil.sendMultiKey(this.apkInfo.channelKeyEvent) - if (!AppUtil.isAppBackground(context, this.apkInfo.packageName)) { + if (!AppUtil.isAppForeground(context, this.apkInfo.packageName)) { Log.i(TAG, "targe app crashed?") return false } diff --git a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt index 59c28d91cbfc0a52dbfa468e6afa25081a51f6d1..c209a4344604702b126482c81d6d1513dd44462d 100644 --- a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt +++ b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt @@ -173,7 +173,7 @@ object AppUtil { return sdcardAbsPath } - fun isAppBackground(context: Context, packageName: String): Boolean { + fun isAppForeground(context: Context, packageName: String): Boolean { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { return AdbUtil.isAppActive(packageName) @@ -183,7 +183,7 @@ object AppUtil { val appProcesses = activityManager.runningAppProcesses for (appProcess in appProcesses) { if (appProcess.processName == packageName) { - return appProcess.importance == RunningAppProcessInfo.IMPORTANCE_BACKGROUND + return appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND } } return false