Commit 00e31023 authored by liuyang's avatar liuyang

APK抓包>从频道1开始依次抓取, 修复抓包等待时间停止任务,重新开始后之前的任务仍在执行问题

#BYLSERVER-1693
parent 6b6791cc
......@@ -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,16 +68,13 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
startRobotService()
startBtn.setOnClickListener{
if (isStart) {
stop()
}
else {
start()
}
startBtn.requestFocus()
isStart = !isStart
stopBtn.setOnClickListener{
stop()
}
startBtn.requestFocus()
requestAppList()
......@@ -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({
stopBtn.isEnabled = false
startBtn.isEnabled = true
startBtn.text = "启动"
refreshBtn.isEnabled = true
}, 3000)
}
}
private fun resetStartBtn() {
......
......@@ -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()
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment