kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Merge branch 'master' into 'master'
Change hamzone.cn service to HamCQ.cn See merge request gridtracker.org/gridtracker!278 If this is changing anything in the UI or operational behavior, please prepare to update the wiki!merge-requests/237/merge
commit
2c7a1aefc2
|
@ -2356,26 +2356,26 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
<td id="lotwTestResult"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-i18n="settings.logging.HamZone.source">HamZone.cn</td>
|
||||
<td data-i18n="settings.logging.HamCQ.source">HamCQ.cn</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
<input type="checkbox" checked="false" id="logHamZoneqsoCheckBox"
|
||||
<input type="checkbox" checked="false" id="logHamCQqsoCheckBox"
|
||||
onclick="adifLogQsoCheckBoxChanged(this);" />
|
||||
</td>
|
||||
<td>
|
||||
<label data-i18n="settings.logging.HamZone.details.apiKey" for="HamZoneApiKey">API Key</label>
|
||||
<input id="HamZoneApiKey" type="password" class="inputTextValue" size="21"
|
||||
<label data-i18n="settings.logging.HamCQ.details.apiKey" for="HamCQApiKey">API Key</label>
|
||||
<input id="HamCQApiKey" type="password" class="inputTextValue" size="21"
|
||||
oninput=" ValidateText(this); adifTextValueChange(this);" />
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<div data-i18n="settings.logging.HamZone.test.button" class="button"
|
||||
onclick="if ( ValidateText(HamZoneApiKey) ) HamZoneTest(true);">
|
||||
<div data-i18n="settings.logging.HamCQ.test.button" class="button"
|
||||
onclick="if ( ValidateText(HamCQApiKey) ) HamCQTest(true);">
|
||||
Test
|
||||
</div>
|
||||
</td>
|
||||
<td id="HamZoneTestResult"></td>
|
||||
<td id="HamCQTestResult"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-i18n="settings.logging.N1MM.source">N1MM Logger+</td>
|
||||
|
|
|
@ -335,9 +335,9 @@
|
|||
"settings.logging.LoTW.details.station": "台站位置",
|
||||
"settings.logging.LoTW.test.downloadButton": "測試下載",
|
||||
"settings.logging.LoTW.test.TQSLButton": "測試TQSL",
|
||||
"settings.logging.HamZone.source": "HamZone.cn",
|
||||
"settings.logging.HamZone.details.apiKey": "API密鑰",
|
||||
"settings.logging.HamZone.test.button": "測試",
|
||||
"settings.logging.HamCQ.source": "HamCQ.cn",
|
||||
"settings.logging.HamCQ.details.apiKey": "API密鑰",
|
||||
"settings.logging.HamCQ.test.button": "測試",
|
||||
"settings.logging.N1MM.source": "N1MM Logger+",
|
||||
"settings.logging.N1MM.details.IP": "IP地址",
|
||||
"settings.logging.N1MM.details.Port": "埠號",
|
||||
|
|
|
@ -335,9 +335,9 @@
|
|||
"settings.logging.LoTW.details.station": "台站位置",
|
||||
"settings.logging.LoTW.test.downloadButton": "测试下载",
|
||||
"settings.logging.LoTW.test.TQSLButton": "测试TQSL",
|
||||
"settings.logging.HamZone.source": "HamZone.cn",
|
||||
"settings.logging.HamZone.details.apiKey": "API密钥",
|
||||
"settings.logging.HamZone.test.button": "测试",
|
||||
"settings.logging.HamCQ.source": "HamCQ.cn",
|
||||
"settings.logging.HamCQ.details.apiKey": "API密钥",
|
||||
"settings.logging.HamCQ.test.button": "测试",
|
||||
"settings.logging.N1MM.source": "N1MM Logger+",
|
||||
"settings.logging.N1MM.details.IP": "IP地址",
|
||||
"settings.logging.N1MM.details.Port": "端口",
|
||||
|
|
|
@ -334,9 +334,9 @@
|
|||
"settings.logging.LoTW.details.station": "Station Name",
|
||||
"settings.logging.LoTW.test.downloadButton":"Test Download",
|
||||
"settings.logging.LoTW.test.TQSLButton": "Test TQSL",
|
||||
"settings.logging.HamZone.source": "HamZone.cn",
|
||||
"settings.logging.HamZone.details.apiKey": "API Key",
|
||||
"settings.logging.HamZone.test.button": "Test",
|
||||
"settings.logging.HamCQ.source": "HamCQ.cn",
|
||||
"settings.logging.HamCQ.details.apiKey": "API Key",
|
||||
"settings.logging.HamCQ.test.button": "Test",
|
||||
"settings.logging.N1MM.source": "N1MM Logger+",
|
||||
"settings.logging.N1MM.details.IP": "IP",
|
||||
"settings.logging.N1MM.details.Port": "Port",
|
||||
|
|
|
@ -2181,11 +2181,11 @@ function finishSendingReport(record, localMode)
|
|||
|
||||
try
|
||||
{
|
||||
sendHamZoneEntry(report);
|
||||
sendHamCQEntry(report);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
addLastTraffic("<font style='color:red'>Exception HamZone Log</font>");
|
||||
addLastTraffic("<font style='color:red'>Exception HamCQ Log</font>");
|
||||
}
|
||||
|
||||
if (
|
||||
|
@ -2806,28 +2806,28 @@ function ClublogTest(test)
|
|||
}
|
||||
}
|
||||
|
||||
function HamZoneTest(test)
|
||||
function HamCQTest(test)
|
||||
{
|
||||
if (test && test == true)
|
||||
{
|
||||
HamZoneTestResult.innerHTML = "Testing";
|
||||
HamCQTestResult.innerHTML = "Testing";
|
||||
|
||||
var postData = { key: HamZoneApiKey.value };
|
||||
var postData = { key: HamCQApiKey.value };
|
||||
getPostJSONBuffer(
|
||||
"https://www.hamzone.cn/v1/logbook?from=gridtracker",
|
||||
HamZoneSendResult,
|
||||
"https://www.hamcq.cn/v1/logbook?from=gridtracker",
|
||||
HamCQSendResult,
|
||||
test,
|
||||
"https",
|
||||
443,
|
||||
postData,
|
||||
10000,
|
||||
HamZoneErrorCallback,
|
||||
HamCQErrorCallback,
|
||||
"Failed"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function HamZoneErrorCallback(
|
||||
function HamCQErrorCallback(
|
||||
file_url,
|
||||
callback,
|
||||
flag,
|
||||
|
@ -2839,10 +2839,10 @@ function HamZoneErrorCallback(
|
|||
message
|
||||
)
|
||||
{
|
||||
HamZoneTestResult.innerHTML = message;
|
||||
HamCQTestResult.innerHTML = message;
|
||||
}
|
||||
|
||||
function HamZoneSendResult(buffer, flag)
|
||||
function HamCQSendResult(buffer, flag)
|
||||
{
|
||||
if (flag && flag == true)
|
||||
{
|
||||
|
@ -2850,47 +2850,47 @@ function HamZoneSendResult(buffer, flag)
|
|||
{
|
||||
if (buffer.indexOf("Invalid") > -1)
|
||||
{
|
||||
HamZoneTestResult.innerHTML = "Invalid";
|
||||
HamCQTestResult.innerHTML = "Invalid";
|
||||
}
|
||||
else if (buffer.indexOf("Pass") > -1)
|
||||
{
|
||||
HamZoneTestResult.innerHTML = "Passed";
|
||||
HamCQTestResult.innerHTML = "Passed";
|
||||
}
|
||||
else
|
||||
{
|
||||
HamZoneTestResult.innerHTML = "Unknown Error";
|
||||
HamCQTestResult.innerHTML = "Unknown Error";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
HamZoneTestResult.innerHTML = "Resp Err";
|
||||
HamCQTestResult.innerHTML = "Resp Err";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function sendHamZoneEntry(report)
|
||||
function sendHamCQEntry(report)
|
||||
{
|
||||
if (GT.mapSettings.offlineMode == true) return;
|
||||
|
||||
if (logHamZoneqsoCheckBox.checked == true)
|
||||
if (logHamCQqsoCheckBox.checked == true)
|
||||
{
|
||||
if (typeof nw != "undefined")
|
||||
{
|
||||
var postData = {
|
||||
key: HamZoneApiKey.value,
|
||||
key: HamCQApiKey.value,
|
||||
app: "GridTracker " + gtVersion,
|
||||
adif: report
|
||||
};
|
||||
getPostBuffer(
|
||||
"https://www.hamzone.cn/v1/logbook?from=gridtracker",
|
||||
HamZoneSendResult,
|
||||
"https://www.hamcq.cn/v1/logbook?from=gridtracker",
|
||||
HamCQSendResult,
|
||||
null,
|
||||
"https",
|
||||
443,
|
||||
postData,
|
||||
30000,
|
||||
postRetryErrorCallaback,
|
||||
"HamZone.cn"
|
||||
"HamCQ.cn"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -155,7 +155,7 @@ var def_adifLogSettings = {
|
|||
logClubqsoCheckBox: false,
|
||||
logCloudlogQSOCheckBox: false,
|
||||
logeQSLQSOCheckBox: false,
|
||||
logHamZoneqsoCheckBox: false
|
||||
logHamCQqsoCheckBox: false
|
||||
},
|
||||
nickname: {
|
||||
nicknameeQSLCheckBox: false
|
||||
|
@ -177,7 +177,7 @@ var def_adifLogSettings = {
|
|||
eQSLUser: "",
|
||||
eQSLPassword: "",
|
||||
eQSLNickname: "",
|
||||
HamZoneApiKey: ""
|
||||
HamCQApiKey: ""
|
||||
},
|
||||
downloads: {},
|
||||
lastFetch: {
|
||||
|
|
Ładowanie…
Reference in New Issue