fix unlock

macacajs · Sep 27, 2016 · 036bfdb · 036bfdb
1 parent 9e77079
commit 036bfdb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
 .DS_Store
 node_modules
 npm-debug.log
-*.sw*
-*.un~
 .idea/*
 Thumbs.db
 coverage/
 logs/
 .project
 build/
+*.sw*
+*.un~
diff --git a/.jshintignore b/.jshintignore
@@ -3,4 +3,4 @@ node_modules/
 coverage/
 build/
 assets/
-dist/
+dist/
diff --git a/lib/controllers.js b/lib/controllers.js
@@ -207,4 +207,8 @@ controllers.getSource = function *() {
   return xml.length > xml_hack.length ? xml : xml_hack;
 };
 
+controllers.isDisplayed = function *() {
+  return true;
+};
+
 module.exports = controllers;
diff --git a/lib/helper.js b/lib/helper.js
@@ -7,7 +7,6 @@ const getErrorByCode = require('webdriver-dfn-error-code').getErrorByCode;
 
 var _ = macacaUtils.merge({}, macacaUtils);
 
-
 _.sleep = function(ms) {
   return new Promise((resolve, reject) => {
     setTimeout(resolve, ms);

diff --git a/lib/macaca-android.js b/lib/macaca-android.js
@@ -47,7 +47,6 @@ Android.prototype.startDevice = function *(caps) {
   yield this.initDevice();
   yield this.initUiautomator();
   yield this.getApkInfo();
-  yield this.adb.install(UnlockApk.apkPath);
   yield this.unlock();
   yield this.setIME();
   yield this.launchApk();
@@ -189,6 +188,11 @@ Android.prototype.getApkInfo = function *() {
 };
 
 Android.prototype.unlock = function *() {
+  if (!_.isExistedFile(UnlockApk.apkPath)) {
+    logger.warn(`unlock apk not found in: ${UnlockApk.apkPath}`);
+    return;
+  }
+  yield this.adb.install(UnlockApk.apkPath);
   var isScreenLocked = yield this.adb.isScreenLocked();
 
   if (isScreenLocked) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-android",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Macaca Android driver",
   "keywords": [
     "android"