feat: 修改初始执行方法，统一使用StepManager.execute执行步骤

Author: Ven

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

@@ -17,20 +17,21 @@ object StepManager {
      * @param step 步骤序号
      * @param delay 步骤执行延迟时间，默认[Assists.Config.defaultStepDelay]
      */
-    fun <T : StepImpl> beginExecute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay): StepManager {
+    private fun <T : StepImpl> beginExecute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: Any? = null): StepManager {
         isStop = false
-        execute(stepImpl, step, delay)
+        execute(stepImpl, step, delay, data)
         return this
     }
 
     /**
-     * 执行步骤，如果是开始位置请使用[beginExecute]
+     * 执行步骤
      * @param stepImpl 执行的业务实现类
      * @param step 步骤序号
      * @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) {
-        if (isStop) return
+    fun <T : StepImpl> execute(stepImpl: Class<T>, step: Int, delay: Long = Assists.Config.defaultStepDelay, data: Any? = null, isBegin: Boolean = false) {
+        if (isStop && !isBegin) return
         LogUtils.d("execute->${stepImpl.name}:$step", "delay:$delay")
         stepCollector[stepImpl.name] ?: register(stepImpl)
         stepCollector[stepImpl.name]?.get(step)?.let {

simple/build.gradle

@@ -43,10 +43,10 @@ android {
 }
 
 dependencies {
-//    implementation project(':assists')
+    implementation project(':assists')
     implementation project(':base')
     implementation "androidx.room:room-runtime:2.4.3"
     implementation 'androidx.room:room-ktx:2.4.3'
     implementation 'com.github.mrmike:ok2curl:0.8.0'
-    implementation 'com.github.ven-coder:assists:1.0.1'
+//    implementation 'com.github.ven-coder:assists:1.0.1'
 }

simple/src/main/java/com/ven/assists/simple/OverManager.kt

@@ -36,11 +36,11 @@ object OverManager : Assists.ListenerManager.StepListener, Assists.ListenerManag
                         }
                         btnOpenSocial.setOnClickListener {
                             beginStart(this)
-                            StepManager.beginExecute(OpenWechatSocial::class.java, Step.STEP_1)
+                            StepManager.execute(OpenWechatSocial::class.java, Step.STEP_1, isBegin = true)
                         }
                         btnPublishSocial.setOnClickListener {
                             beginStart(this)
-                            StepManager.beginExecute(PublishSocial::class.java, Step.STEP_1)
+                            StepManager.execute(PublishSocial::class.java, Step.STEP_1, isBegin = true)
                         }
                         btnStop.setOnClickListener {
                             stop()
@@ -56,15 +56,15 @@ object OverManager : Assists.ListenerManager.StepListener, Assists.ListenerManag
                         }
                         btnScrollContacts.setOnClickListener {
                             beginStart(this)
-                            StepManager.beginExecute(ScrollContacts::class.java, Step.STEP_1)
+                            StepManager.execute(ScrollContacts::class.java, Step.STEP_1, isBegin = true)
                         }
                         btnClickBottomTab.setOnClickListener {
                             beginStart(this)
-                            StepManager.beginExecute(GestureBottomTab::class.java, Step.STEP_1)
+                            StepManager.execute(GestureBottomTab::class.java, Step.STEP_1, isBegin = true)
                         }
                         btnScrollSocial.setOnClickListener {
                             beginStart(this)
-                            StepManager.beginExecute(GestureScrollSocial::class.java, Step.STEP_1)
+                            StepManager.execute(GestureScrollSocial::class.java, Step.STEP_1, isBegin = true)
                         }
                     }
                 }