diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 6c124601..30f59f16 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.5.0.202405061137 \ No newline at end of file +v4.5.1.install \ No newline at end of file diff --git a/hrp/pkg/gadb/client.go b/hrp/pkg/gadb/client.go index eb6b9d8c..a81ac116 100644 --- a/hrp/pkg/gadb/client.go +++ b/hrp/pkg/gadb/client.go @@ -4,6 +4,7 @@ import ( "fmt" "strconv" "strings" + "time" "github.com/pkg/errors" "github.com/rs/zerolog/log" @@ -209,8 +210,8 @@ func (c Client) KillServer() (err error) { return } -func (c Client) createTransport() (tp transport, err error) { - return newTransport(fmt.Sprintf("%s:%d", c.host, c.port)) +func (c Client) createTransport(readTimeout ...time.Duration) (tp transport, err error) { + return newTransport(fmt.Sprintf("%s:%d", c.host, c.port), readTimeout...) } func (c Client) executeCommand(command string, onlyVerifyResponse ...bool) (resp string, err error) { diff --git a/hrp/pkg/gadb/device.go b/hrp/pkg/gadb/device.go index 37092e84..73df6061 100644 --- a/hrp/pkg/gadb/device.go +++ b/hrp/pkg/gadb/device.go @@ -406,8 +406,8 @@ func (d *Device) EnableAdbOverTCP(port ...int) (err error) { return } -func (d *Device) createDeviceTransport() (tp transport, err error) { - if tp, err = newTransport(fmt.Sprintf("%s:%d", d.adbClient.host, d.adbClient.port)); err != nil { +func (d *Device) createDeviceTransport(readTimeout ...time.Duration) (tp transport, err error) { + if tp, err = newTransport(fmt.Sprintf("%s:%d", d.adbClient.host, d.adbClient.port), readTimeout...); err != nil { return transport{}, err } @@ -546,7 +546,7 @@ func (d *Device) installViaABBExec(apk io.ReadSeeker, args ...string) (raw []byt if err != nil { return nil, err } - if tp, err = d.createDeviceTransport(); err != nil { + if tp, err = d.createDeviceTransport(5 * time.Minute); err != nil { return nil, err } defer func() { _ = tp.Close() }() diff --git a/hrp/pkg/gadb/transport.go b/hrp/pkg/gadb/transport.go index c55b32b7..d09b5c72 100644 --- a/hrp/pkg/gadb/transport.go +++ b/hrp/pkg/gadb/transport.go @@ -17,7 +17,7 @@ import ( var ErrConnBroken = errors.New("socket connection broken") -var DefaultAdbReadTimeout time.Duration = 60 +var DefaultAdbReadTimeout time.Duration = 300 var regexDeviceOffline = regexp.MustCompile("device .* not found") diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index 27d73283..9a5eb768 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -359,7 +359,7 @@ func (dev *AndroidDevice) installViaInstaller(app io.ReadSeeker, args ...string) return err } // 等待安装完成或超时 - timeout := 1 * time.Minute + timeout := 3 * time.Minute select { case err := <-done: return err