Commit 00e31023 authored by liuyang's avatar liuyang

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

#BYLSERVER-1693
parent 6b6791cc
...@@ -39,7 +39,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -39,7 +39,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
private lateinit var refreshTimer: Timer private lateinit var refreshTimer: Timer
private lateinit var appInfoData: AppInfoData private lateinit var appInfoData: AppInfoData
private var startSet = false private var startSet = false
private var isStart = false
private var apkPackageInfo: List<ApkPackageInfo>? = null private var apkPackageInfo: List<ApkPackageInfo>? = null
...@@ -69,17 +68,14 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -69,17 +68,14 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
startRobotService() startRobotService()
startBtn.setOnClickListener{ startBtn.setOnClickListener{
if (isStart) { start()
stop()
}
else {
start()
}
isStart = !isStart
} }
startBtn.requestFocus() startBtn.requestFocus()
stopBtn.setOnClickListener{
stop()
}
requestAppList() requestAppList()
refreshBtn.isEnabled = true refreshBtn.isEnabled = true
...@@ -94,12 +90,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -94,12 +90,6 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
startBtn.isEnabled = false startBtn.isEnabled = false
if (TaskManager.instance.tasks.size > 0) { if (TaskManager.instance.tasks.size > 0) {
startRobot() startRobot()
startBtn.postDelayed({
startBtn.isEnabled = true
startBtn.text = "停止"
refreshBtn.isEnabled = false
}, 2000)
} }
else { else {
startSet = true startSet = true
...@@ -108,15 +98,9 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback { ...@@ -108,15 +98,9 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
} }
private fun stop() { private fun stop() {
if (TaskManager.instance.isRunning) { stopRobot()
stopRobot() stopBtn.isEnabled = false
startBtn.isEnabled = false startBtn.isEnabled = true
startBtn.postDelayed({
startBtn.isEnabled = true
startBtn.text = "启动"
refreshBtn.isEnabled = true
}, 3000)
}
} }
private fun resetStartBtn() { private fun resetStartBtn() {
......
...@@ -72,6 +72,10 @@ class TaskManager { ...@@ -72,6 +72,10 @@ class TaskManager {
return return
} }
for (task in tasks) {
Log.i(TAG, "list tasks: ${task.apkInfo.packageName}")
}
this.isRunning = true this.isRunning = true
scheduleTime?.run { scheduleTime?.run {
cancel() cancel()
......
...@@ -27,6 +27,13 @@ ...@@ -27,6 +27,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="启动"/> android:text="启动"/>
<Button
android:id="@+id/stopBtn"
android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="停止"/>
<Button <Button
android:id="@+id/refreshBtn" android:id="@+id/refreshBtn"
android:layout_width="wrap_content" 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