From edec3d263c341e4f0f7cdbd5591f244fc9f939fe Mon Sep 17 00:00:00 2001 From: chenxy123 Date: Thu, 24 Nov 2016 22:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vn.trader/okcoinGateway/okcoinGateway.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/vn.trader/okcoinGateway/okcoinGateway.py b/vn.trader/okcoinGateway/okcoinGateway.py index 27235baf..e98f8b69 100644 --- a/vn.trader/okcoinGateway/okcoinGateway.py +++ b/vn.trader/okcoinGateway/okcoinGateway.py @@ -420,21 +420,13 @@ class Api(vnokcoin.OkCoinApi): tick.bidPrice4, tick.bidVolume4 = rawData['bids'][3] tick.bidPrice5, tick.bidVolume5 = rawData['bids'][4] -<<<<<<< HEAD - tick.askPrice1, tick.askVolume1 = rawData['asks'][0] - tick.askPrice2, tick.askVolume2 = rawData['asks'][1] - tick.askPrice3, tick.askVolume3 = rawData['asks'][2] - tick.askPrice4, tick.askVolume4 = rawData['asks'][3] - tick.askPrice5, tick.askVolume5 = rawData['asks'][4] - - tick.date, tick.time = generateDateTime(rawData['timestamp']) -======= tick.askPrice1, tick.askVolume1 = rawData['asks'][-1] tick.askPrice2, tick.askVolume2 = rawData['asks'][-2] tick.askPrice3, tick.askVolume3 = rawData['asks'][-3] tick.askPrice4, tick.askVolume4 = rawData['asks'][-4] - tick.askPrice5, tick.askVolume5 = rawData['asks'][-5] ->>>>>>> c813ec970b241c7761a7b020bf2b70c1010b508f + tick.askPrice5, tick.askVolume5 = rawData['asks'][-5] + + tick.date, tick.time = generateDateTime(rawData['timestamp']) newtick = copy(tick) self.gateway.onTick(newtick)