6.1.47

🐞 修正重播
yayacat · Oct 23, 2023 · 0b91459 · 0b91459
1 parent c07c464
commit 0b91459
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/TREM.Electron/Views/SettingView.html b/TREM.Electron/Views/SettingView.html
@@ -4031,7 +4031,7 @@
                                         </button>
                                     </div>
                                 </div>
-                                <div class="control-title">
+                                <!-- <div class="control-title">
                                     <div>
                                         <span lang="zh-TW">測試舊警報</span>
                                     </div>
@@ -4054,7 +4054,7 @@
                                             </span>
                                         </button>
                                     </div>
-                                </div>
+                                </div> -->
                                 <div class="control-title">
                                     <div>
                                         <span lang="zh-TW">P2P統計資訊</span>

diff --git a/TREM.Electron/js/earthquake.js b/TREM.Electron/js/earthquake.js
@@ -44,7 +44,7 @@ const speecd_use = setting["audio.tts"] ?? false;
 // #region 變數
 const posturl = "https://exptech.com.tw/api/v1/trem/";
 const geturl = "https://exptech.com.tw/api/v2/trem/rts?time=";
-const getapiequrl = "https://api.exptech.com.tw/api/v1/trem/rts/";
+const getapiequrl = "https://api.exptech.com.tw/api/v1/eq/eew/";
 const MapData = {};
 const Timers = {};
 let Stamp = 0;
@@ -1635,7 +1635,7 @@ function PGAMain() {
 				const mm = now.getMinutes().toString().padStart(2, "0");
 				const ss = now.getSeconds().toString().padStart(2, "0");
 				const t = `${YYYY}${MM}${DD}${hh}${mm}${ss}`;
-				const url1 = getapiequrl + t;
+				const url1 = getapiequrl + t + "?type=all";
 				const controller1 = new AbortController();
 				setTimeout(() => {
 					controller1.abort();
@@ -1845,7 +1845,7 @@ function PGAMainbkup() {
 				const mm = now.getMinutes().toString().padStart(2, "0");
 				const ss = now.getSeconds().toString().padStart(2, "0");
 				const t = `${YYYY}${MM}${DD}${hh}${mm}${ss}`;
-				const url1 = getapiequrl + t;
+				const url1 = getapiequrl + t + "?type=all";
 				const controller1 = new AbortController();
 				setTimeout(() => {
 					controller1.abort();
@@ -3941,6 +3941,15 @@ TREM.backindexButton = () => {
 	changeView("main", "#mainView_btn");
 };
 
+ipcMain.on("testoldEEW", (event) => {
+	const report_data = storage.getItem("report_data");
+	TREM.Report.replayHttp = true;
+	replay = new Date(report_data[0].originTime.replace(/-/g, "/")).getTime() - 25000;
+	replayT = NOW().getTime();
+	ipcMain.emit("ReportGET");
+	stopReplaybtn();
+});
+
 ipcMain.on("testoldtimeEEW", (event, oldtime) => {
 	replay = oldtime - 25000;
 	replayT = NOW().getTime();

diff --git a/TREM.Electron/js/setting.js b/TREM.Electron/js/setting.js
@@ -1232,7 +1232,7 @@ function resend() {
 }
 
 function testEEW() {
-	ipcRenderer.send("testEEW");
+	ipcRenderer.send("testoldEEW");
 	ipcRenderer.send("closeChildWindow");
 }
 

diff --git a/TREM.Electron/package.json b/TREM.Electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trem",
-  "version": "6.1.46",
+  "version": "6.1.47",
   "description": "Taiwan Real-time Earthquake Monitoring ( 臺灣即時地震監測 )",
   "main": "main.js",
   "homepage": "https://exptech.com.tw/",