diff --git a/go.mod b/go.mod index b377436f..e339e828 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 toolchain go1.22.7 require ( - code.byted.org/iesqa/ghdc v0.0.0-20240925072739-7441749ee5a7 + code.byted.org/iesqa/ghdc v0.0.0-20241011071205-a1bec975e48c github.com/andybalholm/brotli v1.0.4 github.com/denisbrodbeck/machineid v1.0.1 github.com/fatih/color v1.16.0 diff --git a/go.sum b/go.sum index 7ff72c1b..b53ce5de 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,14 @@ code.byted.org/iesqa/ghdc v0.0.0-20240920083733-6b2acbe67b03 h1:VddSSSko1t4Z9LIC code.byted.org/iesqa/ghdc v0.0.0-20240920083733-6b2acbe67b03/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= code.byted.org/iesqa/ghdc v0.0.0-20240925072739-7441749ee5a7 h1:QX1dADVurN1suyofdznrDEdz8QCRIGd2h/jU5xkGcQU= code.byted.org/iesqa/ghdc v0.0.0-20240925072739-7441749ee5a7/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= +code.byted.org/iesqa/ghdc v0.0.0-20240930033019-572b6e5ca845 h1:AiHYk33kEbDC3+lIvGj0WJx47JvmuX27pOmWdd2/zAc= +code.byted.org/iesqa/ghdc v0.0.0-20240930033019-572b6e5ca845/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= +code.byted.org/iesqa/ghdc v0.0.0-20241008133702-1c71219a0303 h1:98fx5eC2fYzZKL48QMT1ykxBHii3JhY/b7QBFEpsC/8= +code.byted.org/iesqa/ghdc v0.0.0-20241008133702-1c71219a0303/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= +code.byted.org/iesqa/ghdc v0.0.0-20241009130937-5efa701d3f56 h1:KolYCn3C/sgWUotywSO4L/8r4lOAgP/2bh6YeIofOJY= +code.byted.org/iesqa/ghdc v0.0.0-20241009130937-5efa701d3f56/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= +code.byted.org/iesqa/ghdc v0.0.0-20241011071205-a1bec975e48c h1:MagwhUnFDkOB/feAUSagsFQuaiqmZDBY0fFvs1tj8uU= +code.byted.org/iesqa/ghdc v0.0.0-20241011071205-a1bec975e48c/go.mod h1:C2kq6TTE+JAOnqDorSwae1MQzRuex03RshuSUC2U/FY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index fd5fd55f..ddbf4348 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2410161536 +v5.0.0-beta-2410161545 diff --git a/hrp/pkg/uixt/harmony_hdc_driver.go b/hrp/pkg/uixt/harmony_hdc_driver.go index 76f8462f..606078e9 100644 --- a/hrp/pkg/uixt/harmony_hdc_driver.go +++ b/hrp/pkg/uixt/harmony_hdc_driver.go @@ -22,6 +22,7 @@ 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" ) @@ -103,10 +104,11 @@ func (hd *hdcDriver) Unlock() (err error) { } re := regexp.MustCompile(`powerstatus=([\w_]+)`) match := re.FindStringSubmatch(screenInfo) + log.Info().Msg("screen info: " + screenInfo) if len(match) <= 1 { return fmt.Errorf("failed to unlock; failed to find powerstatus") } - if match[1] == string(POWER_STATUS_SUSPEND) { + if match[1] == string(POWER_STATUS_SUSPEND) || match[1] == string(POWER_STATUS_OFF) { err = hd.uiDriver.PressPowerKey() if err != nil { return err