refactor: GetScreenResult

This commit is contained in:
lilong.129
2023-05-31 16:10:24 +08:00
parent 55e6a42b0f
commit 7d7044f332
8 changed files with 72 additions and 60 deletions
+3 -3
View File
@@ -110,7 +110,7 @@ func NewDriverExt(device Device, driver WebDriver) (dExt *DriverExt, err error)
return nil, err
}
if dExt.ImageService, err = newVEDEMImageService(); err != nil {
if dExt.ImageService, err = newVEDEMImageService("ocr", "upload", "liveType"); err != nil {
return nil, err
}
@@ -241,14 +241,14 @@ func init() {
func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...ActionOption) (point PointF, err error) {
// click on text, using OCR
if !isPathExists(search) {
return dExt.FindScreenTextByOCR(search, options...)
return dExt.FindScreenText(search, options...)
}
// click on image, using opencv
return dExt.FindImageRectInUIKit(search, options...)
}
func (dExt *DriverExt) IsOCRExist(text string) bool {
_, err := dExt.FindScreenTextByOCR(text)
_, err := dExt.FindScreenText(text)
return err == nil
}