|
@@ -163,10 +163,10 @@ DeviceTypeEnum CITCtrlEntity::RvcGetDeviceType()
|
|
|
CSystemStaticInfo stStaticinfo;
|
|
|
spFunction->GetSystemStaticInfo(stStaticinfo);
|
|
|
|
|
|
- if (_stricmp(stStaticinfo.strMachineType, "RVC.Stand1SPlus") == 0) {
|
|
|
+ if (_stricmp(stStaticinfo.strMachineType.GetData(), "RVC.Stand1SPlus") == 0) {
|
|
|
eType = eStand1SPlusType;
|
|
|
}
|
|
|
- else if (stricmp(stStaticinfo.strMachineType, "RVC.CardStore") == 0 || stricmp(stStaticinfo.strMachineType, "RVC.CardPrinter") == 0) {
|
|
|
+ else if (_stricmp(stStaticinfo.strMachineType.GetData(), "RVC.CardStore") == 0 || _stricmp(stStaticinfo.strMachineType.GetData(), "RVC.CardPrinter") == 0) {
|
|
|
eType = eCardStore;
|
|
|
}
|
|
|
else {
|
|
@@ -239,14 +239,12 @@ ErrorCodeEnum CITCtrlEntity::__OnClose(ErrorCodeEnum preOperationError)
|
|
|
CSmartPointer<IEntityFunction> pFunc = GetFunction();
|
|
|
pFunc->UnregistSysVarEvent("UIState");
|
|
|
pFunc->UnregistSysVarEvent("CustomerHandle");
|
|
|
- if (eStand1SPlusType == m_eDeviceType)
|
|
|
- {
|
|
|
+ if (eStand1SPlusType == m_eDeviceType){
|
|
|
pFunc->UnregistSysVarEvent(SYSVAR_CAMERASTATE);
|
|
|
}
|
|
|
|
|
|
if (NULL != m_pChannelClient) {
|
|
|
m_pChannelClient->GetFunction()->CloseSession();
|
|
|
-
|
|
|
m_pChannelClient = NULL;
|
|
|
}
|
|
|
|
|
@@ -289,16 +287,20 @@ void CITCtrlEntity::BcastCustomerState(const char *pszValue,const char *pszOldVa
|
|
|
if (pszValue[0] == 'N') { // None
|
|
|
evt.state = eCustomerState_None;
|
|
|
evt.status = L"Customer:None";
|
|
|
- } else if (pszValue[0] == 'A') { // Attention
|
|
|
+ }
|
|
|
+ else if (pszValue[0] == 'A') { // Attention
|
|
|
evt.state = eCustomerState_Attention;
|
|
|
evt.status = L"Customer:Attention";
|
|
|
- } else if (pszValue[0] == 'C') { // Control
|
|
|
+ }
|
|
|
+ else if (pszValue[0] == 'C') { // Control
|
|
|
evt.state = eCustomerState_Control;
|
|
|
evt.status = L"Customer:Control";
|
|
|
- } else if (pszValue[0] == 'T') { // Assist
|
|
|
+ }
|
|
|
+ else if (pszValue[0] == 'T') { // Assist
|
|
|
evt.state = eCustomerState_Assist;
|
|
|
evt.status = L"Customer:Assist";
|
|
|
- } else if (pszValue[0] == 'G') { // Agent
|
|
|
+ }
|
|
|
+ else if (pszValue[0] == 'G') { // Agent
|
|
|
evt.state = eCustomerState_AgentOperation;
|
|
|
evt.status = L"Customer:AgentOperation";
|
|
|
}
|
|
@@ -306,6 +308,7 @@ void CITCtrlEntity::BcastCustomerState(const char *pszValue,const char *pszOldVa
|
|
|
ok = 0;
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("bug! OnSysVarEvent unknown %s", pszValue);
|
|
|
}
|
|
|
+
|
|
|
GetFunction()->GetSysVar("SessionID",m_SessionID);
|
|
|
evt.session_id = CSimpleStringA2W(m_SessionID);
|
|
|
if (ok) {
|