Merge branch 'dev' into 'dev'

修复扫码界面卡死问题

See merge request !4

FMVip_LXJ/windows/scanningdialog.cpp

@@ -81,7 +81,7 @@ void ScanningDialog::timeOut()
     HWND hForeWnd = ::GetForegroundWindow();
     DWORD dwForeID = ::GetWindowThreadProcessId(hForeWnd,NULL);
     DWORD dwCurID = ::GetCurrentThreadId();
-    ::AttachThreadInput(dwCurID,dwForeID,TRUE);
+    //::AttachThreadInput(dwCurID,dwForeID,TRUE);
 
     ::SetWindowPos( (HWND)effectiveWinId(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 
@@ -89,7 +89,7 @@ void ScanningDialog::timeOut()
 
     ::SetForegroundWindow((HWND)this->effectiveWinId());
 
-    ::AttachThreadInput(dwCurID,dwForeID,FALSE);
+    //::AttachThreadInput(dwCurID,dwForeID,FALSE);
 
     this->setFocus();
     ui->labScaningBar->setFocus();