diff --git a/internal/version/VERSION b/internal/version/VERSION index fcdf8ad7..1d561889 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2503112212 +v5.0.0-beta-2503112238 diff --git a/uixt/android_test.go b/uixt/android_test.go index 13620e1f..c43dcf5a 100644 --- a/uixt/android_test.go +++ b/uixt/android_test.go @@ -75,7 +75,7 @@ func TestDriver_ADB_ScreenShot(t *testing.T) { driver := setupADBDriverExt(t) screenshot, err := driver.ScreenShot() assert.Nil(t, err) - path, err := saveScreenShot(screenshot, "1234") + path, err := saveScreenShot(screenshot, "1234.jpeg") require.Nil(t, err) defer os.Remove(path) t.Logf("save screenshot to %s", path) @@ -249,7 +249,7 @@ func TestDriver_ADB_PushImage(t *testing.T) { screenshot, err := driver.ScreenShot() assert.Nil(t, err) - path, err := saveScreenShot(screenshot, "1234") + path, err := saveScreenShot(screenshot, "1234.jpeg") require.Nil(t, err) defer os.Remove(path) diff --git a/uixt/driver_ext_screenshot.go b/uixt/driver_ext_screenshot.go index e16fb763..8bd8d916 100644 --- a/uixt/driver_ext_screenshot.go +++ b/uixt/driver_ext_screenshot.go @@ -73,7 +73,10 @@ func (dExt *XTDriver) GetScreenResult(opts ...option.ActionOption) (screenResult } else { fileName = builtin.GenNameWithTimestamp("%d_screenshot") } - imagePath := filepath.Join(config.GetConfig().ScreenShotsPath, fileName) + imagePath := filepath.Join( + config.GetConfig().ScreenShotsPath, + fmt.Sprintf("%s.%s", fileName, "jpeg"), + ) go func() { path, err := saveScreenShot(compressBufSource, imagePath) if err != nil { @@ -189,7 +192,7 @@ func (dExt *XTDriver) FindUIResult(opts ...option.ActionOption) (point ai.PointF } // saveScreenShot saves compressed image file with file name -func saveScreenShot(raw *bytes.Buffer, fileName string) (string, error) { +func saveScreenShot(raw *bytes.Buffer, screenshotPath string) (string, error) { // notice: screenshot data is a stream, so we need to copy it to a new buffer copiedBuffer := &bytes.Buffer{} if _, err := copiedBuffer.Write(raw.Bytes()); err != nil { @@ -201,8 +204,6 @@ func saveScreenShot(raw *bytes.Buffer, fileName string) (string, error) { return "", errors.Wrap(err, "decode screenshot image failed") } - // The default format uses jpeg for compression - screenshotPath := filepath.Join(fmt.Sprintf("%s.%s", fileName, "jpeg")) file, err := os.Create(screenshotPath) if err != nil { return "", errors.Wrap(err, "create screenshot image file failed") diff --git a/uixt/ios_test.go b/uixt/ios_test.go index ca89139b..82bc392f 100644 --- a/uixt/ios_test.go +++ b/uixt/ios_test.go @@ -258,7 +258,7 @@ func TestDriver_WDA_ScreenShot(t *testing.T) { assert.Nil(t, err) _ = screenshot - path, err := saveScreenShot(screenshot, "1234") + path, err := saveScreenShot(screenshot, "1234.jpeg") assert.Nil(t, err) defer os.Remove(path) t.Logf("save screenshot to %s", path) @@ -318,7 +318,7 @@ func TestDriver_WDA_PushImage(t *testing.T) { screenshot, err := driver.ScreenShot() assert.Nil(t, err) - path, err := saveScreenShot(screenshot, "1234") + path, err := saveScreenShot(screenshot, "1234.jpeg") require.Nil(t, err) defer os.Remove(path)