diff --git a/src/android/adb.js b/src/android/adb.js index 7dc15d6..a3a2566 100644 --- a/src/android/adb.js +++ b/src/android/adb.js @@ -1,6 +1,9 @@ const {exec} = require("child_process"); -DEVICE_REGEX = "(^[a-z0-9A-Z]*) .* model:([a-z0-9A-Z_]+)" +// DEVICE_REGEX = "(^[a-z0-9A-Z]*) .* model:([a-z0-9A-Z_]+)" +DEVICE_REGEX = "(^[a-z0-9A-Z-.:]*) .* model:([a-z0-9A-Z_]+)" +// DEVICE_REGEX = "(^[a-z0-9A-Z-]*) .* model:([a-z0-9A-Z_]+)" + async function devices() { return new Promise((resolve, reject) => { diff --git a/src/models/OCRResult.js b/src/models/OCRResult.js index c5844ac..c12c6c6 100644 --- a/src/models/OCRResult.js +++ b/src/models/OCRResult.js @@ -21,6 +21,7 @@ const OCRResult = { RECAPTCHA_FAILED: Symbol("RECAPTCHA_FAILED"), RECAPTCHA_ERROR: Symbol("RECAPTCHA_ERROR"), NO_INTERNET: Symbol("NO_INTERNET"), + CHROME_NOTIFICATION: Symbol("CHROME_NOTIFICATION"), BRAVE_SKIP: Symbol("BRAVE_SKIP"), BRAVE_PRIVACY: Symbol("BRAVE_PRIVACY"), BRAVE_PRIVACY_PUB: Symbol("BRAVE_PRIVACY_PUB"), diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 1a99f5e..4ca2b36 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -11,7 +11,6 @@ const {exec} = require("child_process"); const {openUrlWithAdb} = require("../utiles/CmdUtils"); const RequestDataPojo = require("../models/RequestDataPojo"); const {REQUEST_DATA_OBJECT, TEST_QUEUE} = require("../queue/Sender"); -// const RDV_URL = "http://192.168.0.44:8000/test_appointment.html" const RDV_URL = "https://rendezvousparis.hermes.com/client/register"; const BLANK_URL = "about:blank" const ERROR_CAPTCHA_UNSOLVABLE = "ERROR_CAPTCHA_UNSOLVABLE"; @@ -888,6 +887,10 @@ class CommandorPage { case OCRResult.SLIDING_CAPTCHA_REFRESH: await this.connect_to_browser(checkResult) break; + case OCRResult.CHROME_NOTIFICATION: + await this.handleChromeNotification() + await this.checkResultWithOcr(); + break; case OCRResult.SLIDING_CAPTCHA: logWithDevice("will call this.slidingCaptcha()", this.device) await this.slidingCaptcha(async (isSuccessful) => { @@ -1448,6 +1451,8 @@ class CommandorPage { this.device.shell("input tap " + 490 + " " + 1910) } else if (model === "RMX3151") { this.device.shell("input tap " + 492 + " " + 1960) + } else if (model === "Pixel") { + this.device.shell("input tap " + 312 + " " + 1490) } else if (model === "Mi Note 10") { this.device.shell("input tap " + 550 + " " + 1920) } else if (model === "ONEPLUS_A6000") { @@ -1545,6 +1550,16 @@ class CommandorPage { await this.tapForDevice(this.device, 100, 400) } + + async handleChromeNotification() { + let model = this.device.model + if (model === "KB2003" || model === "22041219PG" || model === "DE2117" || model === "21091116C") { + await this.tapForDevice(this.device, 545, 1448) + } else if (model === "sdk_gphone64_arm64") { + await this.tapForDevice(this.device, 484, 1723) + } else + await this.tapForDevice(this.device, 100, 400) + } } module diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js index 607344f..a4be51a 100644 --- a/src/workers/OCRChecker.js +++ b/src/workers/OCRChecker.js @@ -60,6 +60,7 @@ const PAGE_OPTIMIZATION_CHROME_FR_4 = "de nouvelles fonctionnalités" const PAGE_OPTIMIZATION_CHROME_FR_5 = "Avec la mesure des performance" const PAGE_OPTIMIZATION_CHROME_FR_7 = "Les annonces suggérées par les" const PAGE_OPTIMIZATION_CHROME_FR_8 = "Chrome estime vos centres" +const CHROME_NOTIFICATION = "Les notifications de Chrome" const ONLINE_APPOINTMENT = "Online Appointment" const CONFIRM_RESEND_FORM_FR = "Confirmer le nouvel envoi" const CLOSED_MESSAGE_FR = "Depuis plus de 130 ans" @@ -109,6 +110,9 @@ class OCRChecker { } else if (result.includes(PUSH_NOTIFICATION_1)) { await this.deleteFile(fileName) return OCRResult.BRAVE_PUSH_NOTIFICATION + } else if (result.includes(CHROME_NOTIFICATION)) { + await this.deleteFile(fileName) + return OCRResult.CHROME_NOTIFICATION } else if (result.includes(CHOOSE_POSITION_GOOGLE_FR)) { await this.deleteFile(fileName) return OCRResult.CHOOSE_POSITION