fix: get ocr exact text in first priority

This commit is contained in:
debugtalk
2022-08-31 22:31:45 +08:00
parent c768c189e4
commit 5118d6d38d
3 changed files with 32 additions and 15 deletions

View File

@@ -92,14 +92,13 @@ func (s *veDEMOCRService) FindText(text string, imageBuf []byte) (rect image.Rec
return
}
var rects []image.Rectangle
for _, ocrResult := range ocrResults {
// not contains text
if !strings.Contains(ocrResult.Text, text) {
continue
}
// contains text
// only find the first matched one
rect = image.Rectangle{
// ocrResult.Points 顺序:左上 -> 右上 -> 右下 -> 左下
Min: image.Point{
@@ -111,7 +110,20 @@ func (s *veDEMOCRService) FindText(text string, imageBuf []byte) (rect image.Rec
Y: int(ocrResult.Points[2].Y),
},
}
return
// contains text while not match exactly
if ocrResult.Text != text {
rects = append(rects, rect)
continue
}
// match exactly
return rect, nil
}
// only find the first matched one
if len(rects) > 0 {
return rects[0], nil
}
return image.Rectangle{}, fmt.Errorf("text %s not found", text)

View File

@@ -460,11 +460,18 @@ func (r *HRPRunner) InitWDAClient(device WDADevice) (client *uiDriver, err error
}
}
driverExt, err := uixt.InitWDAClient(
gwda.WithSerialNumber(device.UDID),
gwda.WithPort(device.Port),
gwda.WithMjpegPort(device.MjpegPort),
)
var deviceOptions []gwda.DeviceOption
if device.UDID != "" {
deviceOptions = append(deviceOptions, gwda.WithSerialNumber(device.UDID))
}
if device.Port != 0 {
deviceOptions = append(deviceOptions, gwda.WithPort(device.Port))
}
if device.MjpegPort != 0 {
deviceOptions = append(deviceOptions, gwda.WithMjpegPort(device.MjpegPort))
}
driverExt, err := uixt.InitWDAClient(deviceOptions...)
if err != nil {
return nil, err
}