CPRobotDlg.h

@@ -50,8 +50,7 @@ public:
 	afx_msg void OnBnClickedButtonStartDeal();
 	afx_msg void OnBnClickedButtonSearch();
 
-	afx_msg void OnBnClickedRadioBid();
-	afx_msg void OnBnClickedRadioAsk();
+	afx_msg void OnHotKey(UINT nHotKeyId, UINT nKey1, UINT nKey2);
 
 	virtual void Received();
 
@@ -72,6 +71,7 @@ protected:
 
 private:
 	CP_STATE m_enState;
+	CP_STATE m_enPrevState;
 
 	CListBox m_ResultList;
 
@@ -81,7 +81,6 @@ private:
 
 	string m_AccountNum;
 
-	BOOL m_bSell;
 	int m_iBalance;
 	int m_iAmountSet;
 	float m_fMinPriceSet;
@@ -90,28 +89,31 @@ private:
 	float m_fLossCutTick;
 	float m_fTrailingTick;
 	int m_iCancelDelay;
+	BOOL m_bBuyOnBid1;
 	BOOL m_bPutOption;
 
 	string m_CurCode;
-	float m_fBoughtTick;
-	float m_fHighestTick;
-	float m_fCurTick;
+	float m_fBoughtPrice;
+	float m_fHighestBid1;
+	float m_fCurBid1;
 	int m_iBoughtCnt;
 	int m_iOrderNum;
+	CTime m_BoughtT;
 
 	ATOM m_IdKeyFxCall;
 	ATOM m_IdKeyFxPut;
+	ATOM m_IdKeyFxStop;
 
 	ofstream m_LogFile;
 
 	void Subscribe(void);
 	void Unsubscribe(void);
 
-	void BuyThis(const string& Code, const float fBid1Price, const int iBid1Cnt, float afOfferPrice[5]);
+	void BuyThis(const string& Code, const float fBid1Price, const int iBid1Cnt, float afAskPrice[5]);
 	void CorrectToCurrent(const string& Code);
 
-	void CPLog(const std::string fmt, ...);
+	inline void SwitchState(const CP_STATE enState);
 
-public:
-	afx_msg void OnHotKey(UINT nHotKeyId, UINT nKey1, UINT nKey2);
+	void CPLog(const std::string fmt, ...);
+	
 };