add sleep before click on the valid btn

This commit is contained in:
2022-04-07 14:29:34 +02:00
parent 3647a2f811
commit 2582c7ba1e
3 changed files with 9 additions and 8 deletions
+3 -2
View File
@@ -64,9 +64,9 @@ class CommandorPage:
self._checkCgu() self._checkCgu()
# wait for sms_code field # wait for sms_code field
self.clickOnValidBtn() self.clickOnValidBtn()
on_ready_for_otp(e, self)
otp_input = self.page.locator(OTP_FIELD_ID) otp_input = self.page.locator(OTP_FIELD_ID)
otp_input.wait_for(state='visible', timeout=90000) otp_input.wait_for(state='visible', timeout=90000)
on_ready_for_otp(e, self)
event_is_set = e.wait() event_is_set = e.wait()
logging.info('event set: %s', event_is_set) logging.info('event set: %s', event_is_set)
if self.otp_value: if self.otp_value:
@@ -74,7 +74,7 @@ class CommandorPage:
time.sleep(get_random_wait_time()) time.sleep(get_random_wait_time())
self.clickOnValidBtn() self.clickOnValidBtn()
otp_sent = self.page.locator(MESSAGE_FIELD_CLASS) otp_sent = self.page.locator(MESSAGE_FIELD_CLASS)
otp_sent.wait_for(state='visible') otp_sent.wait_for(state='visible', timeout=90000)
message = self.page.content() message = self.page.content()
# print("message is:" + message) # print("message is:" + message)
time.sleep(get_random_wait_time()) time.sleep(get_random_wait_time())
@@ -173,6 +173,7 @@ class CommandorPage:
def clickOnValidBtn(self): def clickOnValidBtn(self):
# self.page.mouse.wheel(0, random.randint(400, 500)) # self.page.mouse.wheel(0, random.randint(400, 500))
time.sleep(get_random_wait_time())
self.page.evaluate("""document.getElementsByClassName("btn")[0].click();""") self.page.evaluate("""document.getElementsByClassName("btn")[0].click();""")
def clear_app_data(self): def clear_app_data(self):
+2 -2
View File
@@ -20,7 +20,7 @@ from pojo.serial_modem import SerialModem
from utils.excel_reader import ExcelHelper from utils.excel_reader import ExcelHelper
from utils.operator import check_operator, Operator from utils.operator import check_operator, Operator
OTP_TIMEOUT = 180 OTP_TIMEOUT = 240
is_finished = False is_finished = False
commandor = CommandorPage() commandor = CommandorPage()
thread_event = None thread_event = None
@@ -173,7 +173,7 @@ def on_ready_for_otp(e: Event, commandor: CommandorPage):
def start_book(): def start_book():
start_slot_number = 1 start_slot_number = 1
end_slot_number = 1 end_slot_number = 21
slot_list = list(range(start_slot_number, end_slot_number + 1)) slot_list = list(range(start_slot_number, end_slot_number + 1))
random.shuffle(slot_list) random.shuffle(slot_list)
for i in slot_list: for i in slot_list:
+4 -4
View File
@@ -1,5 +1,4 @@
import logging import logging
import random
import sys import sys
import time import time
from typing import Union from typing import Union
@@ -7,7 +6,6 @@ from typing import Union
from gsmmodem import GsmModem from gsmmodem import GsmModem
import params import params
from commandor_page import CommandorPage
from logs.AppLogging import init_logger from logs.AppLogging import init_logger
from modems.ModemPool import ModemPool from modems.ModemPool import ModemPool
from modems.card_pool import CardPool from modems.card_pool import CardPool
@@ -16,7 +14,6 @@ from pojo.serial_modem import SerialModem
from utils.excel_reader import ExcelHelper from utils.excel_reader import ExcelHelper
OTP_TIMEOUT = 40 OTP_TIMEOUT = 40
commandor = CommandorPage()
thread_event = None thread_event = None
current_gsm_modem = None current_gsm_modem = None
card_pool = CardPool(CARD_POOL_PORT) card_pool = CardPool(CARD_POOL_PORT)
@@ -43,7 +40,6 @@ def create_modem_for_port(port: str) -> Union[SerialModem, None]:
def timeout_occurred(serial_modem: SerialModem): def timeout_occurred(serial_modem: SerialModem):
logger.info("will close timeout modem") logger.info("will close timeout modem")
serial_modem.modem.close() serial_modem.modem.close()
commandor.reset_air_plan_mode()
def start_to_handle_sms(serial_modem: SerialModem): def start_to_handle_sms(serial_modem: SerialModem):
@@ -57,6 +53,8 @@ def start_to_handle_sms(serial_modem: SerialModem):
serial_modem.modem.smsReceivedCallback = handle_sms serial_modem.modem.smsReceivedCallback = handle_sms
serial_modem.modem.smsTextMode = False serial_modem.modem.smsTextMode = False
logger.info('Waiting for SMS message, for phone number ' + str(serial_modem.phone_number)) logger.info('Waiting for SMS message, for phone number ' + str(serial_modem.phone_number))
# input("Press Enter to continue...")
# return
listen_at = time.time() listen_at = time.time()
while True: while True:
time.sleep(2) time.sleep(2)
@@ -111,6 +109,8 @@ def start_waiting_sms():
modem.phone_number = contact[0].phone modem.phone_number = contact[0].phone
modem.contact = contact[0] modem.contact = contact[0]
start_to_handle_sms(modem) start_to_handle_sms(modem)
# else:
# print("not found, skip")
except Exception as error: except Exception as error:
print(error) print(error)
continue continue