[성현모] Svn 업데이트 받기
This commit is contained in:
@ -479,51 +479,6 @@ namespace SystemX.Net.XAdaptor.PC
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
/*
|
||||
if (START_EVENT_TRIGGER[0])
|
||||
{
|
||||
START_EVENT_TRIGGER[0] = false;
|
||||
|
||||
//CommandConnectAlarmEvent?.BeginInvoke(null, null, null, null);
|
||||
//CommandConnectAlarmEvent?.Invoke(null, null);
|
||||
|
||||
OnCommandConnectAlarm(null, null);
|
||||
}
|
||||
if (START_EVENT_TRIGGER[1])
|
||||
{
|
||||
START_EVENT_TRIGGER[1] = false;
|
||||
|
||||
//StreamConnectAlarmEvent?.BeginInvoke(null, null, null, null);
|
||||
//StreamConnectAlarmEvent?.Invoke(null, null);
|
||||
|
||||
OnStreamConnectAlarm(null, null);
|
||||
}
|
||||
*/
|
||||
//
|
||||
/*
|
||||
//Command Stream Conn Check
|
||||
if (StateClientSocketConnect == false)
|
||||
goto ROUTINE_OUT;
|
||||
if (thisConnInfo.stCommandCheckTime.ElapsedMilliseconds >= 60000)
|
||||
{
|
||||
SendCommandConnectState();
|
||||
|
||||
thisConnInfo.OnCommandCheckTime();
|
||||
}
|
||||
//
|
||||
if (StateClientStreamSocketConnect == false)
|
||||
goto ROUTINE_OUT;
|
||||
if (thisConnInfo.stStreamCheckTime.ElapsedMilliseconds >= 60000)
|
||||
{
|
||||
SendStreamConnectState();
|
||||
|
||||
thisConnInfo.OnStreamCheckTime();
|
||||
}
|
||||
|
||||
ROUTINE_OUT:
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
@ -579,7 +534,9 @@ namespace SystemX.Net.XAdaptor.PC
|
||||
//
|
||||
if (StateAdaptorConnect)
|
||||
{
|
||||
;//
|
||||
//if (StateClientAutoConnect)
|
||||
{
|
||||
}
|
||||
}
|
||||
//
|
||||
thisConnInfo.OnCommandTime();
|
||||
@ -603,7 +560,7 @@ namespace SystemX.Net.XAdaptor.PC
|
||||
if (LoadInfo.FTP_Use)
|
||||
{
|
||||
ControlFTP = new CtrlFTP(LoadInfo.FTP_Use,
|
||||
IPAddress.Parse(LoadInfo.FTP_IPAddress), Convert.ToInt32(LoadInfo.FTP_Port),
|
||||
IPAddress.Parse(LoadInfo.FTP_IPAddress), Convert.ToInt32(LoadInfo.FTP_Port),
|
||||
LoadInfo.FTP_Account, LoadInfo.FTP_Password);
|
||||
|
||||
if (ControlFTP.FTPConnState)
|
||||
@ -612,7 +569,12 @@ namespace SystemX.Net.XAdaptor.PC
|
||||
return eFTPServiceStatus.Disconnected;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ControlFTP != null)
|
||||
ControlFTP.FTPConnState = false;
|
||||
|
||||
return eFTPServiceStatus.Unused;
|
||||
}
|
||||
}
|
||||
|
||||
public DataSet WaitSystemQuery(string strQuery)
|
||||
|
||||
Reference in New Issue
Block a user