From 03719142ab0e3f9c54023b4e09f30900f62d689a Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Wed, 10 Oct 2018 16:44:26 +0800
Subject: [PATCH] =?UTF-8?q?APK=E5=9B=BE=E7=89=87=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=BD=AE=E6=92=AD=E6=B5=81=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=8A=93=E5=8F=96=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/duolebo/blyrobot/data/Task.kt |  3 ++-
 .../blyrobot/protocol/ApkReportProtocol.kt      |  1 -
 .../duolebo/blyrobot/service/BylRobotService.kt | 17 +++++++++++------
 .../com/duolebo/blyrobot/tools/TaskManager.kt   |  6 ++++++
 .../java/com/duolebo/blyrobot/util/Config.kt    |  2 +-
 5 files changed, 20 insertions(+), 9 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 0bbb3fe..5cf86cc 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 f48a398..5873b69 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 8f923f3..91981c0 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 b0da779..df37faa 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 271ebec..8b74f03 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)
-- 
2.21.0