opt: 步骤数据传递指定类型

Author: Ven

README.md

@@ -120,4 +120,4 @@ StepManager.beginExecute(OpenWechat::class.java, 1)
 
 | 交流群 | 个人微信 |
 |:---------:|:-----------:|
-| <img src="https://github.com/ven-coder/Assists/blob/master/graphics/1693440317864.png" width=200/>    | <img src="https://raw.githubusercontent.com/ven-coder/assists/master/graphics/wechat1.jpg" width=200/>
+| <img src="https://github.com/ven-coder/Assists/blob/master/graphics/1694582375808.png" width=200/>    | <img src="https://raw.githubusercontent.com/ven-coder/assists/master/graphics/wechat1.jpg" width=200/>

assists/src/main/java/com/ven/assist/step/StepData.kt

@@ -0,0 +1,5 @@
+package com.ven.assist.step
+
+data class StepData(
+    var code: Int = 0, var message: String = "", var data: Any? = null
+)

assists/src/main/java/com/ven/assist/step/StepManager.kt

@@ -17,7 +17,7 @@ object StepManager {
      * @param step 步骤序号
      * @param delay 步骤执行延迟时间，默认[Assists.Config.defaultStepDelay]
      */
-    private fun <T : StepImpl> beginExecute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: Any? = null): StepManager {
+    private fun <T : StepImpl> beginExecute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: StepData? = null): StepManager {
         isStop = false
         execute(stepImpl, step, delay, data)
         return this
@@ -30,7 +30,7 @@ object StepManager {
      * @param delay 步骤执行延迟时间，默认[Assists.Config.defaultStepDelay]
      * @param isBegin 是否是初始执行，true则会忽略[isStop]直接开始执行，false则会判断[isStop]是否停止
      */
-    fun <T : StepImpl> execute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: Any? = null, isBegin: Boolean = false) {
+    fun <T : StepImpl> execute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: StepData? = null, isBegin: Boolean = false) {
         if (isBegin) isStop = false
         if (isStop) return
         Log.d(Assists.Config.logTag, "execute->${stepImpl.name}:$step-delay:$delay")

assists/src/main/java/com/ven/assist/step/StepOperator.kt

@@ -1,7 +1,6 @@
 package com.ven.assist.step
 
 import android.os.CountDownTimer
-import android.util.Log
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ThreadUtils
 import com.ven.assist.Assists
@@ -17,15 +16,13 @@ class StepOperator(
     private var loopDownTimer: CountDownTimer? = null
     var loopSurplusTime: Long = 0
     var loopSurplusSecond: Float = 0f
-    var data: Any? = null
+    var data: StepData? = null
 
     fun execute(delay: Long) {
         if (StepManager.isStop) {
             Assists.ListenerManager.stepListener.forEach { it.onStepStop() }
             return
         }
-        Log.d(Assists.Config.logTag, "step->$clazzName:$step-delay:$delay")
-
         next?.let {
             if (loopDuration == 0L) {
                 ThreadUtils.runOnUiThreadDelayed({

graphics/1694582375808.png

@@ -7,6 +7,7 @@ import com.ven.assist.Assists
 import com.ven.assist.ext.click
 import com.ven.assist.ext.getBoundsInScreen
 import com.ven.assist.step.StepCollector
+import com.ven.assist.step.StepData
 import com.ven.assist.step.StepImpl
 import com.ven.assist.step.StepManager
 import com.ven.assist.ui.UIOperate
@@ -32,12 +33,12 @@ class ScrollContacts : StepImpl {
                 ) {
                     OverManager.log("已打开微信主页，点击【通讯录】")
                     it.parent.parent.click()
-                    StepManager.execute(this::class.java, Step.STEP_3, data = 1)
+                    StepManager.execute(this::class.java, Step.STEP_3, data = StepData(data = 1))
                     return@nextLoop true
                 }
             }
 
-            if (0f==it.loopSurplusSecond){
+            if (0f == it.loopSurplusSecond) {
                 StepManager.execute(this::class.java, Step.STEP_1)
             }
 
@@ -54,7 +55,7 @@ class ScrollContacts : StepImpl {
                         OverManager.log("停止滚动")
                         return@next
                     }
-                    StepManager.execute(this::class.java, Step.STEP_3, data = ((step.data as Int) + 1))
+                    StepManager.execute(this::class.java, Step.STEP_3, data = StepData(data = (step.data?.data as Int) + 1))
                     return@next
                 }
 
@@ -69,7 +70,7 @@ class ScrollContacts : StepImpl {
                         OverManager.log("停止滚动")
                         return@next
                     }
-                    StepManager.execute(this::class.java, Step.STEP_3, data = ((step.data as Int) + 1))
+                    StepManager.execute(this::class.java, Step.STEP_3, data = StepData(data = (step.data?.data as Int) + 1))
                     return@next
                 }
             }