refactor: replace gadb with optimized version authoried by @appl3s

This commit is contained in:
lilong.129
2023-04-13 22:41:45 +08:00
parent 6600473855
commit 3d4dffbd0b
13 changed files with 509 additions and 34 deletions

View File

@@ -17,7 +17,7 @@ import (
type adbDriver struct {
Driver
adbClient gadb.Device
adbClient *gadb.Device
logcat *AdbLogcat
}

View File

@@ -115,7 +115,7 @@ func NewAndroidDevice(options ...AndroidDeviceOption) (device *AndroidDevice, er
fmt.Sprintf("device %s not found", device.SerialNumber))
}
func DeviceList() (devices []gadb.Device, err error) {
func DeviceList() (devices []*gadb.Device, err error) {
var adbClient gadb.Client
if adbClient, err = gadb.NewClientWith(AdbServerHost, AdbServerPort); err != nil {
return nil, errors.Wrap(code.AndroidDeviceConnectionError, err.Error())
@@ -125,7 +125,7 @@ func DeviceList() (devices []gadb.Device, err error) {
}
type AndroidDevice struct {
d gadb.Device
d *gadb.Device
logcat *AdbLogcat
SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"`
UIA2 bool `json:"uia2,omitempty" yaml:"uia2,omitempty"` // use uiautomator2