Prechádzať zdrojové kódy

2021.11.16 VIP
1. db 사용 부분 제거

DESKTOP-UNEGUH3\MadeinLab_SW_02 3 rokov pred
rodič
commit
45ab67b7ff
17 zmenil súbory, kde vykonal 228 pridanie a 113 odobranie
  1. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  2. 11 8
      WallPadCall/src/main/java/kr/co/icontrols/callengine/sip/SIPStun.java
  3. 50 8
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java
  4. 12 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Notice_visitor_upload_complete.java
  5. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_delete.java
  6. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_inquiry.java
  7. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_save.java
  8. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_check_sip_activation.java
  9. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_lobby_capture.java
  10. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_lobby_open.java
  11. 12 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_start_talking.java
  12. 12 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_stop_talking.java
  13. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_access_info.java
  14. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_picture_delete.java
  15. 13 7
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_picture_inquiry.java
  16. 8 8
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkFront.java
  17. 5 4
      WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java

+ 1 - 1
WallPadCall/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2021.11.05.01">
+    android:versionName="2021.12.16.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

+ 11 - 8
WallPadCall/src/main/java/kr/co/icontrols/callengine/sip/SIPStun.java

@@ -59,6 +59,7 @@ import kr.co.icontrols.callengine.engine.CallManager.CALLTYPE;
 import kr.co.icontrols.wallpadcall.declare.Common;
 import kr.co.icontrols.wallpadcall.declare.Declare;
 import kr.co.icontrols.wallpadcall.declare.Declare.CALLTRIGGER;
