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

support multi modem pools

Browse Source
This commit is contained in:
Lei PAN
2022-04-15 15:54:54 +02:00
parent 5df5d79f4d
commit 401f20eb09
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+1 -1
View File
@@ -122,4 +122,4 @@ def get_proxy(phone_number):
if __name__ == '__main__':
start_book(25, 28)
start_book(31, 31)
modems/ModemPool.py
+4
View File
@@ -124,3 +124,7 @@ class ModemPool:
def _execut_USSD_cmd(self, cmd, ser) -> bytes:
# the timeout for ussd command can be 120 s in mac
return self._send_command(cmd, ser, 120)
def close(self):
for serial in self._serial_list:
serial.close()
params.py
+25 -17
View File
@@ -4,22 +4,22 @@ from db.DbManager import DataManager
from logs.LogSender import LogSender
MODEM_POOL_PORTS = [
# "/dev/tty.usbmodem1431101",
# "/dev/tty.usbmodem1431103",
# "/dev/tty.usbmodem1431105",
# "/dev/tty.usbmodem1431107",
# "/dev/tty.usbmodem1431201",
# "/dev/tty.usbmodem1431203",
# "/dev/tty.usbmodem1431205",
# "/dev/tty.usbmodem1431207",
# "/dev/tty.usbmodem1431301",
# ## "/dev/tty.usbmodem1431303",
# "/dev/tty.usbmodem1431305",
# "/dev/tty.usbmodem1431307",
# "/dev/tty.usbmodem1431401",
# "/dev/tty.usbmodem1431403",
# "/dev/tty.usbmodem1431405",
# "/dev/tty.usbmodem1431407",
"/dev/tty.usbmodem1431101",
"/dev/tty.usbmodem1431103",
"/dev/tty.usbmodem1431105",
"/dev/tty.usbmodem1431107",
"/dev/tty.usbmodem1431201",
"/dev/tty.usbmodem1431203",
"/dev/tty.usbmodem1431205",
"/dev/tty.usbmodem1431207",
"/dev/tty.usbmodem1431301",
## "/dev/tty.usbmodem1431303",
"/dev/tty.usbmodem1431305",
"/dev/tty.usbmodem1431307",
"/dev/tty.usbmodem1431401",
"/dev/tty.usbmodem1431403",
"/dev/tty.usbmodem1431405",
"/dev/tty.usbmodem1431407",
"/dev/tty.usbmodem1434101",
"/dev/tty.usbmodem1434103",
"/dev/tty.usbmodem1434105",
@@ -38,4 +38,12 @@ PROXY_SERVER = "http://gw.ntnt.io:5959"
PROXY_USERNAME = "panleicim-res-fr-192012"
PROXY_PASSWORD = "94sY7zwBG13i"
DEVICES = ['iPad (gen 6)', 'iPad (gen 6) landscape', 'iPad (gen 7)', 'iPad (gen 7) landscape', 'iPad Mini', 'iPad Mini landscape', 'iPad Pro 11', 'iPad Pro 11 landscape', 'iPhone 6', 'iPhone 6 landscape', 'iPhone 6 Plus', 'iPhone 6 Plus landscape', 'iPhone 7', 'iPhone 7 landscape', 'iPhone 7 Plus', 'iPhone 7 Plus landscape', 'iPhone 8', 'iPhone 8 landscape', 'iPhone 8 Plus', 'iPhone 8 Plus landscape', 'iPhone SE', 'iPhone SE landscape', 'iPhone X', 'iPhone X landscape', 'iPhone XR', 'iPhone XR landscape', 'iPhone 11', 'iPhone 11 landscape', 'iPhone 11 Pro', 'iPhone 11 Pro landscape', 'iPhone 11 Pro Max', 'iPhone 11 Pro Max landscape', 'iPhone 12', 'iPhone 12 landscape', 'iPhone 12 Pro', 'iPhone 12 Pro landscape', 'iPhone 12 Pro Max', 'iPhone 12 Pro Max landscape', 'iPhone 12 Mini','iPhone 13', 'iPhone 13 landscape', 'iPhone 13 Pro', 'iPhone 13 Pro landscape', 'iPhone 13 Pro Max', 'iPhone 13 Mini']
DEVICES = ['iPad (gen 6)', 'iPad (gen 6) landscape', 'iPad (gen 7)', 'iPad (gen 7) landscape', 'iPad Mini',
'iPad Mini landscape', 'iPad Pro 11', 'iPad Pro 11 landscape', 'iPhone 6', 'iPhone 6 landscape',
'iPhone 6 Plus', 'iPhone 6 Plus landscape', 'iPhone 7', 'iPhone 7 landscape', 'iPhone 7 Plus',
'iPhone 7 Plus landscape', 'iPhone 8', 'iPhone 8 landscape', 'iPhone 8 Plus', 'iPhone 8 Plus landscape',
'iPhone SE', 'iPhone SE landscape', 'iPhone X', 'iPhone X landscape', 'iPhone XR', 'iPhone XR landscape',
'iPhone 11', 'iPhone 11 landscape', 'iPhone 11 Pro', 'iPhone 11 Pro landscape', 'iPhone 11 Pro Max',
'iPhone 11 Pro Max landscape', 'iPhone 12', 'iPhone 12 landscape', 'iPhone 12 Pro',
'iPhone 12 Pro landscape', 'iPhone 12 Pro Max', 'iPhone 12 Pro Max landscape', 'iPhone 12 Mini', 'iPhone 13',
'iPhone 13 landscape', 'iPhone 13 Pro', 'iPhone 13 Pro landscape', 'iPhone 13 Pro Max', 'iPhone 13 Mini']
wait_for_sms.py
+4 -4
View File
@@ -23,6 +23,7 @@ init_logger()
logger = logging.getLogger()
logger.addHandler(logging.StreamHandler(stream=sys.stdout))
def get_devices_ports() -> list:
return MODEM_POOL_PORTS
@@ -52,10 +53,8 @@ def init_modems() -> list:
return modems
def start_waiting_sms():
def start_waiting_sms(start_slot_number, end_slot_sum):
params.oracle_log_sender.send_wait_sms_log()
start_slot_number = 1
end_slot_sum = 2
slot_list = list(range(start_slot_number, end_slot_sum + 1))
for i in reversed(slot_list):
card_pool.reset()
@@ -92,8 +91,9 @@ def start_waiting_sms():
# print("sleep for 2 s")
time.sleep(2)
print("will call continue")
modem_pool.close()
continue
if __name__ == '__main__':
start_waiting_sms()
start_waiting_sms(1, 3)