From 4c29906f6d43b9033591a1529ad655fd9f07a47d Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Thu, 19 Jan 2023 08:59:17 +0800
Subject: [PATCH] fix: err wrap and TapFloat

---
 hrp/pkg/uixt/android_adb_driver.go | 7 +++++++
 hrp/runner.go                      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hrp/pkg/uixt/android_adb_driver.go b/hrp/pkg/uixt/android_adb_driver.go
index 5c80e1ef..50eed4c7 100644
--- a/hrp/pkg/uixt/android_adb_driver.go
+++ b/hrp/pkg/uixt/android_adb_driver.go
@@ -180,6 +180,13 @@ func (ad *adbDriver) Tap(x, y int, options ...DataOption) error {
 }
 
 func (ad *adbDriver) TapFloat(x, y float64, options ...DataOption) (err error) {
+	dataOptions := NewDataOptions(options...)
+
+	if len(dataOptions.Offset) == 2 {
+		x += float64(dataOptions.Offset[0])
+		y += float64(dataOptions.Offset[1])
+	}
+
 	// adb shell input tap x y
 	_, err = ad.adbClient.RunShellCommand(
 		"input", "tap", fmt.Sprintf("%.1f", x), fmt.Sprintf("%.1f", y))
diff --git a/hrp/runner.go b/hrp/runner.go
index 34a50a7b..7db22482 100644
--- a/hrp/runner.go
+++ b/hrp/runner.go
@@ -559,7 +559,7 @@ func (r *SessionRunner) Start(givenVars map[string]interface{}) error {
 
 		// check if failfast
 		if r.caseRunner.hrpRunner.failfast {
-			return errors.New("abort running due to failfast setting")
+			return errors.Wrap(err, "abort running due to failfast setting")
 		}
 	}