GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-10 23:12:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: failed to open camera on android

Browse Source
This commit is contained in:
xucong053
2022-09-30 14:17:02 +08:00
parent bd1ef254fa
commit fe111c8c4b
4 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
hrp/internal/uixt/android_driver.go
View File

@@ -238,10 +238,37 @@ func (ud *uiaDriver) PressBack() (err error) {
} }
func (ud *uiaDriver) StartCamera() (err error) { func (ud *uiaDriver) StartCamera() (err error) {
if _, err = ud.adbDevice.RunShellCommand("am", "start", "-a", "android.media.action.VIDEO_CAPTURE"); err != nil { if _, err = ud.adbDevice.RunShellCommand("rm", "-r", "/sdcard/DCIM/Camera"); err != nil {
return err return err
} }
return time.Sleep(5 * time.Second)
var version string
if version, err = ud.adbDevice.RunShellCommand("getprop", "ro.build.version.release"); err != nil {
return err
}
if version == "11" || version == "12" {
if _, err = ud.adbDevice.RunShellCommand("am", "start", "-a", "android.media.action.STILL_IMAGE_CAMERA"); err != nil {
return err
}
time.Sleep(5 * time.Second)
if _, err = ud.adbDevice.RunShellCommand("input", "swipe", "750", "1000", "250", "1000"); err != nil {
return err
}
time.Sleep(5 * time.Second)
if _, err = ud.adbDevice.RunShellCommand("input", "keyevent", "27"); err != nil {
return err
}
return
} else {
if _, err = ud.adbDevice.RunShellCommand("am", "start", "-a", "android.media.action.VIDEO_CAPTURE"); err != nil {
return err
}
time.Sleep(5 * time.Second)
if _, err = ud.adbDevice.RunShellCommand("input", "keyevent", "27"); err != nil {
return err
}
return
}
} }
func (ud *uiaDriver) StopCamera() (err error) { func (ud *uiaDriver) StopCamera() (err error) {
@@ -266,24 +293,6 @@ func (ud *uiaDriver) StopCamera() (err error) {
return return
} }
func (ud *uiaDriver) StartRecording() (err error) {
var res string
if res, err = ud.adbDevice.RunShellCommand("input", "keyevent", "27"); err != nil {
return err
}
log.Info().Str("shell", res)
return
}
func (ud *uiaDriver) StopRecording() (err error) {
var res string
if res, err = ud.adbDevice.RunShellCommand("input", "keyevent", "27"); err != nil {
return err
}
log.Info().Str("shell", res)
return
}
func (ud *uiaDriver) ActiveAppInfo() (info AppInfo, err error) { func (ud *uiaDriver) ActiveAppInfo() (info AppInfo, err error) {
// TODO // TODO
return info, errDriverNotImplemented return info, errDriverNotImplemented

4
hrp/internal/uixt/ext.go
View File

@@ -500,10 +500,6 @@ func (dExt *DriverExt) DoAction(action MobileAction) error {
return dExt.Driver.StartCamera() return dExt.Driver.StartCamera()
case CtlStopCamera: case CtlStopCamera:
return dExt.Driver.StopCamera() return dExt.Driver.StopCamera()
case RecordStart:
return dExt.Driver.StartRecording()
case RecordStop:
return dExt.Driver.StopRecording()
} }
return nil return nil
} }

3
hrp/internal/uixt/interface.go
View File

@@ -885,9 +885,6 @@ type WebDriver interface {
// StopCamera Stops the camera for recording // StopCamera Stops the camera for recording
StopCamera() error StopCamera() error
StartRecording() error
StopRecording() error
// Tap Sends a tap event at the coordinate. // Tap Sends a tap event at the coordinate.
Tap(x, y int, options ...DataOption) error Tap(x, y int, options ...DataOption) error
TapFloat(x, y float64, options ...DataOption) error TapFloat(x, y float64, options ...DataOption) error

10
hrp/internal/uixt/ios_driver.go
View File

@@ -579,16 +579,6 @@ func (wd *wdaDriver) StopCamera() (err error) {
return nil return nil
} }
func (wd *wdaDriver) StartRecording() (err error) {
// TODO
return errDriverNotImplemented
}
func (wd *wdaDriver) StopRecording() (err error) {
// TODO
return errDriverNotImplemented
}
func (wd *wdaDriver) ExpectNotification(notifyName string, notifyType NotificationType, second ...int) (err error) { func (wd *wdaDriver) ExpectNotification(notifyName string, notifyType NotificationType, second ...int) (err error) {
// [[FBRoute POST:@"/wda/expectNotification"] respondWithTarget:self action:@selector(handleExpectNotification:)] // [[FBRoute POST:@"/wda/expectNotification"] respondWithTarget:self action:@selector(handleExpectNotification:)]
if len(second) == 0 { if len(second) == 0 {