From d8629fba8febd35cf7eb7566c59ed56fcef3722b Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 25 Oct 2018 11:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8A=E6=8A=A5=E6=8F=90?=
 =?UTF-8?q?=E5=89=8D=EF=BC=8C=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=94=BE?=
 =?UTF-8?q?=E5=85=A5=E5=90=8E=E5=8F=B0=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 3275422..d7d1578 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -81,6 +81,12 @@ class Task : IAppBaseCallback {
     }
 
     fun start() {
+
+        //如果之前的上传任务还在执行，进行取消
+        if (!uploadId.isNullOrEmpty()) {
+            UploadService.stopUpload(uploadId)
+        }
+
         this.status = "1"
         this.prepareReport()
         // 启动应用
@@ -133,8 +139,8 @@ class Task : IAppBaseCallback {
         AdbUtil.stopApp(this.apkInfo.packageName)
 
         // 取消ftp上传
-        if (!uploadId.isNullOrEmpty())
-            UploadService.stopUpload(uploadId)
+//        if (!uploadId.isNullOrEmpty())
+//            UploadService.stopUpload(uploadId)
     }
 
     private fun finish(result: Boolean) {
-- 
2.21.0