Selaa lähdekoodia

[WallPadAddService]
1. 기축서버 기능 추가

[ManagerSetting]
1. 기축서버일 경우 네트워크 체크에서 아이피 주소(변경된 아이피로 추가) 변경

jglee 3 vuotta sitten
vanhempi
commit
9eb395e43f

+ 10 - 0
ManagerSetting/src/main/java/com/artncore/managersetting/util/NetworkUtil.java

@@ -3,11 +3,13 @@ package com.artncore.managersetting.util;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.artncore.WallPadDataMgr.WallpadDeviceSet;
 import com.artncore.WallPadDataMgr.WallpadStatusData;
 import com.artncore.WallPadDataMgr.WallpadStatusData.PhoneAddr;
 import com.artncore.WallPadDataMgr.wallpaddbmgr;
 import com.artncore.WallPadDataMgr.wallpaddbmgr.AddressSet;
 
+import com.artncore.commons.define;
 import com.artncore.managersetting.domain.Const;
 import com.artncore.managersetting.ui.activities.MainActivity;
 
@@ -59,6 +61,14 @@ public class NetworkUtil {
         phoneAddr.Name = context.getString(R.string.check_network_apts_server);
         phoneAddr.IP = wallpadStatusData.GetServerIP();
         wallpadStatusData.closeDB();
+        //여기서 Blended인지 체크 필요
+        WallpadDeviceSet wallpadDeviceSet = new WallpadDeviceSet(context);
+        int danjiserverType = wallpadDeviceSet.GetNewDanjiServer();
+        if(danjiserverType == define.DanjiServerBlended)
+        {
+            phoneAddr.IP = define.NewDanjiServerIP;
+        }
+        wallpadDeviceSet.closeDB();
 
         return phoneAddr;
     }

+ 1 - 0
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/imap/iMAPNotice.java

@@ -121,6 +121,7 @@ public class iMAPNotice extends WallPadiMAPClient {
         XMLHeader = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
                 "<imap ver = \"1.0\" address = \"" + myIP + "\" sender = \"" + myDong + "동 " + myHo + "호" + "\">\r\n";
 
+        setContext(ctx);
         this.ctx = ctx;
     }