浏览代码

#IQRV #comment [DeviceControl] 兼容新框架对读取集中配置失败的问题

gifur 3 年之前
父节点
当前提交
1a96c0d04c
共有 2 个文件被更改,包括 2 次插入13 次删除
  1. 1 0
      Module/include/DevEntityCommBase.hpp
  2. 1 13
      Module/mod_DeviceControl/DeviceControlFSM.cpp

+ 1 - 0
Module/include/DevEntityCommBase.hpp

@@ -227,6 +227,7 @@ inline void CDevAdptEntityBase::InitializeVendorLogSwitch()
 		Dbg("Try to read from global settings.");
 		CSmartPointer<IConfigInfo> spConfig;
 		ErrorCodeEnum erroCode = GetFunction()->OpenConfig(Config_Cache, spConfig);
+
 		CAutoArray<CSimpleStringA> adapters;
 		spConfig->ReadAllKeys("AdapterLogSwith", adapters);
 		CSimpleStringA strKey(true);

+ 1 - 13
Module/mod_DeviceControl/DeviceControlFSM.cpp

@@ -62,21 +62,11 @@ ErrorCodeEnum CDeviceControlFSM::OnInit()
         Dbg("Get System Static info failed: %s.", SpStrError(eErr));
         return eErr;
     }
-    eErr = spEntityFunction->OpenConfig(Config_Root, spConfig);
-    if (eErr != Error_Succeed) {
-        Dbg("open cfg file failed: %s.", SpStrError(eErr));
-        return eErr;
-    }
-
+    spEntityFunction->OpenConfig(Config_Root, spConfig);
     m_csMachineType = sysInfo.strMachineType;
     Dbg("machine type:%s", (LPCTSTR)m_csMachineType);
     CSimpleStringA dllName, tmpDevSN("");
 
-#if defined(RVC_OS_WIN)
-    spEntityFunction->GetSysVar("FWBDevSN", tmpDevSN);
-    m_bFWB = (tmpDevSN.GetLength() > 12 && tmpDevSN.IndexOf("FWB") > 2);
-#endif //RVC_OS_WIN
-
     const bool IsNotPadType =  (m_csMachineType.IsNullOrEmpty() || m_csMachineType.Compare("RVC.PAD", true) != 0 || m_bFWB);
 
      if(IsNotPadType) {
@@ -124,8 +114,6 @@ ErrorCodeEnum CDeviceControlFSM::OnInit()
         }
     }
 
-    //DoRestartSogouServicesJob();
-
     return Error_Succeed;
 }