Merge branch 'master' of github.com:shidenggui/easytrader

Author: shidenggui

easytrader/yh_clienttrader.py

@@ -102,7 +102,7 @@ def _set_login_password(self, password):
         win32gui.SendMessage(input_hwnd, win32con.WM_SETTEXT, None, password)
 
     def _has_login_window(self):
-        for title in [' - 北京电信', ' - 北京电信 - 北京电信']:
+        for title in [' - 北京电信', ' - 北京电信 - 北京电信', ' - 北京联通1']:
             self.login_hwnd = win32gui.FindWindow(None, title)
             if self.login_hwnd != 0:
                 return True
@@ -290,7 +290,7 @@ def get_position(self):
     @staticmethod
     def project_copy_data(copy_data):
         reader = StringIO(copy_data)
-        df = pd.read_csv(reader, delim_whitespace=True)
+        df = pd.read_csv(reader, sep = '\t')
         return df.to_dict('records')
 
     def _read_clipboard(self):
@@ -311,11 +311,13 @@ def _read_clipboard(self):
     @staticmethod
     def _project_position_str(raw):
         reader = StringIO(raw)
-        df = pd.read_csv(reader, delim_whitespace=True)
+        df = pd.read_csv(reader, sep = '\t')
         return df
 
     @staticmethod
     def _set_foreground_window(hwnd):
+        import pythoncom
+        pythoncom.CoInitialize()
         shell = win32com.client.Dispatch('WScript.Shell')
         shell.SendKeys('%')
         win32gui.SetForegroundWindow(hwnd)