Merge pull request #1144 from bootstraponline/fix_screenshot

Fix screenshotStatus
This commit is contained in:
Jonathan Lipps
2013-09-12 16:36:14 -07:00
2 changed files with 10 additions and 4 deletions

View File

@@ -26,8 +26,9 @@ public class TakeScreenshot extends CommandHandler {
*/
@Override
public AndroidCommandResult execute(final AndroidCommand command) {
final boolean result = UiDevice.getInstance().takeScreenshot(
new File("/data/local/tmp/screenshot.png"));
final File screenshot = new File("/data/local/tmp/screenshot.png");
screenshot.mkdirs();
final boolean result = UiDevice.getInstance().takeScreenshot(screenshot);
return getSuccessResult(result);
}
}

View File

@@ -747,9 +747,14 @@ Android.prototype.getScreenshot = function(cb) {
}
],
// Top level cb
function(){
function(err, res) {
var screenshotStatus = status.codes.Success.code;
try {
screenshotStatus = res[0].value === false ? status.codes.UnknownError.code : screenshotStatus;
} catch(e) {
}
cb(null, {
status: status.codes.Success.code
status: screenshotStatus
, value: b64data
});
});