update version code to 2024-03-30

master
Your Name 2024-04-10 13:50:23 +08:00
parent e6ef9fdf56
commit 1293b2d47a
10 changed files with 36 additions and 18 deletions

View File

@ -44,7 +44,7 @@ except Exception as exc:
print(exc) print(exc)
pass 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_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -24,7 +24,7 @@ import webbrowser
import util 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_LAUNCHER_FILE = "config_launcher.json"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -29,7 +29,7 @@ from datetime import datetime
import util import util
CONST_APP_VERSION = "MaxBot (2024.03.29)" CONST_APP_VERSION = "MaxBot (2024.03.30)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json"

View File

@ -32,7 +32,7 @@ except Exception as exc:
print(exc) print(exc)
pass 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_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -41,7 +41,7 @@ try:
except Exception as exc: except Exception as exc:
pass 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_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -98,11 +98,13 @@ function begin()
}, target_interval); }, target_interval);
} }
if (typeof window.IsDuplicate !== "undefined") {
if(window.IsDuplicate()) { if(window.IsDuplicate()) {
window.IsDuplicate = function () {return false;}; window.IsDuplicate = function () {return false;};
document.getElementById("busy_zone").innerHTML = '<button id="btn-retry-en-1" class="btn_cta" type="button" disabled="disabled" onclick="javascript:goEvent()">請重試 Retry<span id="remainTime1"></span></button>'; document.getElementById("busy_zone").innerHTML = '<button id="btn-retry-en-1" class="btn_cta" type="button" disabled="disabled" onclick="javascript:goEvent()">請重試 Retry<span id="remainTime1"></span></button>';
setTimeout(startCountDownTimer, 1000); setTimeout(startCountDownTimer, 1000);
} }
}
} }
function dom_ready() function dom_ready()

View File

@ -1,4 +1,5 @@
var myInterval = null; var myInterval = null;
var checkboxInterval = null;
//console.log("assign appear"); //console.log("assign appear");
function kktix_verification_conditions(settings) function kktix_verification_conditions(settings)
@ -34,6 +35,14 @@ function kktix_verification_conditions(settings)
return is_text_sent; 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) function kktix_area_keyword(settings, base_info, register_info)
{ {
let area_keyword_array = []; let area_keyword_array = [];
@ -76,13 +85,6 @@ function kktix_area_keyword(settings, base_info, register_info)
let link_id = first_node.attr("id"); let link_id = first_node.attr("id");
//console.log("link_id: " + link_id); //console.log("link_id: " + link_id);
if(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]; let seat_inventory_key=link_id.split("_")[1];
//console.log("seat_inventory_key:"+seat_inventory_key); //console.log("seat_inventory_key:"+seat_inventory_key);
let seat_inventory_number=register_info.inventory.seatInventory[seat_inventory_key]; let seat_inventory_number=register_info.inventory.seatInventory[seat_inventory_key];
@ -208,6 +210,11 @@ if(rootElement) {
myInterval = setInterval(() => { myInterval = setInterval(() => {
dom_ready(); dom_ready();
}, 200); }, 200);
checkboxInterval= setInterval(() => {
//console.log("kktix_agree")
kktix_agree();
}, 200);
} }
$("footer").remove(); $("footer").remove();
$("div.banner-wrapper div.img-wrapper img").remove(); $("div.banner-wrapper div.img-wrapper img").remove();

View File

@ -419,5 +419,5 @@
] ]
} }
], ],
"version": "1.0.19" "version": "1.0.20"
} }

View File

@ -131,7 +131,13 @@
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<label for="max_dwell_time" class="col-sm-2 col-form-label">Max dwell time(sec.)</label> <label class="col-sm-2 col-form-label form-check-label" for="kktix_status_api">KKTIX Status API</label>
<div class="col-sm-10">
<input class="form-check-input" type="checkbox" id="kktix_status_api" />
</div>
</div>
<div class="row mb-3">
<label for="max_dwell_time" class="col-sm-2 col-form-label">KKTIX dwell time(sec.)</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input class="form-control" id="max_dwell_time" value="" /> <input class="form-control" id="max_dwell_time" value="" />
</div> </div>

View File

@ -8,6 +8,7 @@ const area_select_mode = document.querySelector('#area_select_mode');
const area_keyword = document.querySelector('#area_keyword'); const area_keyword = document.querySelector('#area_keyword');
const keyword_exclude = document.querySelector('#keyword_exclude'); const keyword_exclude = document.querySelector('#keyword_exclude');
const auto_reload_page_interval = document.querySelector('#auto_reload_page_interval'); 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 max_dwell_time = document.querySelector('#max_dwell_time');
const disable_adjacent_seat = document.querySelector('#disable_adjacent_seat'); const disable_adjacent_seat = document.querySelector('#disable_adjacent_seat');
const ocr_captcha_enable = document.querySelector('#ocr_captcha_enable'); const ocr_captcha_enable = document.querySelector('#ocr_captcha_enable');
@ -59,6 +60,7 @@ async function saveChanges()
settings.keyword_exclude = keyword_exclude.value; settings.keyword_exclude = keyword_exclude.value;
settings.advanced.auto_reload_page_interval = auto_reload_page_interval.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.max_dwell_time = max_dwell_time.value;
settings.advanced.disable_adjacent_seat = disable_adjacent_seat.checked; settings.advanced.disable_adjacent_seat = disable_adjacent_seat.checked;
settings.ocr_captcha.enable = ocr_captcha_enable.checked; settings.ocr_captcha.enable = ocr_captcha_enable.checked;
@ -110,6 +112,7 @@ function loadChanges()
keyword_exclude.value = settings.keyword_exclude; keyword_exclude.value = settings.keyword_exclude;
auto_reload_page_interval.value = settings.advanced.auto_reload_page_interval; 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; max_dwell_time.value = settings.advanced.max_dwell_time;
disable_adjacent_seat.checked = settings.advanced.disable_adjacent_seat; disable_adjacent_seat.checked = settings.advanced.disable_adjacent_seat;
ocr_captcha_enable.checked = settings.ocr_captcha.enable; ocr_captcha_enable.checked = settings.ocr_captcha.enable;