diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 94af0c1..af6a155 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -2356,26 +2356,26 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - HamZone.cn + HamCQ.cn - - - API Key + -
+
Test
- + N1MM Logger+ diff --git a/package.nw/i18n/cn-t.json b/package.nw/i18n/cn-t.json index 0d49172..dcbbaa1 100644 --- a/package.nw/i18n/cn-t.json +++ b/package.nw/i18n/cn-t.json @@ -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": "埠號", diff --git a/package.nw/i18n/cn.json b/package.nw/i18n/cn.json index df8c875..e7973fe 100644 --- a/package.nw/i18n/cn.json +++ b/package.nw/i18n/cn.json @@ -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": "端口", diff --git a/package.nw/i18n/en.json b/package.nw/i18n/en.json index 6610692..a780e7e 100644 --- a/package.nw/i18n/en.json +++ b/package.nw/i18n/en.json @@ -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", diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index 947f0b1..4e27ac8 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -2181,11 +2181,11 @@ function finishSendingReport(record, localMode) try { - sendHamZoneEntry(report); + sendHamCQEntry(report); } catch (e) { - addLastTraffic("Exception HamZone Log"); + addLastTraffic("Exception HamCQ Log"); } 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" ); } } diff --git a/package.nw/lib/defaults.js b/package.nw/lib/defaults.js index 3b68779..1e018b0 100644 --- a/package.nw/lib/defaults.js +++ b/package.nw/lib/defaults.js @@ -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: {