+import kr.co.icontrols.wallpadcall.declare.Global;
 
 public class SIPStun extends Service {
 
@@ -4814,10 +4815,11 @@ public class SIPStun extends Service {
     private String getDongString() {
         try {
             String strResult = "";
-            wallpaddbmgr DBMGR = new wallpaddbmgr(this);
-            AddressSet Addr = DBMGR.getAddressMGR();
-            DBMGR.closeDB();
-            strResult = Addr.Dong;
+//            wallpaddbmgr DBMGR = new wallpaddbmgr(this);
+//            AddressSet Addr = DBMGR.getAddressMGR();
+//            DBMGR.closeDB();
+            strResult = Global.getIPadressDongHo()[1];
+            //strResult = Addr.Dong;
             LOG("[getDongString] strResult [" + strResult + "]");
             return strResult;
         } catch (RuntimeException re) {
@@ -4832,10 +4834,11 @@ public class SIPStun extends Service {
     private String getHoString() {
         try {
             String strResult = "";
-            wallpaddbmgr DBMGR = new wallpaddbmgr(this);
-            AddressSet Addr = DBMGR.getAddressMGR();
-            DBMGR.closeDB();
-            strResult = Addr.Ho;
+//            wallpaddbmgr DBMGR = new wallpaddbmgr(this);
+//            AddressSet Addr = DBMGR.getAddressMGR();
+//            DBMGR.closeDB();
+//            strResult = Addr.Ho;
+            strResult = Global.getIPadressDongHo()[2];
             LOG("[getHoString] strResult [" + strResult + "]");
             return strResult;
         } catch (RuntimeException re) {

+ 50 - 8
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/declare/Global.java

@@ -1439,14 +1439,55 @@ public final class Global {
         }
     }
 
+    public static String[] getIPadressDongHo()
+    {
+        String dong = "101";
+        String ho = "101";
+        String[] aDeviceName = new String[3];
+
+        String strIPResult = getIPAddress();
+
+        String[] IP_Parse = strIPResult.split("\\.");
+
+        int iDong = Integer.parseInt(IP_Parse[0]);
+
+        if(Integer.parseInt(IP_Parse[1]) < 10)
+        {
+            iDong = iDong * 10;
+        }
+        else if((Integer.parseInt(IP_Parse[1]) > 11) && (Integer.parseInt(IP_Parse[1]) < 100))
+        {
+            iDong = iDong * 100;
+        }
+        else if (Integer.parseInt(IP_Parse[1]) > 99)
+        {
+            iDong = iDong * 1000;
+        }
+
+        iDong = iDong + Integer.parseInt(IP_Parse[1]);
+
+        dong = Integer.toString(((iDong / 100) * 100) + Integer.parseInt(IP_Parse[1]));
+
+        ho = IP_Parse[2] + ZeroPadding_Head(2, IP_Parse[3]);
+
+        aDeviceName[0] = strIPResult;
+        aDeviceName[1] = dong;
+        aDeviceName[2] = ho;
+
+        return aDeviceName;
+    }
+
     public static String getDongString() {
         try {
             String strResult = "";
-            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
-            AddressSet Addr = DBMGR.getAddressMGR();
-            DBMGR.closeDB();
-            strResult = Addr.Dong;
+//            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
+//            AddressSet Addr = DBMGR.getAddressMGR();
+//            DBMGR.closeDB();
+//            strResult = Addr.Dong;
+            strResult = getIPadressDongHo()[1];
+
             LOG("[getDongString] strResult [" + strResult + "]");
+
             return strResult;
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
@@ -1460,10 +1501,11 @@ public final class Global {
     public static String getHoString() {
         try {
             String strResult = "";
-            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
-            AddressSet Addr = DBMGR.getAddressMGR();
-            DBMGR.closeDB();
-            strResult = Addr.Ho;
+//            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
+//            AddressSet Addr = DBMGR.getAddressMGR();
+//            DBMGR.closeDB();
+//            strResult = Addr.Ho;
+            strResult = getIPadressDongHo()[2];
             LOG("[getHoString] strResult [" + strResult + "]");
             return strResult;
         } catch (RuntimeException re) {

+ 12 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Notice_visitor_upload_complete.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Notice_visitor_upload_complete extends WallPadiMAPClient {
     String TAG = "Noti_Visit_up_complete";
     String DeviceIP = "NONE";
@@ -29,13 +31,16 @@ public class Notice_visitor_upload_complete extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_delete.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_call_history_delete extends WallPadiMAPClient {
     String TAG = "Request_call_history_delete";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_call_history_delete extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_inquiry.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_call_history_inquiry extends WallPadiMAPClient {
     String TAG = "Request_call_history_inquiry";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_call_history_inquiry extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_call_history_save.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_call_history_save extends WallPadiMAPClient {
     String TAG = "Request_call_history_save";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_call_history_save extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_check_sip_activation.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_check_sip_activation extends WallPadiMAPClient {
     String TAG = "Reqst_chck_sip_activ";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_check_sip_activation extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_lobby_capture.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_lobby_capture extends WallPadiMAPClient {
     String TAG = "Request_lobby_open";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_lobby_capture extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_lobby_open.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_lobby_open extends WallPadiMAPClient {
     String TAG = "Request_lobby_open";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_lobby_open extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 12 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_start_talking.java

@@ -10,6 +10,7 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 
 import kr.co.icontrols.wallpadcall.MainActivity;
+import kr.co.icontrols.wallpadcall.declare.Global;
 
 public class Request_start_talking extends WallPadiMAPClient {
     String TAG = "Request_start_talking";
@@ -31,13 +32,17 @@ public class Request_start_talking extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 12 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_stop_talking.java

@@ -9,6 +9,7 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 
 import kr.co.icontrols.wallpadcall.MainActivity;
+import kr.co.icontrols.wallpadcall.declare.Global;
 
 public class Request_stop_talking extends WallPadiMAPClient {
     String TAG = "Request_stop_talking";
@@ -30,13 +31,17 @@ public class Request_stop_talking extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_access_info.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_visitor_access_info extends WallPadiMAPClient {
     String TAG = "Req_visitor_acs_info";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_visitor_access_info extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_picture_delete.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_visitor_picture_delete extends WallPadiMAPClient {
     String TAG = "Request_visitor_picture_delete";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_visitor_picture_delete extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 13 - 7
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/imap/Request_visitor_picture_inquiry.java

@@ -9,6 +9,8 @@ import com.artncore.wallpadimap.RetProci;
 import com.artncore.wallpadimap.WallPadiMAPClient;
 import com.util.LogUtil;
 
+import kr.co.icontrols.wallpadcall.declare.Global;
+
 public class Request_visitor_picture_inquiry extends WallPadiMAPClient {
     String TAG = "Request_visitor_picture_inquiry";
     String DeviceIP = "NONE";
@@ -29,13 +31,17 @@ public class Request_visitor_picture_inquiry extends WallPadiMAPClient {
         try {
             mContext = context;
             super.setContext(mContext);
-            DBMGR = new WallpadStatusData(mContext);
-            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
-            DBMGR.closeDB();
-            //동, 호, ip 정보 저장
-            DeviceIP = Address.IPAddress;
-            DeviceDong = Address.Dong;
-            DeviceHo = Address.Ho;
+//            DBMGR = new WallpadStatusData(mContext);
+//            AddressSet Address = DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
+//            DBMGR.closeDB();
+//            //동, 호, ip 정보 저장
+//            DeviceIP = Address.IPAddress;
+//            DeviceDong = Address.Dong;
+//            DeviceHo = Address.Ho;
+
+            DeviceIP = Global.getIPadressDongHo()[0];
+            DeviceDong = Global.getIPadressDongHo()[1];
+            DeviceHo = Global.getIPadressDongHo()[2];
 
             //타임아웃 설정
             SetSocketWaitCount(2000);

+ 8 - 8
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkFront.java

@@ -931,14 +931,14 @@ public class TalkFront extends WpadScreen implements CallEventListener, MainEven
         try {
             LOG_INFO("[onShowRemoteVideo] bShow [" + bShow + "]");
 
-            if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(bShow, false);
-
-            if (bShow) {
-                sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
-            }
-            else {
-                enableSavePicBTN(false);
-            }
+//            if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(bShow, false);
+//
+//            if (bShow) {
+//                sendHandlerMsgDelayed(TalkFront.HANDLERMSG.ENABLE_SAVE_VISITORPICTURE, 0, 0, null, 3000);
+//            }
+//            else {
+//                enableSavePicBTN(false);
+//            }
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         } catch (Exception e) {

+ 5 - 4
WallPadCall/src/main/java/kr/co/icontrols/wallpadcall/screen/TalkGuard.java

@@ -1394,10 +1394,11 @@ public class TalkGuard extends WpadScreen implements CallEventListener, MainEven
 
     private String getDongString() {
         try {
-            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
-            AddressSet Addr = DBMGR.getAddressMGR();
-            DBMGR.closeDB();
-            String strResult = Addr.Dong;
+//            wallpaddbmgr DBMGR = new wallpaddbmgr(mContext);
+//            AddressSet Addr = DBMGR.getAddressMGR();
+//            DBMGR.closeDB();
+//            String strResult = Addr.Dong;
+            String strResult = Global.getIPadressDongHo()[1];
             LOG("[getDongString] strResult [" + strResult + "]");
             return strResult;
         } catch (RuntimeException re) {