From 0ccac86957e82447ac8779e866ef3bc944b061bf Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Tue, 5 Nov 2024 14:58:19 +0800
Subject: [PATCH] change: move TapRequest Duration to Options

---
 hrp/internal/version/VERSION |  2 +-
 hrp/pkg/server/model.go      |  3 +--
 hrp/pkg/server/server.go     | 37 ++++++++++++++++++------------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION
index 79aa52a7..99d2d9b8 100644
--- a/hrp/internal/version/VERSION
+++ b/hrp/internal/version/VERSION
@@ -1 +1 @@
-v5.0.0+2411051453
+v5.0.0+2411051500
diff --git a/hrp/pkg/server/model.go b/hrp/pkg/server/model.go
index 03a210e8..92aa97f3 100644
--- a/hrp/pkg/server/model.go
+++ b/hrp/pkg/server/model.go
@@ -13,8 +13,7 @@ type TapRequest struct {
 	Y    float64 `json:"y"`
 	Text string  `json:"text"`
 
-	Duration float64             `json:"duration"` // move to options
-	Options  *uixt.ActionOptions `json:"options,omitempty"`
+	Options *uixt.ActionOptions `json:"options,omitempty"`
 }
 
 type DragRequest struct {
diff --git a/hrp/pkg/server/server.go b/hrp/pkg/server/server.go
index db1c2179..ae1df64b 100644
--- a/hrp/pkg/server/server.go
+++ b/hrp/pkg/server/server.go
@@ -43,7 +43,7 @@ func NewServer(port int) error {
 }
 
 func pingHandler(c *gin.Context) {
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func listDeviceHandler(c *gin.Context) {
@@ -144,12 +144,13 @@ func tapHandler(c *gin.Context) {
 		return
 	}
 
+	var actionOptions []uixt.ActionOption
+	if tapReq.Options != nil {
+		actionOptions = tapReq.Options.Options()
+	}
+
 	dExt := driverObj.(*uixt.DriverExt)
 	if tapReq.Text != "" {
-		var actionOptions []uixt.ActionOption
-		if tapReq.Options != nil {
-			actionOptions = tapReq.Options.Options()
-		}
 		err := dExt.TapByOCR(tapReq.Text, actionOptions...)
 		if err != nil {
 			log.Err(err).Msg(fmt.Sprintf("[%s]: failed to tap text %s", c.HandlerName(), tapReq.Text))
@@ -163,7 +164,7 @@ func tapHandler(c *gin.Context) {
 			return
 		}
 	} else if tapReq.X < 1 && tapReq.Y < 1 {
-		err := dExt.TapXY(tapReq.X, tapReq.Y, uixt.WithPressDuration(tapReq.Duration))
+		err := dExt.TapXY(tapReq.X, tapReq.Y, actionOptions...)
 		if err != nil {
 			log.Err(err).Msg(fmt.Sprintf("[%s]: failed to tap %f, %f", c.HandlerName(), tapReq.X, tapReq.Y))
 			c.JSON(http.StatusInternalServerError,
@@ -176,7 +177,7 @@ func tapHandler(c *gin.Context) {
 			return
 		}
 	} else {
-		err := dExt.TapAbsXY(tapReq.X, tapReq.Y, uixt.WithPressDuration(tapReq.Duration))
+		err := dExt.TapAbsXY(tapReq.X, tapReq.Y, actionOptions...)
 		if err != nil {
 			log.Err(err).Msg(fmt.Sprintf("[%s]: failed to tap %f, %f", c.HandlerName(), tapReq.X, tapReq.Y))
 			c.JSON(http.StatusInternalServerError,
@@ -189,7 +190,7 @@ func tapHandler(c *gin.Context) {
 			return
 		}
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func dragHandler(c *gin.Context) {
@@ -236,7 +237,7 @@ func dragHandler(c *gin.Context) {
 			return
 		}
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func inputHandler(c *gin.Context) {
@@ -268,7 +269,7 @@ func inputHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func unlockHandler(c *gin.Context) {
@@ -293,7 +294,7 @@ func unlockHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func homeHandler(c *gin.Context) {
@@ -318,7 +319,7 @@ func homeHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func keycodeHandler(c *gin.Context) {
@@ -350,7 +351,7 @@ func keycodeHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func foregroundAppHandler(c *gin.Context) {
@@ -408,7 +409,7 @@ func clearAppHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func launchAppHandler(c *gin.Context) {
@@ -440,7 +441,7 @@ func launchAppHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func terminalAppHandler(c *gin.Context) {
@@ -472,7 +473,7 @@ func terminalAppHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func screenshotHandler(c *gin.Context) {
@@ -593,7 +594,7 @@ func loginHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 func logoutHandler(c *gin.Context) {
@@ -626,7 +627,7 @@ func logoutHandler(c *gin.Context) {
 		c.Abort()
 		return
 	}
-	c.JSON(http.StatusOK, HttpResponse{Result: true})
+	c.JSON(http.StatusOK, HttpResponse{Code: 0, Message: "success"})
 }
 
 var uiClients = make(map[string]*uixt.DriverExt) // UI automation clients for iOS and Android, key is udid/serial