diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 1270a88..82f06ca 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -42,7 +42,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.03.11)" +CONST_APP_VERSION = "MaxBot (2024.03.12)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/config_launcher.py b/config_launcher.py index 58b4609..0bf6a12 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -23,8 +23,8 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2024.03.11)" -s +CONST_APP_VERSION = "MaxBot (2024.03.12)" + CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/kktix_signout.py b/kktix_signout.py index f9e28cd..6405e97 100644 --- a/kktix_signout.py +++ b/kktix_signout.py @@ -11,7 +11,7 @@ import requests import asyncio import nodriver as uc -CONST_APP_VERSION = "MaxBot (2024.03.11)" +CONST_APP_VERSION = "MaxBot (2024.03.12)" CONST_MAXBOT_CONFIG_FILE = "settings.json" USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" diff --git a/kktix_status.py b/kktix_status.py index faa1199..8e8df0b 100644 --- a/kktix_status.py +++ b/kktix_status.py @@ -29,7 +29,7 @@ from datetime import datetime import requests -CONST_APP_VERSION = "MaxBot (2024.03.11)" +CONST_APP_VERSION = "MaxBot (2024.03.12)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" diff --git a/settings.py b/settings.py index 61f37be..100a592 100644 --- a/settings.py +++ b/settings.py @@ -50,7 +50,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.03.11)" +CONST_APP_VERSION = "MaxBot (2024.03.12)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js b/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js index 33c353f..018d1f5 100644 --- a/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js +++ b/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js @@ -1,3 +1,22 @@ +function goEvent(){ + if(urlThrottler.indexOf('https://event.cityline.com/')>-1) { + window.location.href = urlThrottler; + } else { + document.getElementById("multiple_tab_layout").innerHTML = 'start to retry'; + + var ddsScheduler = undefined; + var retryingMsg = "重試中...
Retrying..."; + var retryingMsg2 = "重試中... Retrying..."; + var enableAutoRetry = true; + var remainTime = 10; + var enableButtonTime = 7; + + document.getElementById("busy_zone").innerHTML = ''; + setTimeout(startCountDownTimer, 1000); + } + +} + function begin() { let settings = JSON.parse($("#settings").html()); @@ -27,6 +46,12 @@ function begin() $(".btn_cta").prop('disabled', false).trigger("click"); }, target_interval); } + + if(window.IsDuplicate()) { + window.IsDuplicate = function () {return false;}; + document.getElementById("busy_zone").innerHTML = ''; + setTimeout(startCountDownTimer, 1000); + } } function dom_ready() diff --git a/webdriver/Maxbotplus_1.0.0/manifest.json b/webdriver/Maxbotplus_1.0.0/manifest.json index f49e5fa..6cf2ec7 100644 --- a/webdriver/Maxbotplus_1.0.0/manifest.json +++ b/webdriver/Maxbotplus_1.0.0/manifest.json @@ -306,7 +306,9 @@ }, { "matches": [ - "https://msg.cityline.com/*.html*" + "https://msg.cityline.com/*.html*", + "https://*.cityline.com/utsvInternet/*/home?lang=TW", + "https://event.cityline.com/" ], "run_at": "document_end", "js": [ @@ -316,7 +318,9 @@ }, { "matches": [ - "https://msg.cityline.com/*" + "https://msg.cityline.com/*", + "https://*.cityline.com/utsvInternet/*/home?lang=TW", + "https://event.cityline.com/" ], "run_at": "document_end", "world": "MAIN", @@ -413,5 +417,5 @@ ] } ], - "version": "1.0.16" + "version": "1.0.17" } \ No newline at end of file