Update Log: Add isDebug(boolean) to Control Log

neoskool · Jan 17, 2020 · fbf566a · fbf566a
1 parent 39bc166
commit fbf566a
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 46 deletions.
diff --git a/app/src/main/java/com/shen/desserttask/MainActivity.kt b/app/src/main/java/com/shen/desserttask/MainActivity.kt
@@ -2,11 +2,14 @@ package com.shen.desserttask
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import com.shen.dessert_task.DessertDispatcher
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
     }
 }
diff --git a/app/src/main/java/com/shen/desserttask/MyApplication.kt b/app/src/main/java/com/shen/desserttask/MyApplication.kt
@@ -15,6 +15,7 @@ class MyApplication : Application() {
             .build()
             .create(ITask::class.java, TaskImpl())
             .addTask(TaskOne())
+            .addTask(easyTask { Log.d("EasyTask wow", "Start: ${Thread.currentThread().name}") })
             .start()
 
         //Method 1

diff --git a/app/src/main/java/com/shen/desserttask/task/ITask.kt b/app/src/main/java/com/shen/desserttask/task/ITask.kt
@@ -3,6 +3,7 @@ package com.shen.desserttask.task
 import com.shen.dessert_task.annotation.Task
 import com.shen.dessert_task.annotation.TaskCallback
 import com.shen.dessert_task.annotation.TaskConfig
+import com.shen.dessert_task.annotation.TaskTailRunnable
 
 /**
  *  created at 2020.2020/1/14.13:44
@@ -17,9 +18,12 @@ interface ITask {
     fun two()
 
     @Task
-    @TaskConfig(targetCallback = "callback", needCall = true)
+    @TaskConfig(targetCallback = "callback", needCall = true, tailRunnable = "threeTailRunnable")
     fun three()
 
     @TaskCallback("callback")
     fun threeCallback()
+
+    @TaskTailRunnable("threeTailRunnable")
+    fun threeTailRunnable()
 }
diff --git a/app/src/main/java/com/shen/desserttask/task/TaskImpl.kt b/app/src/main/java/com/shen/desserttask/task/TaskImpl.kt
@@ -22,4 +22,8 @@ class TaskImpl : ITask {
     override fun threeCallback() {
         Log.d("Wow threeCallback", "start: ${Thread.currentThread().name}")
     }
+
+    override fun threeTailRunnable() {
+        Log.d("Wow threeTailRunnable", "start: ${Thread.currentThread().name}")
+    }
 }
diff --git a/dessert_task/build.gradle b/dessert_task/build.gradle
@@ -6,7 +6,6 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
 
-
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
@@ -31,10 +30,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle'

diff --git a/dessert_task/src/androidTest/java/com/shen/dessert_task/ExampleInstrumentedTest.kt b/dessert_task/src/androidTest/java/com/shen/dessert_task/ExampleInstrumentedTest.kt
diff --git a/dessert_task/src/main/java/com/shen/dessert_task/DispatchRunnable.kt b/dessert_task/src/main/java/com/shen/dessert_task/DispatchRunnable.kt
@@ -45,9 +45,7 @@ class DessertDispatchRunnable : Runnable {
 
         if (task.needCall) {
             task.callback?.invoke()
-            if (DebugLog.isDebug) {
-                DebugLog.logD(task.javaClass.simpleName, "Callback finish")
-            }
+            DebugLog.logD(task.javaClass.simpleName, "Callback finish")
             task.needCall = false
         }
 
@@ -58,9 +56,7 @@ class DessertDispatchRunnable : Runnable {
             task.isFinish = true
 
             dispatcher?.run {
-                if (DebugLog.isDebug) {
-                    DebugLog.logE("Satisfy Task", task.toString() + " ${task.methodName}")
-                }
+                DebugLog.logE("Satisfy Task", task.toString() + " ${task.methodName}")
                 task.satisfyChildren()
                 task.makeTaskDone()
             }

diff --git a/dessert_task/src/main/java/com/shen/dessert_task/Dispatcher.kt b/dessert_task/src/main/java/com/shen/dessert_task/Dispatcher.kt
@@ -3,12 +3,14 @@ package com.shen.dessert_task
 import android.content.Context
 import android.os.Looper
 import androidx.annotation.UiThread
+import com.shen.dessert_task.annotation.Task
 import com.shen.dessert_task.annotation_tools.AnnotationConvertTools
 import com.shen.dessert_task.annotation_tools.TaskFactory
 import com.shen.dessert_task.ext.isMainProcess
 import com.shen.dessert_task.sort.getSortResult
 import com.shen.dessert_task.state.markTaskDone
 import com.shen.dessert_task.utils.DebugLog
+import java.lang.StringBuilder
 import java.lang.ref.WeakReference
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.Future
@@ -103,6 +105,7 @@ class DessertDispatcher {
             analyseCount.getAndIncrement()
             printDependedMsg()
             allTasks = getSortResult(allTasks, dependOnTasks) as MutableList<DessertTask>
+            printSortResultMsg()
             countDownLatch = CountDownLatch(needWaitCount.get())
 
             sendAndExecuteAsyncTask()
@@ -313,5 +316,26 @@ class DessertDispatcher {
             }
         }
     }
+
+    private fun printSortResultMsg() {
+        if (!DebugLog.isDebug) {
+            return
+        }
+
+        val sortResult = StringBuilder()
+        allTasks.forEachIndexed { index, it ->
+            if (index == 0) {
+                sortResult.append("{\n")
+            }
+
+            sortResult.append("ClassName: ${it.javaClass.run { if (simpleName.isEmpty()) "Unknown" else simpleName }}" +
+                    ", MethodName: ${it.methodName.run { if (isEmpty()) "Unknown" else this }} \n")
+
+            if (index == allTasks.lastIndex) {
+                sortResult.append("}")
+            }
+        }
+        DebugLog.logD("SortTaskResult", sortResult.toString())
+    }
 }
 
diff --git a/dessert_task/src/main/java/com/shen/dessert_task/Task.kt b/dessert_task/src/main/java/com/shen/dessert_task/Task.kt
@@ -1,5 +1,6 @@
 package com.shen.dessert_task
 
+import android.content.Context
 import android.os.Process
 import androidx.annotation.IntRange
 import com.shen.dessert_task.utils.DebugLog
@@ -54,15 +55,9 @@ abstract class DessertTask : IDessertTask {
 
     ///依赖的Task执行完一个
     fun satisfy() {
-        if (DebugLog.isDebug) {
-            DebugLog.logD("${if (methodName.isEmpty()) this.javaClass.simpleName else methodName} Pre task satisfy", depends.count)
-        }
-
+        DebugLog.logD("${if (methodName.isEmpty()) this.javaClass.simpleName else methodName} Pre task satisfy", depends.count)
         depends.countDown()
-
-        if (DebugLog.isDebug) {
-            DebugLog.logD("${if (methodName.isEmpty()) this.javaClass.simpleName else methodName} After task satisfy", depends.count)
-        }
+        DebugLog.logD("${if (methodName.isEmpty()) this.javaClass.simpleName else methodName} After task satisfy", depends.count)
     }
 
     /**
@@ -149,8 +144,10 @@ interface IDessertTask {
     val callback: (() -> Unit)?
 }
 
-fun easyTask(block: () -> Unit) = object : DessertTask() {
+fun easyTask(block: (context: Context?) -> Unit) = object : DessertTask() {
+    override val methodName: String = "easyTask"
+
     override fun run() {
-        block()
+        block(context)
     }
 }