From 9e69c7e6c8f7da2ffed9d3125ee83de9cd1267af Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Tue, 20 Nov 2018 14:18:46 +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,=20ftp=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96=20#BYLSERV?=
 =?UTF-8?q?ER-1693?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                               | 2 +-
 app/src/main/java/com/duolebo/blyrobot/MainActivity.kt         | 1 +
 .../main/java/com/duolebo/blyrobot/service/BylRobotService.kt  | 1 +
 app/src/main/java/com/duolebo/blyrobot/tools/FtpManager.kt     | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9393f8a..a27ca3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
         versionCode 15
-        versionName "1.3.30"
+        versionName "1.4.40"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index a43dcd8..ce09127 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -105,6 +105,7 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
     }
 
     private fun stop() {
+        Toast.makeText(this, "正在停止任务，请稍候...", Toast.LENGTH_SHORT).show()
         stopRobot()
         stopBtn.isEnabled = false
         stopBtn.isFocusable = false
diff --git a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt
index 0a0c20e..3bde02d 100644
--- a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt
@@ -91,6 +91,7 @@ class BylRobotService: Service(), IAppBaseCallback {
     override fun onDestroy() {
         Log.i(TAG, "destroy...")
         super.onDestroy()
+        stopTask()
         FtpManager.instance.stop()
         LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver)
     }
diff --git a/app/src/main/java/com/duolebo/blyrobot/tools/FtpManager.kt b/app/src/main/java/com/duolebo/blyrobot/tools/FtpManager.kt
index 439db23..cfb31a7 100644
--- a/app/src/main/java/com/duolebo/blyrobot/tools/FtpManager.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/tools/FtpManager.kt
@@ -22,6 +22,8 @@ class FtpManager {
 
     fun start() {
         Log.i(TAG, "ftp manager start...")
+        if (this.isRunning)
+            return
         scheduleTime?.run { cancel() }
         this.isRunning = true
         scheduleTime = Timer()
@@ -64,6 +66,7 @@ class FtpManager {
         for (uploadTask in uploadTasks) {
             cancelTask(uploadTask)
         }
+        this.isRunning = false
     }
 
 }
\ No newline at end of file
-- 
2.21.0