From 9acdb4332ee7bdec9a478698d7b99c3c48d213dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Thu, 26 Sep 2024 22:47:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hrp/internal/version/VERSION | 2 +- hrp/pkg/uixt/harmony_hdc_driver.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 8219c475..fd14f88e 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2409252253 +v5.0.0-beta-2409262247 diff --git a/hrp/pkg/uixt/harmony_hdc_driver.go b/hrp/pkg/uixt/harmony_hdc_driver.go index 76f8462f..441ad4db 100644 --- a/hrp/pkg/uixt/harmony_hdc_driver.go +++ b/hrp/pkg/uixt/harmony_hdc_driver.go @@ -103,6 +103,7 @@ 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") } From 6125115625cc3d4d87427026e07869b992f118ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Mon, 30 Sep 2024 11:34:47 +0800 Subject: [PATCH 2/6] feat: update ghdc --- go.mod | 2 +- go.sum | 2 ++ hrp/internal/version/VERSION | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b377436f..15500347 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-20240930033019-572b6e5ca845 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..e315264b 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,8 @@ 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= 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 dd109c0f..014aa82a 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2409271506 +v5.0.0-beta-2409301134 From dad3919a70980555e02308f041254cb9a2935a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Mon, 30 Sep 2024 17:09:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=94=81?= =?UTF-8?q?=E5=B1=8F=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hrp/internal/version/VERSION | 2 +- hrp/pkg/uixt/harmony_hdc_driver.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 014aa82a..f9d881b4 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2409301134 +v4.6.8 diff --git a/hrp/pkg/uixt/harmony_hdc_driver.go b/hrp/pkg/uixt/harmony_hdc_driver.go index 441ad4db..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" ) @@ -107,7 +108,7 @@ func (hd *hdcDriver) Unlock() (err error) { 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 From aae910acecf12763fb75d3bd30c5679416875099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Tue, 8 Oct 2024 21:59:35 +0800 Subject: [PATCH 4/6] feat: update ghdc --- go.mod | 2 +- go.sum | 2 ++ hrp/internal/version/VERSION | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 15500347..202f90fa 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-20240930033019-572b6e5ca845 + code.byted.org/iesqa/ghdc v0.0.0-20241008133702-1c71219a0303 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 e315264b..397fa77b 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,8 @@ code.byted.org/iesqa/ghdc v0.0.0-20240925072739-7441749ee5a7 h1:QX1dADVurN1suyof 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= 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 f9d881b4..eea8274a 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.6.8 +v4.6.9 \ No newline at end of file From e0a05a91c6eed2531c2adece916a1444eb35011f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Wed, 9 Oct 2024 21:17:45 +0800 Subject: [PATCH 5/6] feat: update ghdc --- go.mod | 2 +- go.sum | 2 ++ hrp/internal/version/VERSION | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 202f90fa..2cb030e6 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-20241008133702-1c71219a0303 + code.byted.org/iesqa/ghdc v0.0.0-20241009130937-5efa701d3f56 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 397fa77b..590eeebe 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,8 @@ code.byted.org/iesqa/ghdc v0.0.0-20240930033019-572b6e5ca845 h1:AiHYk33kEbDC3+lI 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= 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 eea8274a..b3301444 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.6.9 \ No newline at end of file +v4.6.10 \ No newline at end of file From cf1868a94804d4a1bc911d25363a1d78aafa5092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= Date: Tue, 15 Oct 2024 10:42:53 +0800 Subject: [PATCH 6/6] feat: update ghdc --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2cb030e6..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-20241009130937-5efa701d3f56 + 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 590eeebe..b53ce5de 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,8 @@ code.byted.org/iesqa/ghdc v0.0.0-20241008133702-1c71219a0303 h1:98fx5eC2fYzZKL48 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=