|
@@ -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;
|
|
|
}
|