diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index c0008665..022e1447 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -180,8 +180,8 @@ type AndroidDevice struct { d *gadb.Device logcat *AdbLogcat SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"` + STUB bool `json:"stub,omitempty" yaml:"stub,omitempty"` // use stub UIA2 bool `json:"uia2,omitempty" yaml:"uia2,omitempty"` // use uiautomator2 - STUB bool `json:"stub,omitempty" yaml:"stub,omitempty"` // use uiautomator2 UIA2IP string `json:"uia2_ip,omitempty" yaml:"uia2_ip,omitempty"` // uiautomator2 server ip UIA2Port int `json:"uia2_port,omitempty" yaml:"uia2_port,omitempty"` // uiautomator2 server port LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"` diff --git a/hrp/pkg/uixt/android_stub_driver.go b/hrp/pkg/uixt/android_stub_driver.go index fbfe19d2..3506ec48 100644 --- a/hrp/pkg/uixt/android_stub_driver.go +++ b/hrp/pkg/uixt/android_stub_driver.go @@ -175,7 +175,14 @@ func (sad *stubAndroidDriver) Source(srcOpt ...SourceOption) (source string, err } func (sad *stubAndroidDriver) LoginNoneUIBak(packageName, phoneNumber, captcha string) error { - _, err := sad.adbClient.RunShellCommand("am", "broadcast", "-a", fmt.Sprintf("%s.util.crony.action_login", packageName), "-e", "phone", phoneNumber, "-e", "code", captcha) + _, err := sad.adbClient.RunShellCommand( + "am", "broadcast", + "-a", fmt.Sprintf("%s.util.crony.action_login", packageName), + "-e", "phone", phoneNumber, + "-e", "code", captcha) + if err != nil { + return err + } time.Sleep(10 * time.Second) login, err := sad.isLogin(packageName) if err != nil || !login { @@ -200,7 +207,7 @@ func (sad *stubAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha stri } log.Info().Msgf("%v", res) if res["isSuccess"] != true { - err = fmt.Errorf("falied to logout %s", res["data"]) + err = fmt.Errorf("failed to login %s", res["data"]) log.Err(err).Msgf("%v", res) return err } @@ -226,14 +233,11 @@ func (sad *stubAndroidDriver) LogoutNoneUI(packageName string) error { } log.Info().Msgf("%v", res) if res["isSuccess"] != true { - err = fmt.Errorf("falied to logout %s", res["data"]) + err = fmt.Errorf("failed to logout %s", res["data"]) log.Err(err).Msgf("%v", res) return err } - fmt.Printf("%v", resp) - if err != nil { - return err - } + log.Info().Interface("resp", resp).Msg("logout success") return nil } @@ -263,13 +267,10 @@ func (sad *stubAndroidDriver) isLogin(packageName string) (login bool, err error } log.Info().Msgf("%v", res) if res["isSuccess"] != true { - err = fmt.Errorf("falied to get is login %s", res["data"]) + err = fmt.Errorf("failed to check login %s", res["data"]) log.Err(err).Msgf("%v", res) return false, err } - fmt.Printf("%v", resp) - if err != nil { - return false, err - } + log.Info().Interface("resp", resp).Msg("check login success") return true, nil }