From 00e3102381c8b916695064ab0febd43d7d79e9aa Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 8 Nov 2018 23:07:31 +0800
Subject: [PATCH] =?UTF-8?q?APK=E6=8A=93=E5=8C=85>=E4=BB=8E=E9=A2=91?=
 =?UTF-8?q?=E9=81=931=E5=BC=80=E5=A7=8B=E4=BE=9D=E6=AC=A1=E6=8A=93?=
 =?UTF-8?q?=E5=8F=96,=20=E4=BF=AE=E5=A4=8D=E6=8A=93=E5=8C=85=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E6=97=B6=E9=97=B4=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E5=BC=80=E5=A7=8B=E5=90=8E=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=BB=8D=E5=9C=A8=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98=20#BYLSERVER-1693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/duolebo/blyrobot/MainActivity.kt | 32 +++++--------------
 .../com/duolebo/blyrobot/tools/TaskManager.kt |  4 +++
 app/src/main/res/layout/activity_main.xml     |  7 ++++
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index a675333..87ccdb1 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -39,7 +39,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
     private lateinit var refreshTimer: Timer
     private lateinit var appInfoData: AppInfoData
     private var startSet = false
-    private var isStart = false
 
     private var apkPackageInfo: List<ApkPackageInfo>? = null
 
@@ -69,17 +68,14 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
         startRobotService()
 
         startBtn.setOnClickListener{
-            if (isStart) {
-                stop()
-            }
-            else {
-                start()
-            }
-
-            isStart = !isStart
+            start()
         }
         startBtn.requestFocus()
 
+        stopBtn.setOnClickListener{
+            stop()
+        }
+
         requestAppList()
 
         refreshBtn.isEnabled = true
@@ -94,12 +90,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
         startBtn.isEnabled = false
         if (TaskManager.instance.tasks.size > 0) {
             startRobot()
-
-            startBtn.postDelayed({
-                startBtn.isEnabled = true
-                startBtn.text = "停止"
-                refreshBtn.isEnabled = false
-            }, 2000)
         }
         else {
             startSet = true
@@ -108,15 +98,9 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
     }
 
     private fun stop() {
-        if (TaskManager.instance.isRunning) {
-            stopRobot()
-            startBtn.isEnabled = false
-            startBtn.postDelayed({
-                startBtn.isEnabled = true
-                startBtn.text = "启动"
-                refreshBtn.isEnabled = true
-            }, 3000)
-        }
+        stopRobot()
+        stopBtn.isEnabled = false
+        startBtn.isEnabled = true
     }
 
     private fun resetStartBtn() {
diff --git a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt
index 0446249..5abeeb9 100644
--- a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt
@@ -72,6 +72,10 @@ class TaskManager {
             return
         }
 
+        for (task in tasks) {
+            Log.i(TAG, "list tasks: ${task.apkInfo.packageName}")
+        }
+
         this.isRunning = true
         scheduleTime?.run {
             cancel()
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 35f1079..5e4fc14 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,6 +27,13 @@
             android:layout_height="wrap_content"
             android:text="启动"/>
 
+        <Button
+            android:id="@+id/stopBtn"
+            android:layout_marginLeft="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="停止"/>
+
         <Button
             android:id="@+id/refreshBtn"
             android:layout_width="wrap_content"
-- 
2.21.0