appium-android-driver 10.3.7 → 10.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/build/lib/commands/misc.d.ts.map +1 -1
- package/build/lib/commands/misc.js +0 -5
- package/build/lib/commands/misc.js.map +1 -1
- package/build/lib/commands/performance.d.ts.map +1 -1
- package/build/lib/commands/performance.js +1 -2
- package/build/lib/commands/performance.js.map +1 -1
- package/build/lib/commands/system-bars.d.ts.map +1 -1
- package/build/lib/commands/system-bars.js +7 -2
- package/build/lib/commands/system-bars.js.map +1 -1
- package/lib/commands/misc.js +0 -2
- package/lib/commands/performance.js +1 -2
- package/lib/commands/system-bars.js +11 -2
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## [10.3.9](https://github.com/appium/appium-android-driver/compare/v10.3.8...v10.3.9) (2025-06-24)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Detect bars based on their types ([#1002](https://github.com/appium/appium-android-driver/issues/1002)) ([b74bb82](https://github.com/appium/appium-android-driver/commit/b74bb82fb3fcd8f458f9a4c8bfaf7b798b28e364))
|
|
6
|
+
|
|
7
|
+
### Code Refactoring
|
|
8
|
+
|
|
9
|
+
* remove unused import & use for..of ([#1001](https://github.com/appium/appium-android-driver/issues/1001)) ([19e4490](https://github.com/appium/appium-android-driver/commit/19e4490991523452def408e1884bbf4b09514376))
|
|
10
|
+
|
|
11
|
+
## [10.3.8](https://github.com/appium/appium-android-driver/compare/v10.3.7...v10.3.8) (2025-06-13)
|
|
12
|
+
|
|
13
|
+
### Miscellaneous Chores
|
|
14
|
+
|
|
15
|
+
* **deps-dev:** bump sinon from 20.0.0 to 21.0.0 ([#1000](https://github.com/appium/appium-android-driver/issues/1000)) ([6223b79](https://github.com/appium/appium-android-driver/commit/6223b7973e527cc8ad80069b64750c3dadff6b6c))
|
|
16
|
+
|
|
1
17
|
## [10.3.7](https://github.com/appium/appium-android-driver/compare/v10.3.6...v10.3.7) (2025-06-10)
|
|
2
18
|
|
|
3
19
|
### Miscellaneous Chores
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wEAFa,OAAO,CAAC,OAAO,eAAe,EAAE,IAAI,CAAC,CAIjD;AAED;;;GAGG;AACH,wEAFa,OAAO,CAAC,OAAO,eAAe,EAAE,IAAI,CAAC,CAUjD;AAED;;;;;;;GAOG;AACH,qEAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAIzB;AAED;;;GAGG;AACH,4EAFa,OAAO,CAAC,MAAM,CAAC,CAwB3B;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,YAAY,CAAC,CAIjC;AAED;;;GAGG;AACH,mFAFa,OAAO,CAAC,OAAO,SAAS,EAAE,aAAa,CAAC,CAIpD;AAED;;;GAGG;AACH,4EAFa,OAAO,CAAC,IAAI,CAAC,CAIzB;kBAGY,OAAO,YAAY,EAAE,GAAG;2BACxB,OAAO,eAAe,EAAE,YAAY"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getWindowSize = getWindowSize;
|
|
7
4
|
exports.getWindowRect = getWindowRect;
|
|
@@ -10,8 +7,6 @@ exports.getDisplayDensity = getDisplayDensity;
|
|
|
10
7
|
exports.mobileGetNotifications = mobileGetNotifications;
|
|
11
8
|
exports.mobileListSms = mobileListSms;
|
|
12
9
|
exports.openNotifications = openNotifications;
|
|
13
|
-
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
14
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
15
10
|
const driver_1 = require("appium/driver");
|
|
16
11
|
/**
|
|
17
12
|
* @this {import('../driver').AndroidDriver}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/commands/misc.js"],"names":[],"mappings":";;AAMA,sCAEC;AAMD,sCAQC;AAUD,wBAEC;AAMD,8CAsBC;AAMD,wDAEC;AAMD,sCAEC;AAMD,8CAEC;AAtFD,0CAAqC;AAErC;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,MAAM,EAAC,KAAK,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IACnD,OAAO;QACL,KAAK;QACL,MAAM;QACN,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;KACL,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,MAAM,CAAC,GAAG;IAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB;IACrC,qCAAqC;IACrC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACjE,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5B,yDAAyD;QACzD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAC;IAC3D,CAAC;IACD,4CAA4C;IAC5C,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC/D,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,GAAG,GAAG,CAAC,CAAC;IAC3D,CAAC;IACD,sCAAsC;IACtC,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,yCAAyC,CAAC,CAAC;AAC/E,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,sBAAsB;IAC1C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,IAAI;IACtC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB;IACrC,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;AAC1D,CAAC;AAED;;;GAGG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.d.ts","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"AAyDA;;;GAGG;AACH,kFAFa,OAAO,CAAC,OAAO,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAM5D;AAED;;;;;;GAMG;AACH,yFALW,MAAM,YACN,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CA4B5B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,+FAJW,MAAM,YACN,OAAO,SAAS,EAAE,mBAAmB,GACnC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAI5B;AA4FD;;;;;GAKG;AACH,oFAHW,MAAM,YACN,MAAM,2BAsChB;AAED;;;GAGG;AACH,yFAFW,MAAM,
|
|
1
|
+
{"version":3,"file":"performance.d.ts","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"AAyDA;;;GAGG;AACH,kFAFa,OAAO,CAAC,OAAO,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAM5D;AAED;;;;;;GAMG;AACH,yFALW,MAAM,YACN,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CA4B5B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,+FAJW,MAAM,YACN,OAAO,SAAS,EAAE,mBAAmB,GACnC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAI5B;AA4FD;;;;;GAKG;AACH,oFAHW,MAAM,YACN,MAAM,2BAsChB;AAED;;;GAGG;AACH,yFAFW,MAAM,4CAoKhB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,iFAPW,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,CAAC,OAAO,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CA2CtE;AAED;;;GAGG;AACH,kFAFW,MAAM,8BAgBhB;AAxfD,sCAYE;AACF,mDAAkE;AAClE,oCAAsC;AACtC,mCAgBE;AACF;;;;;GASG;AACH;;;;;;;;GAQG;4BA2cU,OAAO,WAAW,EAAE,aAAa;kBACjC,OAAO,YAAY,EAAE,GAAG"}
|
|
@@ -337,8 +337,7 @@ async function getNetworkTrafficInfo(retries = 2) {
|
|
|
337
337
|
}
|
|
338
338
|
}
|
|
339
339
|
let returnIndex = 1;
|
|
340
|
-
for (
|
|
341
|
-
data = arrayList[i];
|
|
340
|
+
for (const data of arrayList) {
|
|
342
341
|
start = data.indexOf(exports.NETWORK_KEYS[index][0]);
|
|
343
342
|
if (start >= 0) {
|
|
344
343
|
delimiter = data.indexOf('=', start + 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":";;;;;;AA6DA,0DAIC;AASD,gDA0BC;AA0BD,4DAEC;AAkGD,sCAoCC;AAMD,sDAmKC;AAoBD,gCAsCC;AAMD,wCAcC;AA7fD,YAAY;AACZ,uCAAuC;AACvC,oDAAuB;AAEV,QAAA,YAAY,GAAG;IAC1B;QACE,aAAa;QACb,YAAY;QACZ,SAAS;QACT,WAAW;QACX,SAAS;QACT,WAAW;QACX,YAAY;QACZ,gBAAgB;KACjB;IACD,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC;CACrE,CAAC;AACW,QAAA,QAAQ,GAAwB,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACrD,QAAA,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC;AACzB,QAAA,WAAW,GAAG;IACzB,mBAAmB;IACnB,oBAAoB;IACpB,oBAAoB;IACpB,iBAAiB;IACjB,gBAAgB;IAChB,UAAU;IACV,WAAW;IACX,WAAW;IACX,QAAQ;IACR,OAAO;IACP,yBAAyB;IACzB,gBAAgB;IAChB,WAAW;IACX,WAAW;IACX,UAAU;CACX,CAAC;AACW,QAAA,gCAAgC,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5D,OAAO,EACL,gHAAgH;IAClH,UAAU,EACR,+GAA+G;IACjH,WAAW,EACT,yGAAyG;IAC3G,WAAW,EACT,oGAAoG;CACvG,CAAC,CAAC;AACU,QAAA,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,EAAE,EAAE,IAAI;IACR,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;CACb,CAAC,CAAC;AACH,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B;;;GAGG;AACI,KAAK,UAAU,uBAAuB;IAC3C,OAAO,sDAAsD,CAAC,CAC5D,gBAAC,CAAC,IAAI,CAAC,wCAAgC,CAAC,CACzC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,GAAG,CAAC;IACzE,IAAI,MAAM,CAAC;IACX,QAAQ,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,KAAK,aAAa;YAChB,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,MAAM;QACR,KAAK,SAAS;YACZ,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC3D,MAAM;QACR,KAAK,YAAY;YACf,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC9D,MAAM;QACR,KAAK,aAAa;YAChB,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CACb,gCAAgC,QAAQ,WAAW;gBACjD,4CAA4C,IAAI,CAAC,SAAS,CACxD,wCAAgC,EAChC,CAAC,GAAG,CAAC,EACL,CAAC,CACF,EAAE,CACN,CAAC;IACN,CAAC;IACD,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACI,KAAK,UAAU,wBAAwB,CAAC,WAAW,EAAE,QAAQ;IAClE,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,2BAA2B;AAE3B;;;;;GAKG;AACH,SAAS,wBAAwB,CAAC,OAAO,EAAE,OAAO;IAChD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAChC,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,IAAI,OAAO,KAAK,sBAAc,CAAC,IAAI,EAAE,CAAC;QACtE;YACE,AADD;YAEC,AADC;YAED,OAAO,CAAC,SAAS;YACjB,OAAO,CAAC,kBAAkB;YAC1B,AAD2B;YAE3B,AADC;YAED,OAAO,CAAC,cAAc;YACtB,OAAO,CAAC,uBAAuB;SAChC,GAAG,OAAO,CAAC;IACd,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,IAAI,OAAO,KAAK,sBAAc,CAAC,IAAI,EAAE,CAAC;QAC7E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC;IAChE,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,GAAG,IAAI,OAAO,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QAC5E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,EAAE,IAAI,OAAO,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QAC3E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;IACxD,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjE,+EAA+E;QAC/E,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC;IAC5D,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,OAAO,EAAE,OAAO;IACjD,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QACnC;YACE,AADD;YAEC,OAAO,CAAC,SAAS;YACjB,AADkB;YAElB,OAAO,CAAC,kBAAkB;YAC1B,OAAO,CAAC,cAAc;YACtB,OAAO,CAAC,uBAAuB;SAChC,GAAG,OAAO,CAAC;IACd,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QAC1C,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,AAAD,EAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC;IAChE,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,GAAG,EAAE,CAAC;QACvC,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,AAAD,EAAG,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,EAAE,EAAE,CAAC;QACtC,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,AAAD,EAAG,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;IACxD,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,KAAK,EAAE,CAAC;QACzC,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,AAAD,EAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC;IAC9D,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,yBAAyB,CAAC,OAAO,EAAE,OAAO;IACjD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IAChC,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,IAAI,OAAO,KAAK,sBAAc,CAAC,IAAI,EAAE,CAAC;QACtE;YACE,AADD;YAEC,AADC;YAED,OAAO,CAAC,SAAS;YACjB,OAAO,CAAC,kBAAkB;YAC1B,AAD2B;YAE3B,AADC;YAED,OAAO,CAAC,SAAS;YACjB,OAAO,CAAC,cAAc;YACtB,OAAO,CAAC,uBAAuB;SAChC,GAAG,OAAO,CAAC;IACd,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,MAAM,IAAI,OAAO,KAAK,sBAAc,CAAC,IAAI,EAAE,CAAC;QAC7E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,kBAAkB,EAAE,AAAD,EAAG,AAAD,EAAG,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;IACvF,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,GAAG,IAAI,OAAO,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QAC5E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC;IAC1D,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,EAAE,IAAI,OAAO,KAAK,sBAAc,CAAC,MAAM,EAAE,CAAC;QAC3E,CAAC,EAAE,AAAD,EAAG,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;IACxD,CAAC;SAAM,IAAI,IAAI,KAAK,sBAAc,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjE,gBAAgB;QAChB,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,EAAE,AAAD,EAAG,AAAD,EAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;IAClF,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,WAAW,EAAE,OAAO,GAAG,CAAC;IAC1D,OAAO,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,GAAG,GAAG;YACV,SAAS;YACT,SAAS;YACT,IAAI,WAAW,GAAG;YAClB,GAAG;YACH,MAAM;YACN,IAAI;YACJ,IAAI,sBAAc,CAAC,MAAM,IAAI,sBAAc,CAAC,MAAM,IAAI,sBAAc,CAAC,GAAG,EAAE;gBACxE,IAAI,sBAAc,CAAC,EAAE,IAAI,sBAAc,CAAC,KAAK,GAAG;SACnD,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,OAAO,GAAG,EAAC,iBAAiB,EAAE,EAAE,EAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzD,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;gBACnB,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC;iBAAM,IAAI,QAAQ,GAAG,EAAE,IAAI,QAAQ,GAAG,EAAE,EAAE,CAAC;gBAC1C,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,KAAK,OAAO,EAAE,CAAC;YACvE,MAAM,OAAO,GAAG,gBAAC,CAAC,KAAK,CAAC,mBAAW,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YACxD,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,GAAG,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,qBAAqB,CAAC,OAAO,GAAG,CAAC;IACrD,OAAO,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE;QAC7D,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC;QAEhG,IAAI,GAAG,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAClC,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,2BAA2B;QAE/E,gHAAgH;QAChH,8BAA8B;QAC9B,cAAc;QACd,yBAAyB;QACzB,wBAAwB;QACxB,wFAAwF;QACxF,gDAAgD;QAChD,kHAAkH;QAClH,EAAE;QACF,MAAM;QACN,cAAc;QACd,0BAA0B;QAC1B,wBAAwB;QACxB,yGAAyG;QACzG,+CAA+C;QAC/C,qDAAqD;QACrD,qDAAqD;QACrD,4DAA4D;QAC5D,wDAAwD;QACxD,EAAE;QACF,iCAAiC;QACjC,cAAc;QACd,qBAAqB;QACrB,wBAAwB;QACxB,2FAA2F;QAC3F,6CAA6C;QAC7C,gEAAgE;QAChE,+DAA+D;QAC/D,gEAAgE;QAChE,+DAA+D;QAC/D,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE5C,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACxD,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC7C,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAE7D,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;YACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;YAChD,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;YACxC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEjC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,KAAK,GAAG,CAAC,CAAC,CAAC;gBAEX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAY,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;oBAC7C,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEjD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;wBACf,KAAK,GAAG,CAAC,CAAC;wBACV,WAAW,CAAC,CAAC,CAAC,GAAG,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;wBAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAY,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;4BAChD,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,oBAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACzC,CAAC;wBACD,MAAM;oBACR,CAAC;gBACH,CAAC;gBAED,IAAI,WAAW,GAAG,CAAC,CAAC;gBACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC1C,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;oBACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAE7C,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;wBACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;wBACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;wBACvC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;wBAExD,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;gCACvC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACzD,CAAC;wBACH,CAAC;wBAED,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;gCACvC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACtD,CAAC;wBACH,CAAC;wBAED,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;gCACvC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACxD,CAAC;wBACH,CAAC;wBAED,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;gCACvC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACtD,CAAC;wBACH,CAAC;wBAED,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;gCACvC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACxD,CAAC;wBACH,CAAC;wBAED,IAAI,GAAG,GAAG,SAAS,EAAE,CAAC;4BACpB,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;4BACtD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gCACf,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gCACzC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;gCAClB,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;4BACzD,CAAC;wBACH,CAAC;wBACD,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG;4BAC3B,WAAW;4BACX,UAAU;4BACV,OAAO;4BACP,SAAS;4BACT,OAAO;4BACP,SAAS;4BACT,UAAU;4BACV,cAAc;yBACf,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IACE,CAAC,gBAAC,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;YAC5B,CAAC,gBAAC,CAAC,WAAW,CAAC,YAAY,CAAC;YAC5B,CAAC,gBAAC,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,EACjC,CAAC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,GAAG,CAAC,CAAC;QACrE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,UAAU,CAAC,WAAW,EAAE,OAAO,GAAG,CAAC;IACvD,+BAA+B;IAC/B,6GAA6G;IAC7G,0HAA0H;IAC1H,2DAA2D;IAC3D,2CAA2C;IAE3C,sGAAsG;IACtG,8BAA8B;IAC9B,OAAO,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE;QAC7D,qBAAqB;QACrB,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,+CAA+C,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;QACD,kCAAkC;QAClC,iFAAiF;QACjF,MAAM,aAAa,GAAG,IAAI,MAAM,CAC9B,SAAS,gBAAC,CAAC,YAAY,CAAC,WAAW,CAAC,wDAAwD,EAC5F,GAAG,CACJ,CAAC;QACF,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uCAAuC,WAAW,0CAA0C,CAC7F,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,OAAO,CAAC,gBAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAAO,GAAG,CAAC;IAC9C,OAAO,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE;QAC7D,IAAI,GAAG,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACvD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,2BAA2B;QAE/E,IAAI,KAAK,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAE5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,gBAAC,CAAC,KAAK,CAAC,oBAAY,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,GAAG,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,aAAa;AAEb;;;GAGG"}
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-bars.d.ts","sourceRoot":"","sources":["../../../lib/commands/system-bars.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"system-bars.d.ts","sourceRoot":"","sources":["../../../lib/commands/system-bars.js"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,wEAFa,OAAO,CAAC,YAAY,CAAC,CAajC;AAED;;;;;;;;GAQG;AACH,gGAPW,OAAO,SAAS,EAAE,gBAAgB,cAElC,MAAM,GAGJ,OAAO,CAAC,MAAM,CAAC,CAqC3B;AAID;;;;;;;;;GASG;AACH,qFANW,MAAM,SACN,KAAK,CAAC,MAAM,CAAC,GAEX,gBAAgB,CAsB5B;AAED;;;;;;;;;GASG;AACH,6EANW,MAAM,GAEL,YAAY,CA2DvB;kBAKY,OAAO,YAAY,EAAE,GAAG;2BACxB,OAAO,eAAe,EAAE,YAAY;+BACpC,OAAO,SAAS,EAAE,gBAAgB"}
|
|
@@ -11,6 +11,9 @@ const driver_1 = require("appium/driver");
|
|
|
11
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
12
12
|
const WINDOW_TITLE_PATTERN = /^\s+Window\s#\d+\sWindow\{[0-9a-f]+\s\w+\s([\w-]+)\}:$/;
|
|
13
13
|
const FRAME_PATTERN = /\bm?[Ff]rame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/;
|
|
14
|
+
// https://github.com/appium/appium-uiautomator2-driver/issues/904
|
|
15
|
+
const STATUS_BAR_TYPE_PATTERN = /\bty=STATUS_BAR\b/;
|
|
16
|
+
const NAVIGATION_BAR_TYPE_PATTERN = /\bty=NAVIGATION_BAR\b/;
|
|
14
17
|
const VIEW_VISIBILITY_PATTERN = /\bmViewVisibility=(0x[0-9a-fA-F]+)/;
|
|
15
18
|
// https://developer.android.com/reference/android/view/View#VISIBLE
|
|
16
19
|
const VIEW_VISIBLE = 0x0;
|
|
@@ -147,10 +150,12 @@ function parseWindows(lines) {
|
|
|
147
150
|
/** @type {{statusBar?: WindowProperties, navigationBar?: WindowProperties}} */
|
|
148
151
|
const result = {};
|
|
149
152
|
for (const [name, props] of lodash_1.default.toPairs(windows)) {
|
|
150
|
-
if (name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)
|
|
153
|
+
if (name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)
|
|
154
|
+
|| props.some((/** @type {string} */ line) => STATUS_BAR_TYPE_PATTERN.test(line))) {
|
|
151
155
|
result.statusBar = parseWindowProperties.bind(this)(name, props);
|
|
152
156
|
}
|
|
153
|
-
else if (name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)
|
|
157
|
+
else if (name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)
|
|
158
|
+
|| props.some((/** @type {string} */ line) => NAVIGATION_BAR_TYPE_PATTERN.test(line))) {
|
|
154
159
|
result.navigationBar = parseWindowProperties.bind(this)(name, props);
|
|
155
160
|
}
|
|
156
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-bars.js","sourceRoot":"","sources":["../../../lib/commands/system-bars.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"system-bars.js","sourceRoot":"","sources":["../../../lib/commands/system-bars.js"],"names":[],"mappings":"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"}
|
package/lib/commands/misc.js
CHANGED
|
@@ -342,8 +342,7 @@ export async function getNetworkTrafficInfo(retries = 2) {
|
|
|
342
342
|
}
|
|
343
343
|
|
|
344
344
|
let returnIndex = 1;
|
|
345
|
-
for (
|
|
346
|
-
data = arrayList[i];
|
|
345
|
+
for (const data of arrayList) {
|
|
347
346
|
start = data.indexOf(NETWORK_KEYS[index][0]);
|
|
348
347
|
|
|
349
348
|
if (start >= 0) {
|
|
@@ -3,6 +3,9 @@ import _ from 'lodash';
|
|
|
3
3
|
|
|
4
4
|
const WINDOW_TITLE_PATTERN = /^\s+Window\s#\d+\sWindow\{[0-9a-f]+\s\w+\s([\w-]+)\}:$/;
|
|
5
5
|
const FRAME_PATTERN = /\bm?[Ff]rame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/;
|
|
6
|
+
// https://github.com/appium/appium-uiautomator2-driver/issues/904
|
|
7
|
+
const STATUS_BAR_TYPE_PATTERN = /\bty=STATUS_BAR\b/;
|
|
8
|
+
const NAVIGATION_BAR_TYPE_PATTERN = /\bty=NAVIGATION_BAR\b/;
|
|
6
9
|
const VIEW_VISIBILITY_PATTERN = /\bmViewVisibility=(0x[0-9a-fA-F]+)/;
|
|
7
10
|
// https://developer.android.com/reference/android/view/View#VISIBLE
|
|
8
11
|
const VIEW_VISIBLE = 0x0;
|
|
@@ -152,9 +155,15 @@ export function parseWindows(lines) {
|
|
|
152
155
|
/** @type {{statusBar?: WindowProperties, navigationBar?: WindowProperties}} */
|
|
153
156
|
const result = {};
|
|
154
157
|
for (const [name, props] of _.toPairs(windows)) {
|
|
155
|
-
if (
|
|
158
|
+
if (
|
|
159
|
+
name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX)
|
|
160
|
+
|| props.some((/** @type {string} */ line) => STATUS_BAR_TYPE_PATTERN.test(line))
|
|
161
|
+
) {
|
|
156
162
|
result.statusBar = parseWindowProperties.bind(this)(name, props);
|
|
157
|
-
} else if (
|
|
163
|
+
} else if (
|
|
164
|
+
name.startsWith(NAVIGATION_BAR_WINDOW_NAME_PREFIX)
|
|
165
|
+
|| props.some((/** @type {string} */ line) => NAVIGATION_BAR_TYPE_PATTERN.test(line))
|
|
166
|
+
) {
|
|
158
167
|
result.navigationBar = parseWindowProperties.bind(this)(name, props);
|
|
159
168
|
}
|
|
160
169
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "10.3.
|
|
3
|
+
"version": "10.3.9",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"prettier": "^3.0.1",
|
|
93
93
|
"rimraf": "^5.0.0",
|
|
94
94
|
"semantic-release": "^24.0.0",
|
|
95
|
-
"sinon": "^
|
|
95
|
+
"sinon": "^21.0.0",
|
|
96
96
|
"ts-node": "^10.9.1",
|
|
97
97
|
"typescript": "^5.4.2",
|
|
98
98
|
"xpath": "^0.x"
|