|
@@ -209,17 +209,18 @@ public class WallPadiMAPClient {
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
// mContext 가 설정되었을 경우 신형 단지서버 사용 유무를 가져온다.
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
+ int danjiserverType = define.DanjiServerBlended;
|
|
|
if (mContext != null) {
|
|
|
try {
|
|
|
WallpadDeviceSet wallpadDeviceSet = new WallpadDeviceSet(mContext);
|
|
|
//bNewDanjiServer = wallpadDeviceSet.GetNewDanjiServer();
|
|
|
bNewDanjiServer = false;
|
|
|
- int danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
|
|
|
- if(danjiserverType == 1)
|
|
|
+ danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
|
|
|
+ if(danjiserverType == define.DanjiServer1)
|
|
|
{
|
|
|
bNewDanjiServer = false;
|
|
|
}
|
|
|
- else if(danjiserverType == 2)
|
|
|
+ else if(danjiserverType == define.DanjiServer2)
|
|
|
{
|
|
|
bNewDanjiServer = true;
|
|
|
}
|
|
@@ -245,11 +246,15 @@ public class WallPadiMAPClient {
|
|
|
// 사용중일 경우 암호화 소켓을 생성한다.
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
Log.i(TAG, "[socketThread.run()] bNewDanjiServer [" + bNewDanjiServer + "]");
|
|
|
- if(bNewDanjiServer && SoIPa.equals(define.NewDanjiServerIP)){
|
|
|
+ if(bNewDanjiServer && SoIPa.equals("10.0.1.1")){
|
|
|
// 신형 단지서버를 사용중일 경우 SSL Socket 을 생성하여 통신한다.
|
|
|
int port = SoIPport + 1000;
|
|
|
Log.i(TAG, "[socketThread.run()] SSLClient > Target [" + SoIPa + ":" + port + "]");
|
|
|
- SSLClient sslClientSocket = new SSLClient(SoIPa, port);
|
|
|
+ String TargetIP = SoIPa;
|
|
|
+ if(danjiserverType == define.DanjiServerBlended)
|
|
|
+ TargetIP = define.NewDanjiServerIP;
|
|
|
+
|
|
|
+ SSLClient sslClientSocket = new SSLClient(TargetIP, port);
|
|
|
isock = sslClientSocket.getSocket();
|
|
|
if(isock!=null)
|
|
|
{
|