diff --git a/hub_ohlcv_lib.py b/hub_ohlcv_lib.py index 74e83fb..d4ca1c7 100644 --- a/hub_ohlcv_lib.py +++ b/hub_ohlcv_lib.py @@ -9,17 +9,12 @@ from typing import Any, Callable, Optional CHART_TIMEFRAMES = frozenset( { "1m", - "3m", "5m", - "10m", "15m", - "20m", "30m", "1h", "2h", "4h", - "6h", - "8h", "12h", "1d", "1w", @@ -27,43 +22,31 @@ CHART_TIMEFRAMES = frozenset( ) CHART_TIMEFRAME_ORDER = ( "1m", - "3m", "5m", - "10m", "15m", - "20m", "30m", "1h", "2h", "4h", - "6h", - "8h", "12h", "1d", "1w", ) DAILY_PLUS_TIMEFRAMES = frozenset({"1d", "1w"}) -# 部分交易所 ccxt 无原生周期(如 Gate 无 6h/12h),或原生 K 线间隔异常时从细周期聚合 +# 部分交易所 ccxt 无原生 12h,或原生 K 线间隔异常时从 1h 聚合 OHLCV_AGGREGATE_FROM: dict[str, str] = { - "6h": "1h", - "8h": "1h", "12h": "1h", } TIMEFRAME_MS: dict[str, int] = { "1m": 60_000, - "3m": 3 * 60_000, "5m": 5 * 60_000, - "10m": 10 * 60_000, "15m": 15 * 60_000, - "20m": 20 * 60_000, "30m": 30 * 60_000, "1h": 60 * 60_000, "2h": 2 * 60 * 60_000, "4h": 4 * 60 * 60_000, - "6h": 6 * 60 * 60_000, - "8h": 8 * 60 * 60_000, "12h": 12 * 60 * 60_000, "1d": 24 * 60 * 60_000, "1w": 7 * 24 * 60 * 60_000, diff --git a/manual_trading_hub/static/chart.js b/manual_trading_hub/static/chart.js index b92fd56..37d6573 100644 --- a/manual_trading_hub/static/chart.js +++ b/manual_trading_hub/static/chart.js @@ -15,34 +15,24 @@ const MAX_DIV_MARKERS = 4; const TF_MS = { "1m": 60_000, - "3m": 3 * 60_000, "5m": 5 * 60_000, - "10m": 10 * 60_000, "15m": 15 * 60_000, - "20m": 20 * 60_000, "30m": 30 * 60_000, "1h": 60 * 60_000, "2h": 2 * 60 * 60_000, "4h": 4 * 60 * 60_000, - "6h": 6 * 60 * 60_000, - "8h": 8 * 60 * 60_000, "12h": 12 * 60 * 60_000, "1d": 24 * 60 * 60_000, "1w": 7 * 24 * 60 * 60_000, }; const TF_BY_MINUTES = { "1": "1m", - "3": "3m", "5": "5m", - "10": "10m", "15": "15m", - "20": "20m", "30": "30m", "60": "1h", "120": "2h", "240": "4h", - "360": "6h", - "480": "8h", "720": "12h", "1440": "1d", "10080": "1w", @@ -52,17 +42,12 @@ }); const TF_CN_LABEL = { "1m": "1分钟", - "3m": "3分钟", "5m": "5分钟", - "10m": "10分钟", "15m": "15分钟", - "20m": "20分钟", "30m": "30分钟", "1h": "1小时", "2h": "2小时", "4h": "4小时", - "6h": "6小时", - "8h": "8小时", "12h": "12小时", "1d": "日线", "1w": "周线", diff --git a/manual_trading_hub/static/index.html b/manual_trading_hub/static/index.html index 9bf7919..cbbb466 100644 --- a/manual_trading_hub/static/index.html +++ b/manual_trading_hub/static/index.html @@ -60,7 +60,7 @@