change: update wda logs

This commit is contained in:
debugtalk
2022-09-28 11:50:34 +08:00
parent 732f756778
commit 0d2dd59b4f
10 changed files with 41 additions and 15 deletions

View File

@@ -124,7 +124,7 @@ func WithThreshold(threshold float64) CVOption {
}
type DriverExt struct {
Device Device
UUID string // ios udid or android serial
Driver WebDriver
windowSize Size
frame *bytes.Buffer

View File

@@ -96,7 +96,7 @@ func InitWDAClient(device *IOSDevice) (*DriverExt, error) {
}
}
driverExt.Device = iosDevice
driverExt.UUID = iosDevice.UUID()
return driverExt, nil
}
@@ -224,8 +224,8 @@ func (dev *IOSDevice) NewUSBDriver(capabilities Capabilities) (driver WebDriver,
}
type wdaResponse struct {
Value string `json:"value"`
SessionID string `json:"sessionId"`
Value interface{} `json:"value"`
SessionID string `json:"sessionId"`
}
func (dExt *DriverExt) StartLogRecording(identifier string) error {
@@ -239,11 +239,12 @@ func (dExt *DriverExt) StartLogRecording(identifier string) error {
return nil
}
func (dExt *DriverExt) GetLogs() (string, error) {
func (dExt *DriverExt) GetLogs() (interface{}, error) {
log.Info().Msg("stop WDA log recording")
data := map[string]interface{}{"action": "stop"}
reply, err := dExt.triggerWDALog(data)
if err != nil {
log.Error().Err(err).Msg("failed to get WDA logs")
return "", errors.Wrap(err, "failed to get WDA logs")
}
@@ -275,8 +276,10 @@ func (dExt *DriverExt) triggerWDALog(data map[string]interface{}) (*wdaResponse,
reply := new(wdaResponse)
if err = json.Unmarshal(rawResp, reply); err != nil {
log.Info().Bytes("rawResp", rawResp).Msg("get unexpected WDA log response")
return nil, err
}
log.Info().Interface("value", reply.Value).Msg("get WDA log response")
return reply, nil
}

View File

@@ -163,7 +163,7 @@ func (dExt *DriverExt) FindTextByOCR(ocrText string, index ...int) (x, y, width,
service := &veDEMOCRService{}
rect, err := service.FindText(ocrText, bufSource.Bytes(), index...)
if err != nil {
log.Warn().Err(err).Msg("FindText failed")
log.Warn().Msgf("FindText failed: %s", err.Error())
err = fmt.Errorf("FindText failed: %v", err)
return
}