From a64151361d92b78342607271691560a5a2cfe922 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Sat, 26 Nov 2022 21:27:49 +0800
Subject: [PATCH] change: rename DeviceLogcat to AdbLogcat

---
 hrp/pkg/uixt/android_device.go | 20 +++++++++++---------
 hrp/pkg/uixt/android_driver.go |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go
index e86206c6..6391dfac 100644
--- a/hrp/pkg/uixt/android_device.go
+++ b/hrp/pkg/uixt/android_device.go
@@ -68,6 +68,8 @@ func GetAndroidDeviceOptions(dev *AndroidDevice) (deviceOptions []AndroidDeviceO
 	return
 }
 
+// uiautomator2 server must be started before
+// adb shell am instrument -w io.appium.uiautomator2.server.test/androidx.test.runner.AndroidJUnitRunner
 func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, err error) {
 	deviceList, err := DeviceList()
 	if err != nil {
@@ -114,7 +116,7 @@ func DeviceList() (devices []gadb.Device, err error) {
 
 type AndroidDevice struct {
 	d            gadb.Device
-	logcat       *DeviceLogcat
+	logcat       *AdbLogcat
 	SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"`
 	IP           string `json:"ip,omitempty" yaml:"ip,omitempty"`
 	Port         int    `json:"port,omitempty" yaml:"port,omitempty"`
@@ -201,7 +203,7 @@ func getFreePort() (int, error) {
 	return l.Addr().(*net.TCPAddr).Port, nil
 }
 
-type DeviceLogcat struct {
+type AdbLogcat struct {
 	serial    string
 	logBuffer *bytes.Buffer
 	errs      []error
@@ -210,8 +212,8 @@ type DeviceLogcat struct {
 	cmd       *exec.Cmd
 }
 
-func NewAdbLogcat(serial string) *DeviceLogcat {
-	return &DeviceLogcat{
+func NewAdbLogcat(serial string) *AdbLogcat {
+	return &AdbLogcat{
 		serial:    serial,
 		logBuffer: new(bytes.Buffer),
 		stopping:  make(chan struct{}),
@@ -220,7 +222,7 @@ func NewAdbLogcat(serial string) *DeviceLogcat {
 }
 
 // CatchLogcatContext starts logcat with timeout context
-func (l *DeviceLogcat) CatchLogcatContext(timeoutCtx context.Context) (err error) {
+func (l *AdbLogcat) CatchLogcatContext(timeoutCtx context.Context) (err error) {
 	if err = l.CatchLogcat(); err != nil {
 		return
 	}
@@ -234,7 +236,7 @@ func (l *DeviceLogcat) CatchLogcatContext(timeoutCtx context.Context) (err error
 	return
 }
 
-func (l *DeviceLogcat) Stop() error {
+func (l *AdbLogcat) Stop() error {
 	select {
 	case <-l.stopping:
 	default:
@@ -245,7 +247,7 @@ func (l *DeviceLogcat) Stop() error {
 	return l.Errors()
 }
 
-func (l *DeviceLogcat) Errors() (err error) {
+func (l *AdbLogcat) Errors() (err error) {
 	for _, e := range l.errs {
 		if err != nil {
 			err = fmt.Errorf("%v |[DeviceLogcatErr] %v", err, e)
@@ -256,7 +258,7 @@ func (l *DeviceLogcat) Errors() (err error) {
 	return
 }
 
-func (l *DeviceLogcat) CatchLogcat() (err error) {
+func (l *AdbLogcat) CatchLogcat() (err error) {
 	if l.cmd != nil {
 		log.Warn().Msg("logcat already start")
 		return nil
@@ -284,7 +286,7 @@ func (l *DeviceLogcat) CatchLogcat() (err error) {
 	return
 }
 
-func (l *DeviceLogcat) BufferedLogcat() (err error) {
+func (l *AdbLogcat) BufferedLogcat() (err error) {
 	// -d: dump the current buffered logcat result and exits
 	cmd := myexec.Command("adb", "-s", l.serial, "logcat", "-d")
 	cmd.Stdout = l.logBuffer
diff --git a/hrp/pkg/uixt/android_driver.go b/hrp/pkg/uixt/android_driver.go
index 3bbc37c4..31d43c07 100644
--- a/hrp/pkg/uixt/android_driver.go
+++ b/hrp/pkg/uixt/android_driver.go
@@ -35,7 +35,7 @@ type uiaDriver struct {
 	Driver
 
 	adbDevice gadb.Device
-	logcat    *DeviceLogcat
+	logcat    *AdbLogcat
 	localPort int
 }
 
@@ -478,7 +478,7 @@ func (ud *uiaDriver) AppTerminate(bundleId string) (successful bool, err error)
 		return false, err
 	}
 
-	_, err = ud.adbDevice.RunShellCommand("am force-stop", bundleId)
+	_, err = ud.adbDevice.RunShellCommand("am", "force-stop", bundleId)
 	return err == nil, err
 }