|
@@ -7,6 +7,7 @@ import android.os.Message;
|
|
|
import android.util.Log;
|
|
|
|
|
|
import com.artncore.WallPadDataMgr.WallpadDeviceSet;
|
|
|
+import com.artncore.commons.define;
|
|
|
import com.util.LogUtil;
|
|
|
|
|
|
import org.w3c.dom.Document;
|
|
@@ -224,7 +225,7 @@ public class WallPadiMAPClient {
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-
|
|
|
+ bNewDanjiServer = true;
|
|
|
}
|
|
|
wallpadDeviceSet.closeDB();
|
|
|
} catch (RuntimeException re) {
|
|
@@ -244,17 +245,7 @@ public class WallPadiMAPClient {
|
|
|
// 사용중일 경우 암호화 소켓을 생성한다.
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
Log.i(TAG, "[socketThread.run()] bNewDanjiServer [" + bNewDanjiServer + "]");
|
|
|
- if (!bNewDanjiServer) {
|
|
|
- Log.i(TAG, "[socketThread.run()] Normal Client > Target [" + SoIPa + ":" + SoIPport + "]");
|
|
|
- isock = new Socket();
|
|
|
- isock.setSoLinger(true, 3000);
|
|
|
- isock.setReceiveBufferSize(SOCKET_BUFFER_SIZE * 1024);
|
|
|
- isock.setSendBufferSize(SOCKET_BUFFER_SIZE * 1024);
|
|
|
- isock.setSoTimeout(TimeOut);
|
|
|
- InetSocketAddress iSocAddr = new InetSocketAddress(SoIPa, SoIPport);
|
|
|
- isock.connect(iSocAddr, SOCKET_WAIT_TIME);
|
|
|
- }
|
|
|
- else {
|
|
|
+ if(bNewDanjiServer && SoIPa.equals(define.NewDanjiServerIP)){
|
|
|
// 신형 단지서버를 사용중일 경우 SSL Socket 을 생성하여 통신한다.
|
|
|
int port = SoIPport + 1000;
|
|
|
Log.i(TAG, "[socketThread.run()] SSLClient > Target [" + SoIPa + ":" + port + "]");
|
|
@@ -267,8 +258,18 @@ public class WallPadiMAPClient {
|
|
|
isock.setSendBufferSize(SOCKET_BUFFER_SIZE*1024);
|
|
|
isock.setSoTimeout(TimeOut);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+ else {
|
|
|
+ Log.i(TAG, "[socketThread.run()] Normal Client > Target [" + SoIPa + ":" + SoIPport + "]");
|
|
|
+ isock = new Socket();
|
|
|
+ isock.setSoLinger(true, 3000);
|
|
|
+ isock.setReceiveBufferSize(SOCKET_BUFFER_SIZE * 1024);
|
|
|
+ isock.setSendBufferSize(SOCKET_BUFFER_SIZE * 1024);
|
|
|
+ isock.setSoTimeout(TimeOut);
|
|
|
+ InetSocketAddress iSocAddr = new InetSocketAddress(SoIPa, SoIPport);
|
|
|
+ isock.connect(iSocAddr, SOCKET_WAIT_TIME);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(isock!=null)
|
|
|
{
|