From 9aec5edb96bae5d8f3fa2c154aed7c677b86e835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E6=B3=93=E9=93=AE?= <yuhongzheng@bytedance.com>
Date: Thu, 15 Aug 2024 14:27:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Derror=E6=9C=AA?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hrp/pkg/uixt/android_device.go        | 16 +---------------
 hrp/pkg/uixt/android_shoots_driver.go | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go
index f83dba74..e6234d22 100644
--- a/hrp/pkg/uixt/android_device.go
+++ b/hrp/pkg/uixt/android_device.go
@@ -10,7 +10,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"net"
 	"os"
 	"os/exec"
 	"regexp"
@@ -335,6 +334,7 @@ func (dev *AndroidDevice) Uninstall(packageName string) error {
 
 func (dev *AndroidDevice) Install(appPath string, opts *InstallOptions) error {
 	app, err := os.Open(appPath)
+	defer app.Close()
 	if err != nil {
 		return errors.Wrap(err, fmt.Sprintf("install %s open file failed", appPath))
 	}
@@ -438,20 +438,6 @@ func (dev *AndroidDevice) installCommon(app io.ReadSeeker, args ...string) error
 	return err
 }
 
-func getFreePort() (int, error) {
-	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	if err != nil {
-		return 0, errors.Wrap(err, "resolve tcp addr failed")
-	}
-
-	l, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		return 0, errors.Wrap(err, "listen tcp addr failed")
-	}
-	defer func() { _ = l.Close() }()
-	return l.Addr().(*net.TCPAddr).Port, nil
-}
-
 type LineCallback func(string)
 
 type AdbLogcat struct {
diff --git a/hrp/pkg/uixt/android_shoots_driver.go b/hrp/pkg/uixt/android_shoots_driver.go
index 4bc0b6d6..ea55d324 100644
--- a/hrp/pkg/uixt/android_shoots_driver.go
+++ b/hrp/pkg/uixt/android_shoots_driver.go
@@ -143,6 +143,9 @@ func (sad *ShootsAndroidDriver) close() error {
 
 func (sad *ShootsAndroidDriver) Status() (DeviceStatus, error) {
 	app, err := sad.GetForegroundApp()
+	if err != nil {
+		return DeviceStatus{}, err
+	}
 	res, err := sad.sendCommand(app.PackageName, "Hello", nil)
 	if err != nil {
 		return DeviceStatus{}, err
@@ -153,6 +156,9 @@ func (sad *ShootsAndroidDriver) Status() (DeviceStatus, error) {
 
 func (sad *ShootsAndroidDriver) Source(srcOpt ...SourceOption) (source string, err error) {
 	app, err := sad.GetForegroundApp()
+	if err != nil {
+		return "", err
+	}
 	params := map[string]interface{}{
 		"ClassName": "com.bytedance.byteinsight.MockOperator",
 		"Method":    "getLayout",
@@ -183,6 +189,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha st
 		"code":  captcha,
 	}
 	resp, err := sad.httpPOST(params, "/host", "/login", "account")
+	if err != nil {
+		return err
+	}
 	res, err := resp.valueConvertToJsonObject()
 	if err != nil {
 		return err
@@ -206,6 +215,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha st
 
 func (sad *ShootsAndroidDriver) LogoutNoneUI(packageName string) error {
 	resp, err := sad.httpGET("/host", "/logout")
+	if err != nil {
+		return err
+	}
 	res, err := resp.valueConvertToJsonObject()
 	if err != nil {
 		return err
@@ -240,6 +252,9 @@ func (sad *ShootsAndroidDriver) LoginNoneUIDynamic(packageName, phoneNumber stri
 
 func (sad *ShootsAndroidDriver) isLogin(packageName string) (login bool, err error) {
 	resp, err := sad.httpGET("/host", "/login", "/check")
+	if err != nil {
+		return false, err
+	}
 	res, err := resp.valueConvertToJsonObject()
 	if err != nil {
 		return false, err