|
|
|
@ -70,7 +70,7 @@ FeedBase.prototype.resolveSymbol = function(symbolName, onResolve, onError) { |
|
|
|
const resolutionFormat = (resolution, name, to) => { |
|
|
|
let req = `market.${name}.kline.${resolution}min`; |
|
|
|
let minutes = resolution; |
|
|
|
//console.log(resolution)
|
|
|
|
console.log(resolution) |
|
|
|
if (resolution.includes('D')) { |
|
|
|
if (resolution.length < 2) resolution = '1' + resolution; |
|
|
|
req = `market.${name}.kline.${parseInt(resolution)}day`; |
|
|
|
@ -106,11 +106,12 @@ const resolutionFormat = (resolution, name, to) => { |
|
|
|
}; |
|
|
|
|
|
|
|
FeedBase.prototype.getBars = function(symbolInfo, resolution, periodParams, onHistoryCallback, onErrorCallback) { |
|
|
|
//console.log("获取历史数据",periodParams)
|
|
|
|
console.log("获取历史数据",periodParams) |
|
|
|
// 切换产品周期 或者 切换产品 会执行这个函数
|
|
|
|
let reso = resolutionFormat(resolution, symbolInfo.name, periodParams.to > detafeed_historyTime ? periodParams |
|
|
|
.to : |
|
|
|
detafeed_historyTime) |
|
|
|
let reso = resolutionFormat(resolution, symbolInfo.name, periodParams.to) |
|
|
|
// if (resolution.includes('M') || resolution.includes('W')|| resolution.includes('D')) { // 周线月线控制条数，时间超出火币规定范围, ws报错
|
|
|
|
// reso = resolutionFormat(resolution, symbolInfo.name, periodParams.to)
|
|
|
|
// }
|
|
|
|
|
|
|
|
// 是历史数据
|
|
|
|
var history = true |
|
|
|
@ -162,7 +163,7 @@ FeedBase.prototype.getBars = function(symbolInfo, resolution, periodParams, onHi |
|
|
|
datas.push(i) |
|
|
|
} |
|
|
|
} else { |
|
|
|
//console.log('进来')
|
|
|
|
console.log('进来') |
|
|
|
meta = { |
|
|
|
noData: 'no_data', |
|
|
|
nextTime: detafeed_historyTime |
|
|
|
|
