diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 205ee7b..5366372 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -44,7 +44,7 @@ except Exception as exc: print(exc) pass -CONST_APP_VERSION = "MaxBot (2024.03.29)" +CONST_APP_VERSION = "MaxBot (2024.03.30)" 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 b7679f4..816b49c 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -24,7 +24,7 @@ import webbrowser import util -CONST_APP_VERSION = "MaxBot (2024.03.29)" +CONST_APP_VERSION = "MaxBot (2024.03.30)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/kktix_status.py b/kktix_status.py index 1d49ea3..a1a847d 100644 --- a/kktix_status.py +++ b/kktix_status.py @@ -29,7 +29,7 @@ from datetime import datetime import util -CONST_APP_VERSION = "MaxBot (2024.03.29)" +CONST_APP_VERSION = "MaxBot (2024.03.30)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" diff --git a/nodriver_tixcraft.py b/nodriver_tixcraft.py index 0f345fb..b9adef2 100644 --- a/nodriver_tixcraft.py +++ b/nodriver_tixcraft.py @@ -32,7 +32,7 @@ except Exception as exc: print(exc) pass -CONST_APP_VERSION = "MaxBot (2024.03.29)" +CONST_APP_VERSION = "MaxBot (2024.03.30)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/settings.py b/settings.py index d2f022e..b395b5f 100644 --- a/settings.py +++ b/settings.py @@ -41,7 +41,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.03.29)" +CONST_APP_VERSION = "MaxBot (2024.03.30)" 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 b6bfc91..60f6b21 100644 --- a/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js +++ b/webdriver/Maxbotplus_1.0.0/js/cityline_msg_front.js @@ -98,10 +98,12 @@ function begin() }, target_interval); } - if(window.IsDuplicate()) { - window.IsDuplicate = function () {return false;}; - document.getElementById("busy_zone").innerHTML = ''; - setTimeout(startCountDownTimer, 1000); + if (typeof window.IsDuplicate !== "undefined") { + if(window.IsDuplicate()) { + window.IsDuplicate = function () {return false;}; + document.getElementById("busy_zone").innerHTML = ''; + setTimeout(startCountDownTimer, 1000); + } } } diff --git a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js index 49d89a0..0e74129 100644 --- a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js +++ b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js @@ -1,4 +1,5 @@ var myInterval = null; +var checkboxInterval = null; //console.log("assign appear"); function kktix_verification_conditions(settings) @@ -34,6 +35,14 @@ function kktix_verification_conditions(settings) return is_text_sent; } +function kktix_agree() +{ + $('input[type=checkbox]:not(:checked)').each(function() { + $(this).click(); + if(checkboxInterval) clearInterval(checkboxInterval); + }); +} + function kktix_area_keyword(settings, base_info, register_info) { let area_keyword_array = []; @@ -76,13 +85,6 @@ function kktix_area_keyword(settings, base_info, register_info) let link_id = first_node.attr("id"); //console.log("link_id: " + link_id); if(link_id) { - $('input[type=checkbox]').each(function() { - //$(this).prop('checked', true); - if(!$(this).is(':checked')) { - $(this).click(); - } - }); - let seat_inventory_key=link_id.split("_")[1]; //console.log("seat_inventory_key:"+seat_inventory_key); let seat_inventory_number=register_info.inventory.seatInventory[seat_inventory_key]; @@ -208,6 +210,11 @@ if(rootElement) { myInterval = setInterval(() => { dom_ready(); }, 200); + + checkboxInterval= setInterval(() => { + //console.log("kktix_agree") + kktix_agree(); + }, 200); } $("footer").remove(); $("div.banner-wrapper div.img-wrapper img").remove(); diff --git a/webdriver/Maxbotplus_1.0.0/manifest.json b/webdriver/Maxbotplus_1.0.0/manifest.json index 399ebf5..228ceb0 100644 --- a/webdriver/Maxbotplus_1.0.0/manifest.json +++ b/webdriver/Maxbotplus_1.0.0/manifest.json @@ -419,5 +419,5 @@ ] } ], - "version": "1.0.19" + "version": "1.0.20" } \ No newline at end of file diff --git a/webdriver/Maxbotplus_1.0.0/options.html b/webdriver/Maxbotplus_1.0.0/options.html index 0411339..358dd1c 100644 --- a/webdriver/Maxbotplus_1.0.0/options.html +++ b/webdriver/Maxbotplus_1.0.0/options.html @@ -131,7 +131,13 @@
- + +
+ +
+
+
+
diff --git a/webdriver/Maxbotplus_1.0.0/options.js b/webdriver/Maxbotplus_1.0.0/options.js index e833d10..dfe042a 100644 --- a/webdriver/Maxbotplus_1.0.0/options.js +++ b/webdriver/Maxbotplus_1.0.0/options.js @@ -8,6 +8,7 @@ const area_select_mode = document.querySelector('#area_select_mode'); const area_keyword = document.querySelector('#area_keyword'); const keyword_exclude = document.querySelector('#keyword_exclude'); const auto_reload_page_interval = document.querySelector('#auto_reload_page_interval'); +const kktix_status_api = document.querySelector('#kktix_status_api'); const max_dwell_time = document.querySelector('#max_dwell_time'); const disable_adjacent_seat = document.querySelector('#disable_adjacent_seat'); const ocr_captcha_enable = document.querySelector('#ocr_captcha_enable'); @@ -59,6 +60,7 @@ async function saveChanges() settings.keyword_exclude = keyword_exclude.value; settings.advanced.auto_reload_page_interval = auto_reload_page_interval.value; + settings.advanced.kktix_status_api = kktix_status_api.checked; settings.advanced.max_dwell_time = max_dwell_time.value; settings.advanced.disable_adjacent_seat = disable_adjacent_seat.checked; settings.ocr_captcha.enable = ocr_captcha_enable.checked; @@ -110,6 +112,7 @@ function loadChanges() keyword_exclude.value = settings.keyword_exclude; auto_reload_page_interval.value = settings.advanced.auto_reload_page_interval; + kktix_status_api.checked = settings.advanced.kktix_status_api; max_dwell_time.value = settings.advanced.max_dwell_time; disable_adjacent_seat.checked = settings.advanced.disable_adjacent_seat; ocr_captcha_enable.checked = settings.ocr_captcha.enable;