From 1e53669a51c15742cc35759f2d129b975be8146b Mon Sep 17 00:00:00 2001
From: xucong053 <xucong053@outlook.com>
Date: Fri, 30 Sep 2022 15:07:31 +0800
Subject: [PATCH] fix: update action interface of Android automation

---
 hrp/step_android_ui.go | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/hrp/step_android_ui.go b/hrp/step_android_ui.go
index 4db318e7..80f5122a 100644
--- a/hrp/step_android_ui.go
+++ b/hrp/step_android_ui.go
@@ -138,11 +138,16 @@ func (s *StepAndroid) TapAbsXY(x, y float64, options ...uixt.ActionOption) *Step
 	return &StepAndroid{step: s.step}
 }
 
-func (s *StepAndroid) Tap(params interface{}) *StepAndroid {
-	s.step.Android.Actions = append(s.step.Android.Actions, uixt.MobileAction{
+// Tap taps on the target element
+func (s *StepAndroid) Tap(params string, options ...uixt.ActionOption) *StepAndroid {
+	action := uixt.MobileAction{
 		Method: uixt.ACTION_Tap,
 		Params: params,
-	})
+	}
+	for _, option := range options {
+		option(&action)
+	}
+	s.step.Android.Actions = append(s.step.Android.Actions, action)
 	return &StepAndroid{step: s.step}
 }
 
@@ -244,11 +249,36 @@ func (s *StepAndroid) SwipeRight(options ...uixt.ActionOption) *StepAndroid {
 	return &StepAndroid{step: s.step}
 }
 
-func (s *StepAndroid) Input(text string) *StepAndroid {
-	s.step.Android.Actions = append(s.step.Android.Actions, uixt.MobileAction{
+func (s *StepAndroid) Input(text string, options ...uixt.ActionOption) *StepAndroid {
+	action := uixt.MobileAction{
 		Method: uixt.ACTION_Input,
 		Params: text,
-	})
+	}
+	for _, option := range options {
+		option(&action)
+	}
+	s.step.Android.Actions = append(s.step.Android.Actions, action)
+	return &StepAndroid{step: s.step}
+}
+
+// Times specify running times for run last action
+func (s *StepAndroid) Times(n int) *StepAndroid {
+	if n <= 0 {
+		log.Warn().Int("n", n).Msg("times should be positive, set to 1")
+		n = 1
+	}
+
+	actionsTotal := len(s.step.Android.Actions)
+	if actionsTotal == 0 {
+		return s
+	}
+
+	// actionsTotal >=1 && n >= 1
+	lastAction := s.step.Android.Actions[actionsTotal-1 : actionsTotal][0]
+	for i := 0; i < n-1; i++ {
+		// duplicate last action n-1 times
+		s.step.Android.Actions = append(s.step.Android.Actions, lastAction)
+	}
 	return &StepAndroid{step: s.step}
 }