panleicim/puppeteerjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:panleicim/puppeteerjs

Browse Source
This commit is contained in:
Lei PAN
2023-10-28 15:59:28 +02:00
parent 6d27719ae2 80f363fd10
commit dbfd85fd37
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/workers/CommandorPage.js
+2 -2
View File
@@ -749,8 +749,8 @@ class CommandorPage {
async slidingCaptcha(onResult) { async slidingCaptcha(onResult) {
logWithDevice("slidingCaptcha", this.device); logWithDevice("slidingCaptcha", this.device);
if (this.device.model() === "MI 5s") { if (this.device.model() === "MI 5s" || this.device.model() === "ASUS_X00QD") {
let cmd = `adb -s ${this.device.serial()} shell input touchscreen swipe 900 495 900 295` let cmd = `adb -s ${this.device.serial()} shell input touchscreen swipe 900 495 900 195`
await exec(cmd); await exec(cmd);
await delay(1000); await delay(1000);
} }
src/workers/OCRChecker.js
+2 -1
View File
@@ -38,6 +38,7 @@ const SLIDING_CAPTCHA_FR = "Pourquoi cette vérification"
const SLIDING_CAPTCHA_FR_2 = "Glissez vers la droite pour" const SLIDING_CAPTCHA_FR_2 = "Glissez vers la droite pour"
const SLIDING_CAPTCHA_FR_3 = "la droite pour completer le puzzle" const SLIDING_CAPTCHA_FR_3 = "la droite pour completer le puzzle"
const SLIDING_CAPTCHA_FR_4 = " s'assure qu'on s'adresse bien" const SLIDING_CAPTCHA_FR_4 = " s'assure qu'on s'adresse bien"
const SLIDING_CAPTCHA_FR_5 = "On s'assure que c'est"
const MESSAGE_FILL_FIELD_FR = "Demande de rendez-vous pour" const MESSAGE_FILL_FIELD_FR = "Demande de rendez-vous pour"
const MESSAGE_FILL_FIELD_FR_2 = "des champs de données doivent étre complétés" const MESSAGE_FILL_FIELD_FR_2 = "des champs de données doivent étre complétés"
const MESSAGE_FILL_FIELD_FR_3 = "Sans préféré" const MESSAGE_FILL_FIELD_FR_3 = "Sans préféré"
@@ -133,7 +134,7 @@ class OCRChecker {
await this.deleteFile(fileName) await this.deleteFile(fileName)
await this.deleteFile(screenShot) await this.deleteFile(screenShot)
return OCRResult.RECHECK return OCRResult.RECHECK
} else if (result.includes(SLIDING_CAPTCHA_FR) || result.includes(SLIDING_CAPTCHA_FR_2) || result.includes(SLIDING_CAPTCHA_FR_3) || result.includes(SLIDING_CAPTCHA_FR_4)) { } else if (result.includes(SLIDING_CAPTCHA_FR) || result.includes(SLIDING_CAPTCHA_FR_2) || result.includes(SLIDING_CAPTCHA_FR_3) || result.includes(SLIDING_CAPTCHA_FR_4) || result.includes(SLIDING_CAPTCHA_FR_5)) {
await this.deleteFile(fileName) await this.deleteFile(fileName)
await this.deleteFile(screenShot) await this.deleteFile(screenShot)
// if (result.includes("rac")) // if (result.includes("rac"))