#IQRV #comment [Vendor] keba/2021.1020.01

DevAdapter/CMakeLists.txt

@@ -139,7 +139,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
-    set(KEBA_CONAN_LIB_NAME keba/2021.0926.01@LR04.02_VendorLib/testing)
+    set(KEBA_CONAN_LIB_NAME keba/2021.1020.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0924.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0826.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0701.01@LR04.02_VendorLib/testing)

DevAdapter/keba/HSPScanner.keba.1.2/hspscannerimpl.cpp

@@ -312,33 +312,13 @@ ErrorCodeEnum HSPSClassImpl::SetPreview(short nValue)
     {
         m_pDll->HIGH_GetStatus( &DevStatus);
         if(FR_DS_ONLINE==DevStatus)
-        {
-                if(!DevWindow)
-                    iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, m_nWidth, m_nHeight);
-                else {
-                    iRet = m_pDll->HIGH_HideWindow(FALSE);
-                }
-
-                if(iRet != FR_RET_SUCC)
-                {
-                    for (int var = 0; iRet&&(var < 8); ++var) {
-                        m_pDll->HIGH_CloseWindow();
-                        sleep(1000);
-                        iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, m_nWidth, m_nHeight);
-                        }
-                    if(iRet != FR_RET_SUCC)
-                    {
-                        SaveErrorInfo(iRet);
-                        LogM("HSPSClassImpl::SetPreview() = [%d] error,line=%d",iRet,__LINE__);
-                        return Error_DevMedia;
-                    }
-                }
-
-                if(iRet == FR_RET_SUCC)
-                {
-                    m_bShow = 1;
-                    m_bPreview = true;
-                }
+        {           
+            iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, m_nWidth, m_nHeight);
+            if(iRet == FR_RET_SUCC)
+            {
+                 m_bShow = 1;
+                 m_bPreview = true;
+            }
         }
         else {
             LogM("HSPSClassImpl::SetPreview() DevStatus = [%d] DevError:1->OFFLIN,2->BUSY,3->HARDWAREERROR,4->UNKNOW,line=%d",DevStatus,__LINE__);
@@ -347,13 +327,9 @@ ErrorCodeEnum HSPSClassImpl::SetPreview(short nValue)
    }
     else if (nValue == 0)
     {
-        iRet = m_pDll->HIGH_HideWindow(TRUE);
-        if(iRet == FR_RET_SUCC)
-            m_bShow = 0;
-
         iRet = m_pDll->HIGH_CloseWindow();
-        DevWindow = false;
         if(iRet == FR_RET_SUCC)
+            m_bShow = 0;           
             m_bPreview = false;
     }
 
@@ -496,8 +472,9 @@ ErrorCodeEnum HSPSClassImpl::SetViewPos(int nX, int nY, int nWidth)
 
             if (m_nWidth*9/16 <= 1)
                 m_nHeight = 1;
-            else {
-            m_nHeight  = m_nWidth*9/16;
+            else
+            {
+                m_nHeight  = m_nWidth*9/16;
             }
         }
 
@@ -525,7 +502,7 @@ ErrorCodeEnum HSPSClassImpl::SetViewPos(int nX, int nY, int nWidth)
             {
                 LogM("HSPSClassImpl::SetViewPos(nWidth) = [%d] error,line=%d",nWidth,__LINE__);
                 iRet = m_pDll->HIGH_CloseWindow();
-                iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, 1, 1);
+                iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, 1, 2);
             }
 
             else
@@ -536,32 +513,11 @@ ErrorCodeEnum HSPSClassImpl::SetViewPos(int nX, int nY, int nWidth)
                 return Error_Param;
             }
     }
-    else {
-        LogM("HSPSClassImpl::SetViewPos(nWidth) = [%d] error,line=%d",nWidth,__LINE__);
-        iRet = m_pDll->HIGH_CreateWindow(m_nX, m_nY, m_nWidth, m_nHeight);
-        DevWindow = true;
-        iRet = m_pDll->HIGH_PauseAndPlay(true);
-        //iRet = m_pDll->HIGH_HideWindow(TRUE);
-    }
-    if(iRet != FR_RET_SUCC)
-    {
-        SaveErrorInfo(iRet);
-        LogM("HSPSClassImpl::SetViewPos() = [%d] error,line=%d",iRet,__LINE__);
-        return Error_DevMedia;
-    }
-/*    m_bPreview = false;
-    m_nX = nX;
-    m_nY = nY;
-    m_nWidth = nWidth;*/
-    //iRet = m_pDll->HIGH_HideWindow(TRUE);
-    //iRet = c;
-
-
-    LogM("HSPSClassImpl::SetViewPos() = [%d] success!,line=%d",iRet,__LINE__);
     return Error_Succeed;
 }
 
 
+
 ErrorCodeEnum HSPSClassImpl::SetProperty()
 {
     return Error_Succeed;