From dcd252f8023dbb626c12a781a0333370c649f245 Mon Sep 17 00:00:00 2001
From: "lilong.129" <lilong.129@bytedance.com>
Date: Thu, 19 Dec 2024 13:25:36 +0800
Subject: [PATCH] feat: add Init for driver

---
 hrp/internal/version/VERSION   |  2 +-
 hrp/pkg/uixt/android_device.go |  7 -------
 hrp/pkg/uixt/ext.go            | 11 +++++++++++
 hrp/runner.go                  |  9 +++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION
index f83ba795..c1c84bcc 100644
--- a/hrp/internal/version/VERSION
+++ b/hrp/internal/version/VERSION
@@ -1 +1 @@
-v5.0.0+2412191212
+v5.0.0+2412191325
diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go
index d9d0d15b..6cce84f6 100644
--- a/hrp/pkg/uixt/android_device.go
+++ b/hrp/pkg/uixt/android_device.go
@@ -193,13 +193,6 @@ func (dev *AndroidDevice) Options() (deviceOptions []AndroidDeviceOption) {
 func (dev *AndroidDevice) Init() error {
 	dev.d.RunShellCommand("ime", "enable", UnicodeImePackageName)
 	dev.d.RunShellCommand("rm", "-r", config.DeviceActionLogFilePath)
-	// Notice: brighten should be executed before unlock
-	// brighten android device screen
-	dev.d.RunShellCommand("input", "keyevent", fmt.Sprintf("%d", KCWakeup))
-	// unlock android device screen
-	dev.d.RunShellCommand("input", "keyevent", fmt.Sprintf("%d", KCMenu))
-	// swipe up to unlock
-	dev.d.RunShellCommand("input", "swipe", "540", "1000", "540", "500")
 
 	if dev.UIA2 {
 		// uiautomator2 server must be started before
diff --git a/hrp/pkg/uixt/ext.go b/hrp/pkg/uixt/ext.go
index ba3ce12b..0003bbf5 100644
--- a/hrp/pkg/uixt/ext.go
+++ b/hrp/pkg/uixt/ext.go
@@ -53,6 +53,17 @@ func newDriverExt(device IDevice, driver IWebDriver, options ...DriverOption) (d
 	return dExt, nil
 }
 
+func (dExt *DriverExt) Init() error {
+	// unlock device screen
+	err := dExt.Driver.Unlock()
+	if err != nil {
+		log.Error().Err(err).Msg("unlock device screen failed")
+		return err
+	}
+
+	return nil
+}
+
 func (dExt *DriverExt) assertOCR(text, assert string) error {
 	var options []ActionOption
 	options = append(options, WithScreenShotFileName(fmt.Sprintf("assert_ocr_%s", text)))
diff --git a/hrp/runner.go b/hrp/runner.go
index 8507e0d7..e14ec2cb 100644
--- a/hrp/runner.go
+++ b/hrp/runner.go
@@ -426,6 +426,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
 		if err != nil {
 			return nil, err
 		}
+		if err := driver.Init(); err != nil {
+			return nil, err
+		}
 		r.uixtDrivers[device.SerialNumber] = driver
 	}
 	// parse iOS devices config
@@ -446,6 +449,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
 		if err != nil {
 			return nil, err
 		}
+		if err := driver.Init(); err != nil {
+			return nil, err
+		}
 		r.uixtDrivers[device.UDID] = driver
 	}
 	// parse harmony devices config
@@ -466,6 +472,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
 		if err != nil {
 			return nil, err
 		}
+		if err := driver.Init(); err != nil {
+			return nil, err
+		}
 		r.uixtDrivers[device.ConnectKey] = driver
 	}