GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 07:26:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: screenshot

Browse Source
This commit is contained in:
debugtalk
2022-09-26 16:01:03 +08:00
parent 58289557b6
commit 1ecea74214
7 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/internal/uixt/android_device.go
+6 -6
View File
@@ -101,7 +101,7 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
}
device.SerialNumber = dev.Serial()
device.Device = dev
device.d = dev
return device, nil
}
@@ -109,7 +109,7 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
}
type AndroidDevice struct {
gadb.Device
d gadb.Device
SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"`
IP string `json:"ip,omitempty" yaml:"ip,omitempty"`
Port int `json:"port,omitempty" yaml:"port,omitempty"`
@@ -136,17 +136,17 @@ func (dev *AndroidDevice) NewUSBDriver(capabilities Capabilities) (driver *uiaDr
if localPort, err = getFreePort(); err != nil {
return nil, err
}
if err = dev.Forward(localPort, UIA2ServerPort); err != nil {
if err = dev.d.Forward(localPort, UIA2ServerPort); err != nil {
return nil, err
}
rawURL := fmt.Sprintf("http://%s%d:6790/wd/hub", forwardToPrefix, localPort)
driver, err = NewUIADriver(capabilities, rawURL)
if err != nil {
_ = dev.ForwardKill(localPort)
_ = dev.d.ForwardKill(localPort)
return nil, err
}
driver.adbDevice = dev.Device
driver.adbDevice = dev.d
driver.localPort = localPort
conn, err := net.Dial("tcp", fmt.Sprintf(":%d", localPort))
@@ -165,7 +165,7 @@ func (dev *AndroidDevice) NewHTTPDriver(capabilities Capabilities) (driver *uiaD
if driver, err = NewUIADriver(capabilities, rawURL); err != nil {
return nil, err
}
driver.adbDevice = dev.Device
driver.adbDevice = dev.d
return driver, nil
}