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

fix: NewHDCDriver

Browse Source
This commit is contained in:
lilong.129
2025-02-10 22:39:19 +08:00
parent 7b16ad62ee
commit 3cb2eac442
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/version/VERSION
+1 -1
View File
@@ -1 +1 @@
v5.0.0+2502102232 v5.0.0+2502102239
pkg/uixt/harmony_driver_hdc.go
+26 -23
View File
@@ -15,33 +15,28 @@ import (
"github.com/httprunner/httprunner/v5/pkg/uixt/types" "github.com/httprunner/httprunner/v5/pkg/uixt/types"
) )
type HDCDriver struct { func NewHDCDriver(device *HarmonyDevice) (*HDCDriver, error) {
*HarmonyDevice driver := &HDCDriver{
*Session Device: device,
*DriverExt }
points []ExportPoint driver.InitSession(nil)
uiDriver *ghdc.UIDriver
}
type PowerStatus string
const (
POWER_STATUS_SUSPEND PowerStatus = "POWER_STATUS_SUSPEND"
POWER_STATUS_OFF PowerStatus = "POWER_STATUS_OFF"
POWER_STATUS_ON PowerStatus = "POWER_STATUS_ON"
)
func NewHDCDriver(device *HarmonyDevice) (driver *HDCDriver, err error) {
driver = new(HDCDriver)
driver.HarmonyDevice = device
uiDriver, err := ghdc.NewUIDriver(*device.Device) uiDriver, err := ghdc.NewUIDriver(*device.Device)
if err != nil { if err != nil {
log.Error().Err(err).Msg("failed to new harmony ui driver") log.Error().Err(err).Msg("failed to new harmony ui driver")
return nil, err return nil, err
} }
driver.uiDriver = uiDriver driver.uiDriver = uiDriver
driver.InitSession(nil)
return return driver, nil
}
type HDCDriver struct {
Device *HarmonyDevice
Session *Session
points []ExportPoint
uiDriver *ghdc.UIDriver
} }
func (hd *HDCDriver) InitSession(capabilities option.Capabilities) error { func (hd *HDCDriver) InitSession(capabilities option.Capabilities) error {
@@ -64,7 +59,7 @@ func (hd *HDCDriver) Status() (types.DeviceStatus, error) {
} }
func (hd *HDCDriver) GetDevice() IDevice { func (hd *HDCDriver) GetDevice() IDevice {
return hd.HarmonyDevice return hd.Device
} }
func (hd *HDCDriver) DeviceInfo() (types.DeviceInfo, error) { func (hd *HDCDriver) DeviceInfo() (types.DeviceInfo, error) {
@@ -98,9 +93,17 @@ func (hd *HDCDriver) Homescreen() error {
return hd.uiDriver.PressKey(ghdc.KEYCODE_HOME) return hd.uiDriver.PressKey(ghdc.KEYCODE_HOME)
} }
type PowerStatus string
const (
POWER_STATUS_SUSPEND PowerStatus = "POWER_STATUS_SUSPEND"
POWER_STATUS_OFF PowerStatus = "POWER_STATUS_OFF"
POWER_STATUS_ON PowerStatus = "POWER_STATUS_ON"
)
func (hd *HDCDriver) Unlock() (err error) { func (hd *HDCDriver) Unlock() (err error) {
// Todo 检查是否锁屏 hdc shell hidumper -s RenderService -a screen // Todo 检查是否锁屏 hdc shell hidumper -s RenderService -a screen
screenInfo, err := hd.RunShellCommand("hidumper", "-s", "RenderService", "-a", "screen") screenInfo, err := hd.Device.RunShellCommand("hidumper", "-s", "RenderService", "-a", "screen")
if err != nil { if err != nil {
return err return err
} }
@@ -126,7 +129,7 @@ func (hd *HDCDriver) AppLaunch(packageName string) error {
} }
func (hd *HDCDriver) AppTerminate(packageName string) (bool, error) { func (hd *HDCDriver) AppTerminate(packageName string) (bool, error) {
_, err := hd.RunShellCommand("aa", "force-stop", packageName) _, err := hd.Device.RunShellCommand("aa", "force-stop", packageName)
if err != nil { if err != nil {
log.Error().Err(err).Msg("failed to terminal app") log.Error().Err(err).Msg("failed to terminal app")
return false, err return false, err