diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt index a675333934d51ef2b558042630252ca04d31bd5f..87ccdb16621d176a7cdeef09f15c00fdf7bd1cc4 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? = 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 0446249a48680f4840b8bdf3903a5004b6c83235..5abeeb94ba4b802dd0b98e730315dc179783f911 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 35f10793fcb29b54024fd3305e452f7eb367446b..5e4fc1402e669192c38f9324b37fa5fa86745f07 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="启动"/> +