|
@@ -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;
|
|
|
}
|
|
|
|