|
@@ -727,11 +727,15 @@ void UploadFSM::OnStateTrans( int iSrcState, int iDstState )
|
|
|
|
|
|
void UploadFSM::OnSysVarEvent( const char *pszKey, const char *pszValue,const char *pszOldValue,const char *pszEntityName )
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("OnSysVarEvent")("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("OnSysVarEvent")("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
|
|
|
if (pszValue[0] == 'O') {
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("OnSysVarEvent")("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
|
|
|
m_isOffLine = true;
|
|
|
PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
|
|
|
} else {
|
|
|
+ if (m_isOffLine) {
|
|
|
+ DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("OnSysVarEvent")("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
|
|
|
+ }
|
|
|
m_isOffLine = false;
|
|
|
PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
|
|
|
}
|
|
@@ -1018,7 +1022,7 @@ unsigned int UploadFSM::s2_on_event(FSMEvent* event)
|
|
|
|
|
|
//上传模式确定
|
|
|
if(m_centerModel == (int)centerModel){
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("centerModel");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("centerModel");
|
|
|
//防止url无效,新模式直接停止上传,等待下一次
|
|
|
if(m_centerUrl.addUploadFailUrl.empty()||m_centerUrl.queryPlanUrl.empty()||
|
|
|
m_centerUrl.queryTempFileUrl.empty()||m_centerUrl.updateStateUrl.empty()){
|
|
@@ -1050,7 +1054,7 @@ unsigned int UploadFSM::s2_on_event(FSMEvent* event)
|
|
|
}
|
|
|
|
|
|
}else if (event->iEvt == USER_EVT_JMP_NEW_SCAN) {
|
|
|
- DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("enter new model upload");
|
|
|
+ //DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("enter new model upload");
|
|
|
//新模式
|
|
|
if (m_uploadList->size() == 0) {
|
|
|
//重新扫描文件
|