GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: tap with options for hrp ui server

Browse Source
This commit is contained in:
lilong.129
2024-11-04 19:21:23 +08:00
parent 6fb99114f4
commit dd247815bd
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0+2411041802
v5.0.0+2411041921

12
hrp/pkg/server/model.go
View File

@@ -1,5 +1,7 @@
package server
import "github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
type HttpResponse struct {
Result interface{} `json:"result,omitempty"`
ErrorCode int `json:"errorCode"`
@@ -7,10 +9,12 @@ type HttpResponse struct {
}
type TapRequest struct {
X float64 `json:"x"`
Y float64 `json:"y"`
Duration float64 `json:"duration"`
Text string `json:"text"`
X float64 `json:"x"`
Y float64 `json:"y"`
Text string `json:"text"`
Duration float64 `json:"duration"` // move to options
Options *uixt.ActionOptions `json:"options,omitempty"`
}
type DragRequest struct {

27
hrp/pkg/server/server.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/code"
"github.com/httprunner/httprunner/v4/hrp/pkg/gadb"
"github.com/httprunner/httprunner/v4/hrp/pkg/uixt"
)
@@ -125,14 +126,18 @@ func tapHandler(c *gin.Context) {
dExt := driverObj.(*uixt.DriverExt)
if tapReq.Text != "" {
err := dExt.TapByOCR(tapReq.Text, uixt.WithPressDuration(tapReq.Duration))
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))
c.JSON(http.StatusInternalServerError,
HttpResponse{
Result: false,
ErrorCode: InternalServerErrorCode,
ErrorMsg: InternalServerErrorMsg,
ErrorCode: code.GetErrorCode(err),
ErrorMsg: err.Error(),
},
)
c.Abort()
@@ -142,7 +147,13 @@ func tapHandler(c *gin.Context) {
err := dExt.TapXY(tapReq.X, tapReq.Y, uixt.WithPressDuration(tapReq.Duration))
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, HttpResponse{Result: false, ErrorCode: InternalServerErrorCode, ErrorMsg: InternalServerErrorMsg})
c.JSON(http.StatusInternalServerError,
HttpResponse{
Result: false,
ErrorCode: code.GetErrorCode(err),
ErrorMsg: err.Error(),
},
)
c.Abort()
return
}
@@ -150,7 +161,13 @@ func tapHandler(c *gin.Context) {
err := dExt.TapAbsXY(tapReq.X, tapReq.Y, uixt.WithPressDuration(tapReq.Duration))
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, HttpResponse{Result: false, ErrorCode: InternalServerErrorCode, ErrorMsg: InternalServerErrorMsg})
c.JSON(http.StatusInternalServerError,
HttpResponse{
Result: false,
ErrorCode: code.GetErrorCode(err),
ErrorMsg: err.Error(),
},
)
c.Abort()
return
}