mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-14 14:00:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1270 from bootstraponline/screencap_bin

Browse Source 
Use screencap bin
This commit is contained in:
bootstraponline
2013-10-07 07:56:41 -07:00
parent 5ddc2e5099 000831be84
commit a6b136ac2d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/android.js
View File

@@ -713,11 +713,21 @@ Android.prototype.getScreenshot = function(cb) {
async.series([
function(cb) {
this.proxy(["takeScreenshot"], cb);
var png = "/data/local/tmp/screenshot.png";
var cmd = [this.adb.adbCmd, 'shell', '"/system/bin/rm', png + ';', '/system/bin/screencap -p', png, '"'].join(' ');
logger.debug("getScreenshot: " + cmd);
exec(cmd, { maxBuffer: 524288 }, function(err, stdout, stderr) {
if (err) {
logger.warn(stderr);
return cb(err);
}
cb(null);
});
}.bind(this),
function(cb) {
if (fs.existsSync(localfile)) fs.unlinkSync(localfile);
var cmd = this.adb.adbCmd + ' pull /data/local/tmp/screenshot.png "' + localfile + '"';
logger.debug("screenshot cmd: " + cmd);
logger.debug("getScreenshot: " + cmd);
exec(cmd, { maxBuffer: 524288 }, function(err, stdout, stderr) {
if (err) {
logger.warn(stderr);
@@ -748,13 +758,8 @@ Android.prototype.getScreenshot = function(cb) {
],
// Top level cb
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: screenshotStatus
status: status.codes.Success.code
, value: b64data
});
});