From 4c80f75f31ce36dc8867d7b7b79031e05874251f Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Tue, 23 Apr 2024 23:31:59 +0200 Subject: [PATCH] support more texts --- src/queue/Sender.js | 9 +++++---- src/workers/CommandorPage.js | 2 +- src/workers/OCRChecker.js | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/queue/Sender.js b/src/queue/Sender.js index 4516fcf..626314d 100644 --- a/src/queue/Sender.js +++ b/src/queue/Sender.js @@ -4,11 +4,12 @@ const QUEUE_HOST = "amqp://appointment:ZyuhJZ2xEYWhElhpJjy7YEpZGZwNYJz2fHIu@appo const REQUEST_DATA_QUEUE_FR = 'REQUEST_DATA'; const REQUEST_DATA_QUEUE_DE = 'REQUEST_DATA_DE'; const REQUEST_DATA_OBJECT = "REQUEST_DATA_OBJECT" -const TEST_QUEUE = "TEST_QUEUE" -// const TEST_QUEUE = "SHARED_OBJECT" +// const TEST_QUEUE = "TEST_QUEUE" +// const TEST_QUEUE = "MORNING_DATA_CACHE" +const TEST_QUEUE = "SHARED_OBJECT" class Sender { - channel; + channel;p connection; async initConnection() { @@ -19,7 +20,7 @@ class Sender { await this.channel.assertQueue(REQUEST_DATA_QUEUE_FR, {persistent: true}); } - sendMessage(msg, queue_name = REQUEST_DATA_QUEUE_FR) { + sendMessage(msg, queue_name = REQUEST_DATA_QUEUE_DE) { this.channel.sendToQueue(queue_name, Buffer.from(msg),{ persistent:true }) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 2063c7d..977ae55 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -1293,7 +1293,7 @@ class CommandorPage { async handleBraveSkipBtn() { let model = this.device.model() if (model === "CPH2219") { - await this.device.shell("input tap " + 558 + " " + 1160) + await this.tapForDevice(this.device, 558, 1160) } else if (model === "MI 5s" || model === "ASUS_Z012D") { await this.tapForDevice(this.device, 530, 1000) } else if (model === "SM-G965U1") { diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js index 3064f2b..3578827 100644 --- a/src/workers/OCRChecker.js +++ b/src/workers/OCRChecker.js @@ -135,9 +135,10 @@ class OCRChecker { await this.deleteFile(fileName) return OCRResult.BRAVE_NOTIFICATION } 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) || result.includes(SLIDING_CAPTCHA_FR_6)) { - await this.deleteFile(fileName) if (result.includes(SLIDING_CAPTCHA_LOADING_FR)) { return OCRResult.SLIDING_CAPTCHA_LOADING + } else { + await this.deleteFile(fileName) } // await this.deleteFile(screenShot) // if (result.includes("rac"))