From 59ec27c5adde2136cf399837c2d30206a70b317f Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 25 Oct 2018 09:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=96=AD=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/duolebo/blyrobot/MainActivity.kt | 2 ++
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt    | 6 +++---
 app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index c9fdec6..a675333 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 afeb7c8..4881f65 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 59c28d9..c209a43 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
-- 
2.21.0