mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 23:51:25 +08:00
change: handlerTapAbsXY
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v5.0.0-beta-2505071640
|
v5.0.0-beta-2505071715
|
||||||
|
|||||||
@@ -308,7 +308,7 @@ func (ad *ADBDriver) TapXY(x, y float64, opts ...option.ActionOption) error {
|
|||||||
func (ad *ADBDriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error {
|
func (ad *ADBDriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error {
|
||||||
log.Info().Float64("x", x).Float64("y", y).Msg("ADBDriver.TapAbsXY")
|
log.Info().Float64("x", x).Float64("y", y).Msg("ADBDriver.TapAbsXY")
|
||||||
var err error
|
var err error
|
||||||
x, y, _, err = handlerTapAbsXY(ad, x, y, opts...)
|
x, y, err = handlerTapAbsXY(ad, x, y, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -298,12 +298,17 @@ func (ud *UIA2Driver) TapAbsXY(x, y float64, opts ...option.ActionOption) error
|
|||||||
// register(postHandler, new Tap("/wd/hub/session/:sessionId/appium/tap"))
|
// register(postHandler, new Tap("/wd/hub/session/:sessionId/appium/tap"))
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
var duration float64
|
x, y, err = handlerTapAbsXY(ud, x, y, opts...)
|
||||||
x, y, duration, err = handlerTapAbsXY(ud, x, y, opts...)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
actionOptions := option.NewActionOptions(opts...)
|
||||||
|
duration := 100.0
|
||||||
|
if actionOptions.PressDuration > 0 {
|
||||||
|
duration = actionOptions.PressDuration * 1000 // convert to ms
|
||||||
|
}
|
||||||
|
|
||||||
data := map[string]interface{}{
|
data := map[string]interface{}{
|
||||||
"actions": []interface{}{
|
"actions": []interface{}{
|
||||||
map[string]interface{}{
|
map[string]interface{}{
|
||||||
|
|||||||
@@ -524,12 +524,17 @@ func (wd *BrowserDriver) Tap(x, y float64, options ...option.ActionOption) error
|
|||||||
|
|
||||||
func (wd *BrowserDriver) TapFloat(x, y float64, opts ...option.ActionOption) error {
|
func (wd *BrowserDriver) TapFloat(x, y float64, opts ...option.ActionOption) error {
|
||||||
var err error
|
var err error
|
||||||
var duration float64
|
x, y, err = handlerTapAbsXY(wd, x, y, opts...)
|
||||||
x, y, duration, err = handlerTapAbsXY(wd, x, y, opts...)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
actionOptions := option.NewActionOptions(opts...)
|
||||||
|
duration := 0.1
|
||||||
|
if actionOptions.Duration > 0 {
|
||||||
|
duration = actionOptions.Duration
|
||||||
|
}
|
||||||
|
|
||||||
data := map[string]interface{}{
|
data := map[string]interface{}{
|
||||||
"x": x,
|
"x": x,
|
||||||
"y": y,
|
"y": y,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func handlerTapAbsXY(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) (
|
func handlerTapAbsXY(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) (
|
||||||
x, y, duration float64, err error) {
|
x, y float64, err error) {
|
||||||
|
|
||||||
actionOptions := option.NewActionOptions(opts...)
|
actionOptions := option.NewActionOptions(opts...)
|
||||||
x, y = actionOptions.ApplyTapOffset(rawX, rawY)
|
x, y = actionOptions.ApplyTapOffset(rawX, rawY)
|
||||||
@@ -18,12 +18,7 @@ func handlerTapAbsXY(driver IDriver, rawX, rawY float64, opts ...option.ActionOp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
duration = 100.0
|
return x, y, nil
|
||||||
if actionOptions.PressDuration > 0 {
|
|
||||||
duration = actionOptions.PressDuration * 1000 // convert to ms
|
|
||||||
}
|
|
||||||
|
|
||||||
return x, y, duration, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func handlerDoubleTap(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) (
|
func handlerDoubleTap(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) (
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ func (hd *HDCDriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error {
|
|||||||
log.Info().Float64("x", x).Float64("y", y).Msg("HDCDriver.TapAbsXY")
|
log.Info().Float64("x", x).Float64("y", y).Msg("HDCDriver.TapAbsXY")
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
x, y, _, err = handlerTapAbsXY(hd, x, y, opts...)
|
x, y, err = handlerTapAbsXY(hd, x, y, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -598,7 +598,7 @@ func (wd *WDADriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error {
|
|||||||
y = wd.toScale(y)
|
y = wd.toScale(y)
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
x, y, _, err = handlerTapAbsXY(wd, x, y, opts...)
|
x, y, err = handlerTapAbsXY(wd, x, y, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user