Prechádzať zdrojové kódy

[WallPadAPI]
1. NewDanjiServerIP 새로운 단지서버 아이피 주소 추가
- 해당 아이피는 장성원 부장님께 물어봐서 진행
2. Blended 일경우 모두 신형단지서버 사용과 동일하게 처리

DESKTOP-FBA840V\icontrols 4 rokov pred
rodič
commit
320b1608c1

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java

@@ -2195,7 +2195,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 //	}
 
 	/**
-	 * 단지서버 가져오기(1: 1.0, 2:2.0, 0:Mix)
+	 * 단지서버 가져오기(1: 1.0, 2:2.0, 0:Blended)
 	 * @return
 	 */
 	public int GetNewDanjiServer()

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadStatusData.java

@@ -1619,7 +1619,7 @@ public class WallpadStatusData extends wallpaddbmgr {
 		}
 		else
 		{
-
+			bNewDanjiServer = true;
 		}
 
 		wallpadDeviceSet.closeDB();

+ 6 - 0
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -714,4 +714,10 @@ public class define {
 	public define()
 	{
 	}
+
+
+	/**
+	 * 단지서버 2.0 IP Address
+	 */
+	public static final String NewDanjiServerIP = "";
 }

+ 14 - 13
WallPadAPI/src/main/java/com/artncore/wallpadimap/WallPadiMAPClient.java

@@ -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)
 				{

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/wallpadimap/WallPadiMAPNotifyAPI.java

@@ -256,7 +256,7 @@ public class WallPadiMAPNotifyAPI extends WallPadiMAPClient {
 							}
 							else
 							{
-
+								mNewDanjiServer = true;
 							}
 
 							wallpadDeviceSet.closeDB();

+ 1 - 1
WallPadConfig/src/main/java/kr/co/icontrols/wallpadconfig/screen/ConfigSettingMainScreen.java

@@ -419,7 +419,7 @@ public class ConfigSettingMainScreen extends WpadScreen {
 				}
 				else
 				{
-
+					mNewDanjiServer = true;
 				}
 				wds.closeDB();
 

+ 1 - 1
WallPadConfig/src/main/java/kr/co/icontrols/wallpadconfig/screen/PopupSmartKeySvrSend.java

@@ -455,7 +455,7 @@ public class PopupSmartKeySvrSend extends WpadScreen
             }
             else
             {
-
+                isServer2_0 = true;
             }
             wds.closeDB();
 

+ 1 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/MainActivity.java

@@ -2845,7 +2845,7 @@ public class MainActivity extends WpadActivity {
                                 }
                                 else
                                 {
-
+                                    mNewDanjiServer = true;
                                 }
 
                                 wallpadDeviceSet.closeDB();

+ 4 - 4
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -1886,7 +1886,7 @@ public class iMapServer extends Service {
                 }
                 else
                 {
-
+                    bMainServer2dot0 = true;
                 }
 
 
@@ -2939,7 +2939,7 @@ public class iMapServer extends Service {
                 }
                 else
                 {
-
+                    mNewDanjiServer = true;
                 }
 
                 wallpadDeviceSet.closeDB();
@@ -11286,7 +11286,7 @@ public class iMapServer extends Service {
                 }
                 else
                 {
-
+                    mNewDanjiServer = true;
                 }
 
                 wallpadDeviceSet.closeDB();
@@ -11910,7 +11910,7 @@ public class iMapServer extends Service {
                 }
                 else
                 {
-
+                    bNewDanjiServer = true;
                 }
 
                 wallpadDeviceSet.closeDB();