From 681f4ea4b0c36cdd9464351fc671a3e4e0b0f5cd Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Mon, 6 Jan 2025 16:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9k=E7=BA=BF=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/chart_main/sevencoin.js | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/static/chart_main/sevencoin.js b/static/chart_main/sevencoin.js
index 412829b..7c6534b 100644
--- a/static/chart_main/sevencoin.js
+++ b/static/chart_main/sevencoin.js
@@ -253,9 +253,7 @@ $(function () {
             tvQuoter.find('[data-name="zhangdiee"]').css('color',zhangdiee>0?'#53b987':'#eb4d5c');
         }
         timestampToTime(timestamp) {
-            const dates = new Date(timestamp);
-            const resolutionTime = this.getResolutionTime()
-            const date = resolutionTime === 1 ? dates : this.adjustToEasternTime(dates);
+            const date = this.adjustToEasternTime(timestamp);
 			
             const yyyy = `${date.getFullYear()}`;
             const yy = `${date.getFullYear()}`.substr(2);
@@ -274,34 +272,31 @@ $(function () {
             return dateStr
         }
 		adjustToEasternTime(date) {
-			// 将给定日期转换为时间戳
-			const timestamp = date.getTime();
-					
-			// 获取美国东部时区偏移值（以分钟为单位）
-			// const easternOffset = -240; // 美国东部时区偏移值为 -240 分钟
-			// 获取东部时间的偏移值（分钟）
-			let easternOffset = 1260; // 标准时间（EST）
-			if (this.dateIsInEDT(date)) {
-			    easternOffset = 1200; // 夏令时（EDT）
-			}
+			let timestamp;
+			
+			// let easternOffset = 46800000; // 标准时间（EST）
+			// if (this.dateIsInEDT(date)) {
+			//     easternOffset = 43200000; // 夏令时（EDT）
+			// }
 			// 调整时间为美国东部时间
-			const adjustedTime = timestamp - (date.getTimezoneOffset() + easternOffset) * 60 * 1000;
+			timestamp = date - (-28800000)+(new Date(new Date().getTime()).getTimezoneOffset()* 60 * 1000) - 46800000;
 			// 创建新的日期对象，并使用调整后的时间戳
-			const adjustedDate = new Date(adjustedTime);
+			const adjustedDate = new Date(timestamp);
 					
 			// 返回调整后的日期对象
 			return adjustedDate;
 		}
 		// 判断日期是否在夏令时（简化的逻辑，实际应用中需要考虑更多的边界情况）
 		dateIsInEDT(date) {
-		    const year = date.getUTCFullYear();
+			const dates = new Date();
+		    const year = dates.getUTCFullYear();
 		    const start = new Date(Date.UTC(year, 2, 13, 7)); // March, 2nd Sunday
 		    const end = new Date(Date.UTC(year, 10, 6, 6)); // November, 1st Sunday
 		    
 		    start.setUTCDate(14 - start.getUTCDay());
 		    end.setUTCDate(7 - end.getUTCDay());
-		
-		    return date >= start && date < end;
+			console.log(dates);
+		    return dates >= start && dates < end;
 		}
         getResolutionTime() {
             const resolution = this.TView.chart().resolution();