APK图片抓取识别及轮播流地址抓取，客户端上报修改

#BYLSERVER-1438

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)

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) {
 

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()
     }
 

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()

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)