GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 07:26:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify OCR APIs

Browse Source
This commit is contained in:
lilong.129
2023-04-25 22:27:31 +08:00
parent f9bebf7202
commit 3ec27b9afc
13 changed files with 231 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/ext.go
+7 -7
View File
@@ -52,8 +52,8 @@ type DriverExt struct {
frame *bytes.Buffer
doneMjpegStream chan bool
scale float64
ocrService OCRService // used to get text from image
screenShots []string // cache screenshot paths
OCRService IOCRService // used to get text from image
screenShots []string // cache screenshot paths
CVArgs
}
@@ -75,7 +75,7 @@ func NewDriverExt(device Device, driver WebDriver) (dExt *DriverExt, err error)
return nil, err
}
if dExt.ocrService, err = newVEDEMOCRService(); err != nil {
if dExt.OCRService, err = newVEDEMOCRService(); err != nil {
return nil, err
}
@@ -178,10 +178,10 @@ func init() {
rand.Seed(time.Now().UnixNano())
}
func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...DataOption) (x, y, width, height float64, err error) {
func (dExt *DriverExt) FindUIRectInUIKit(search string, options ...DataOption) (point PointF, err error) {
// click on text, using OCR
if !isPathExists(search) {
return dExt.FindTextByOCR(search, options...)
return dExt.FindScreenTextByOCR(search, options...)
}
// click on image, using opencv
return dExt.FindImageRectInUIKit(search, options...)
@@ -194,12 +194,12 @@ func (dExt *DriverExt) MappingToRectInUIKit(rect image.Rectangle) (x, y, width,
}
func (dExt *DriverExt) IsOCRExist(text string) bool {
_, _, _, _, err := dExt.FindTextByOCR(text)
_, err := dExt.FindScreenTextByOCR(text)
return err == nil
}
func (dExt *DriverExt) IsImageExist(text string) bool {
_, _, _, _, err := dExt.FindImageRectInUIKit(text)
_, err := dExt.FindImageRectInUIKit(text)
return err == nil
}