diff --git a/app/build.gradle b/app/build.gradle index 9393f8a27b1e040e28575fa518a1d42e5ffdc12e..a27ca3f9f375836873510f38b64aaa4e186aa775 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 a43dcd813e2658ec8eee0c9c225aaa025cb639e7..ce0912723af66e027b442b55bde5537442b2ee59 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 0a0c20eedea90ffeff3947a38cdb987ca802736a..3bde02dca53cccb7b4c314eda1a73d48d41dab5c 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 439db23e20f7dbf67a6f8f438ab896ca787fc2ac..cfb31a77bcdcb955318abf7c39e0213f07eea4f5 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