浏览代码

[WallPadAPI, WallPadMain]
1. 단지서버 타입 정보 define에 설정되어 있는 변수로 변경

jglee 3 年之前
父节点
当前提交
85cba6dd8f

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

@@ -2261,11 +2261,11 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 			{
 				//새로운 타입
 				if (GetData[1].indexOf("2.0") > 0) //2.0
-					return 2;
+					return define.DanjiServer2;
 				else if (GetData[1].indexOf("1.0") > 0) //2.0
-					return 1;
+					return define.DanjiServer1;
 				else
-					return 0;
+					return define.DanjiServerBlended;
 			}
 			else
 			{

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

@@ -1613,11 +1613,11 @@ public class WallpadStatusData extends wallpaddbmgr {
 		boolean bNewDanjiServer = false;
 		//boolean bNewDanjiServer = wallpadDeviceSet.GetNewDanjiServer();
 		int danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
-		if(danjiserverType == 1)
+		if(danjiserverType == define.DanjiServer1)
 		{
 			bNewDanjiServer = false;
 		}
-		else if(danjiserverType == 2)
+		else if(danjiserverType == define.DanjiServer2)
 		{
 			bNewDanjiServer = true;
 		}

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

@@ -246,11 +246,11 @@ public class WallPadiMAPNotifyAPI extends WallPadiMAPClient {
 							//boolean mNewDanjiServer =  wallpadDeviceSet.GetNewDanjiServer();
 							boolean mNewDanjiServer =  false;
 							int danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
-							if(danjiserverType == 1)
+							if(danjiserverType == define.DanjiServer1)
 							{
 								mNewDanjiServer = false;
 							}
-							else if(danjiserverType == 2)
+							else if(danjiserverType == define.DanjiServer2)
 							{
 								mNewDanjiServer = true;
 							}

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

@@ -1026,7 +1026,7 @@ public class WallPadiMAPUpgrade {
 				Wsdata.closeDB();
 
 				//여기서 ip정보를 변경해야 함
-				if(danjiserverType == 1 || danjiserverType == 2)
+				if(danjiserverType == define.DanjiServer1 || danjiserverType == define.DanjiServer2)
 				{
 					f.connect(FTPServer);
 				}

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

@@ -1860,11 +1860,11 @@ public class iMapServer extends Service {
                 strUploadFile = uploadfile;
 //                bMainServer2dot0 = wallpadDeviceSet.GetNewDanjiServer();
                 danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
-                if(danjiserverType == 1)
+                if(danjiserverType == define.DanjiServer1)
                 {
                     bMainServer2dot0 = false;
                 }
-                else if(danjiserverType == 2)
+                else if(danjiserverType == define.DanjiServer2)
                 {
                     bMainServer2dot0 = true;
                 }
@@ -1895,11 +1895,11 @@ public class iMapServer extends Service {
                 if (!mFTPManager.isFTPConnected()) {
 
                     boolean connect = false;
-                    if(danjiserverType == 1)
+                    if(danjiserverType == define.DanjiServer1)
                     {
                         connect = mFTPManager.connectFTP(strRemoteIP);
                     }
-                    else if(danjiserverType == 2)
+                    else if(danjiserverType == define.DanjiServer2)
                     {
                         connect = mFTPManager.connectFTP(strRemoteIP);
                     }
@@ -2953,11 +2953,11 @@ public class iMapServer extends Service {
             /////////////////////////////////////////////////////////////////////
             // 신형 단지서버 사용유무에 따라 서버소켓을 생성한다.
             /////////////////////////////////////////////////////////////////////
-            if(danjiserverType == 1)
+            if(danjiserverType == define.DanjiServer1)
             {
                 svr = new ServerSocket(port);
             }
-            else if(danjiserverType == 2)
+            else if(danjiserverType == define.DanjiServer2)
             {
                 int svrport = port + 1000;
                 Log.i(TAG, "============================================");
@@ -3151,7 +3151,7 @@ public class iMapServer extends Service {
                 //           사용중일 경우 ready 를 사용하지 않는 수신부로 수행한다.
                 //           (사유:암호화를 사용할 경우 ready 최초 동작되지않음)
                 /////////////////////////////////////////////////////////////////////
-                if (danjiserverType == 1) {
+                if (danjiserverType == define.DanjiServer1) {
                     while (System.currentTimeMillis() < lSocketConnectionPeriod) {
                         try {
                             if (MsgReader.ready()) {
@@ -11762,13 +11762,13 @@ public class iMapServer extends Service {
                 wallpadDeviceSet.closeDB();
             } catch (RuntimeException re) {
                 LogUtil.errorLogInfo("", TAG, re);
-                danjiserverType = 1;
+                danjiserverType = define.DanjiServer1;
             }
             catch (Exception e) {
                 Log.e(TAG, "[iMapSverSocket] - GetNewDanjiServer ExceptionError !!!");
                 //e.printStackTrace();
                 LogUtil.errorLogInfo("", TAG, e);
-                danjiserverType = 1;
+                danjiserverType = define.DanjiServer1;
             }
 
             Log.d(TAG, " iMapSverReload - mNewDanjiServer :" + danjiserverType );