feat: add GetScreenTexts

This commit is contained in:
lilong.129
2023-05-31 20:17:43 +08:00
parent 42256bc20b
commit e1169ec628
4 changed files with 19 additions and 12 deletions
+2 -2
View File
@@ -35,13 +35,13 @@ func TestIOSDemo(t *testing.T) {
// 持续监测手机屏幕,直到出现青少年模式弹窗后,点击「我知道了」
for {
// take screenshot and get screen texts by OCR
imageResult, err := driverExt.GetScreenResult()
ocrTexts, err := driverExt.GetScreenTexts()
if err != nil {
log.Error().Err(err).Msg("OCR GetTexts failed")
t.Fatal(err)
}
points, err := imageResult.OCRResult.ToOCRTexts().FindTexts([]string{"青少年模式", "我知道了"})
points, err := ocrTexts.FindTexts([]string{"青少年模式", "我知道了"})
if err != nil {
time.Sleep(1 * time.Second)
continue
+11 -2
View File
@@ -360,12 +360,21 @@ func (dExt *DriverExt) GetScreenResult() (imageResult ImageResult, err error) {
return imageResult, nil
}
func (dExt *DriverExt) FindScreenText(text string, options ...ActionOption) (point PointF, err error) {
func (dExt *DriverExt) GetScreenTexts() (ocrTexts OCRTexts, err error) {
imageResult, err := dExt.GetScreenResult()
if err != nil {
return
}
result, err := imageResult.OCRResult.ToOCRTexts().FindText(text, dExt.ParseActionOptions(options...)...)
return imageResult.OCRResult.ToOCRTexts(), nil
}
func (dExt *DriverExt) FindScreenText(text string, options ...ActionOption) (point PointF, err error) {
ocrTexts, err := dExt.GetScreenTexts()
if err != nil {
return
}
result, err := ocrTexts.FindText(text, dExt.ParseActionOptions(options...)...)
if err != nil {
log.Warn().Msgf("FindText failed: %s", err.Error())
return
+2 -3
View File
@@ -135,12 +135,11 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
var point PointF
findTexts := func(d *DriverExt) error {
var err error
imageResult, err := d.GetScreenResult()
ocrTexts, err := d.GetScreenTexts()
if err != nil {
return err
}
points, err := imageResult.OCRResult.ToOCRTexts().
FindTexts(texts, dExt.ParseActionOptions(options...)...)
points, err := ocrTexts.FindTexts(texts, dExt.ParseActionOptions(options...)...)
if err != nil {
return err
}