Bläddra i källkod

[WallPadAPI]
1. 서버 2.0만 사용하는 경우 버그 수정

jglee 3 år sedan
förälder
incheckning
8f1f841f4c

+ 34 - 6
WallPadAPI/src/main/java/com/artncore/wallpadimap/WallPadiMAPClient.java

@@ -246,14 +246,42 @@ public class WallPadiMAPClient {
 				//                   사용중일 경우 암호화 소켓을 생성한다.
 				/////////////////////////////////////////////////////////////////////
 				Log.i(TAG, "[socketThread.run()] bNewDanjiServer [" + bNewDanjiServer + "]");
-				if(bNewDanjiServer && SoIPa.equals("10.0.1.1")){
+				if(danjiserverType == define.DanjiServerBlended)
+				{
+					if(bNewDanjiServer && SoIPa.equals("10.0.1.1")){
+						// 신형 단지서버를 사용중일 경우 SSL Socket 을 생성하여 통신한다.
+						int port = SoIPport + 1000;
+						Log.i(TAG, "[socketThread.run()] SSLClient > Target [" + define.NewDanjiServerIP + ":" + port + "]");
+						String TargetIP = SoIPa;
+						TargetIP = define.NewDanjiServerIP;
+
+						SSLClient sslClientSocket = new SSLClient(TargetIP, port);
+						isock = sslClientSocket.getSocket();
+						if(isock!=null)
+						{
+							isock.setSoLinger(true, 3000);
+							isock.setReceiveBufferSize(SOCKET_BUFFER_SIZE*1024);
+							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);
+					}
+				}
+				else if(danjiserverType == define.DanjiServer2)
+				{
 					// 신형 단지서버를 사용중일 경우 SSL Socket 을 생성하여 통신한다.
 					int port = SoIPport + 1000;
 					Log.i(TAG, "[socketThread.run()] SSLClient > Target [" + SoIPa + ":" + port + "]");
 					String TargetIP = SoIPa;
-					if(danjiserverType == define.DanjiServerBlended)
-						TargetIP = define.NewDanjiServerIP;
-
 					SSLClient sslClientSocket = new SSLClient(TargetIP, port);
 					isock = sslClientSocket.getSocket();
 					if(isock!=null)
@@ -264,7 +292,8 @@ public class WallPadiMAPClient {
 						isock.setSoTimeout(TimeOut);
 					}
 				}
-				else {
+				else
+				{
 					Log.i(TAG, "[socketThread.run()] Normal Client > Target [" + SoIPa + ":" + SoIPport + "]");
 					isock = new Socket();
 					isock.setSoLinger(true, 3000);
@@ -275,7 +304,6 @@ public class WallPadiMAPClient {
 					isock.connect(iSocAddr, SOCKET_WAIT_TIME);
 				}
 
-
 				if(isock!=null)
 				{
 					InputStream  In =  isock.getInputStream();