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 0bbb3fee2799b9419e36576db0f92044b8ffafa9..5cf86cc86d9d25a17e9e5275b7c0e3255c945f66 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -293,7 +293,7 @@ class Task : IAppBaseCallback { } override fun onError(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?, exception: java.lang.Exception?) { - Log.i(TAG, "upload error " + uploadInfo?.toString()) + Log.i(TAG, "upload error uploadCount: $uploadCount " + uploadInfo?.toString()) uploadCount++ if (uploadCount == totalUpload) { uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size) @@ -301,6 +301,7 @@ class Task : IAppBaseCallback { } override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) { + Log.i(TAG, "onCompleted...uploadCount: $uploadCount") uploadCount++ if (uploadCount == totalUpload) { uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size) diff --git a/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt b/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt index f48a39892e09667581db727385182bf6f3a9a4c2..5873b694ed3fb5b2c40ac954eab25731c23c66d8 100644 --- a/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt +++ b/app/src/main/java/com/duolebo/blyrobot/protocol/ApkReportProtocol.kt @@ -6,7 +6,6 @@ import com.duolebo.appbase.prj.bmtv.protocol.IProtocolConfig import com.duolebo.appbase.prj.bmtv.protocol.ProtocolBase import com.duolebo.blyrobot.data.ApkReportData import com.duolebo.blyrobot.util.Config -import java.lang.StringBuilder class ApkReportProtocol(context: Context?, config: IProtocolConfig?) : ProtocolBase(context, config) { 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 8f923f3b3027572ad6c3e5104dec7d27bc349c85..91981c0a2041bdb0618bf020d6c42862dfd4cb79 100644 --- a/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt +++ b/app/src/main/java/com/duolebo/blyrobot/service/BylRobotService.kt @@ -14,6 +14,7 @@ import com.duolebo.blyrobot.data.Task import com.duolebo.blyrobot.tools.TaskManager import com.duolebo.blyrobot.util.AdbUtil import com.duolebo.blyrobot.util.AppUtil +import com.duolebo.blyrobot.util.Config import com.duolebo.blyrobot.util.Constants import org.json.JSONObject import java.util.* @@ -64,12 +65,16 @@ class BylRobotService: Service() { private fun loadTask() { Log.i(TAG, "loadTask...") - val task = Task(this) - val apkInfo = ApkInfo() - val apkJson = JSONObject(AppUtil.readFromAssert(this, "test.json")) - apkInfo.from(apkJson) - task.from(apkInfo) - TaskManager.instance.add(task) + + if (Config.instance.isDebug) { + val task = Task(this) + val apkInfo = ApkInfo() + val apkJson = JSONObject(AppUtil.readFromAssert(this, "test.json")) + apkInfo.from(apkJson) + task.from(apkInfo) + TaskManager.instance.add(task) + } + TaskManager.instance.start() } diff --git a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt index b0da779ff322c8951ef2759b62ae6b3e4ed0e5bf..df37faa4b6fedfddbdbc20e717553f7712ad3d1b 100644 --- a/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt +++ b/app/src/main/java/com/duolebo/blyrobot/tools/TaskManager.kt @@ -53,6 +53,12 @@ class TaskManager { Log.i(TAG, "is running") return } + + if (this.tasks.size <= 0) { + Log.i(TAG, "no tasks") + return + } + this.isRunning = true val t = Thread(runnable) t.start() diff --git a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt index 271ebec9bd5560e21a60280590336bc7d20da76a..8b74f032ceadd46429258ebf9b91a7b72bd8dc47 100644 --- a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt +++ b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt @@ -3,7 +3,7 @@ package com.duolebo.blyrobot.util import com.duolebo.appbase.prj.bmtv.protocol.IProtocolConfig class Config: IProtocolConfig { - private val isDebug = true + val isDebug = true override fun getProtocolUrl(): String { if (isDebug)