From ff9c9bc07dc7c5609e35a47caaa8c403fb0b6c3f Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 21 Sep 2024 12:48:23 +0200 Subject: [PATCH] support chrome --- src/workers/CommandorPage.js | 15 ++++++++++----- src/workers/SlidingCaptchaSolver.js | 4 ++-- start.js | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index e2545ee..329c4e3 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -89,8 +89,8 @@ class CommandorPage { this.port = port; this.sender = sender; this.ocrChecker = new OCRChecker(this.device, this.contact); - this.browserPackageName = "com.brave.browser"; - // this.browserPackageName = "com.android.chrome"; + // this.browserPackageName = "com.brave.browser"; + this.browserPackageName = "com.android.chrome"; this.isFillingFields = false; this.isTerminated = false; this.cguChecked = false; @@ -1142,8 +1142,10 @@ class CommandorPage { OCRResult.NEED_TO_CLICK_LATE_BTN : await this.tapLaterBtn() - this.firstStart = true; - await this.loadPage() + await delay(5000) + await this.checkResultWithOcr(); + // this.firstStart = true; + // await this.loadPage() break; case OCRResult.CLOSED @@ -1460,7 +1462,10 @@ class CommandorPage { } else if (model === "Mi Note 10") { this.device.shell("input tap " + 550 + " " + 1920) } else if (model === "ONEPLUS A6000") { - this.device.shell("input tap " + 535 + " " + 1945) + log("will tap on " + model + ": " + 535 + " " + 1930) + this.device.shell("input tap " + 535 + " " + 1930) + await delay(1000); + this.device.shell("input tap " + 535 + " " + 1930) } else if (model === "22041219PG") { this.device.shell("input tap " + 540 + " " + 1985) } else if (model === "21091116C") { diff --git a/src/workers/SlidingCaptchaSolver.js b/src/workers/SlidingCaptchaSolver.js index 387f241..0bf6985 100644 --- a/src/workers/SlidingCaptchaSolver.js +++ b/src/workers/SlidingCaptchaSolver.js @@ -5,8 +5,8 @@ const axios = require("axios"); const {v4: uuidv4} = require('uuid'); const OCRResult = require("../models/OCRResult"); -// const DEEPLEARNING_CAPTCHA_HOST = "http://appointment.lpaconsulting.fr:9000" -const DEEPLEARNING_CAPTCHA_HOST = "http://192.168.1.200:9000" +const DEEPLEARNING_CAPTCHA_HOST = "http://appointment.lpaconsulting.fr:9000" +// const DEEPLEARNING_CAPTCHA_HOST = "http://192.168.1.200:9000" function delay(delayInMs) { return new Promise(resolve => { diff --git a/start.js b/start.js index 157a32d..1ccc1e3 100644 --- a/start.js +++ b/start.js @@ -2,6 +2,6 @@ const {startBookWithNumbers} = require('./src/appointment') const {homedir} = require("os"); homeDir = homedir() //faubourg, random -startBookWithNumbers(0, 10000, "random", homeDir + "/Desktop/contact_list_2024-09-11.xlsx", true, false).then((r) => { +startBookWithNumbers(0, 10000, "random", homeDir + "/Desktop/16_04_to_test.xlsx", true, false).then((r) => { console.log(r) }) \ No newline at end of file