Sfoglia il codice sorgente

[WallPadMain]
1. 콜 부분 사용 안하는 변수 주석처리
- 콜 신호(거동 수상자 또는 현관 호출이 이중으로 들어오는 경우 예외를 위한 List 변수 - 현재는 사용안하는 기능이기 때문에 주석처리함)

jglee 2 anni fa
parent
commit
a31b4d81b7

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

@@ -326,7 +326,7 @@ public class MainActivity extends WpadActivity {
     // 끝
 
     //월패드 CallBr 관리하기 위한 List
-    static public ArrayList<Intent> CallBrList;
+    //static public ArrayList<Intent> CallBrList;
 
     IconManager mIconManager;
     public IconInfoTable mIconInfoTable;
@@ -2765,31 +2765,31 @@ public class MainActivity extends WpadActivity {
                                 // yjyoon. 2443에서는 Call 앱에서 녹화 수행
                                 // 여기서 해당하는 br 정보를 저장 해야 함
                                 //jglee - 여기서 BR들을 관리하기 위하여
-                                if(CallBrList == null)
-                                    CallBrList = new ArrayList<Intent>();
+//                                if(CallBrList == null)
+//                                    CallBrList = new ArrayList<Intent>();
 
                                 Intent brListIntent = new Intent();
                                 brListIntent.setAction(define.NOTIFY_ACNAME);
                                 brListIntent.putExtra(define.NOTIBR_KIND, define.NOTIFY_SMART_DCAM_DETECT);
 
-                                if(CallBrList.size() > 1)
-                                {
-                                    if(CallBrList.get(0) != brListIntent)
-                                    {
-                                        CallBrList.add(brListIntent);
-                                        Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + CallBrList.size()  + ", Action : " + CallBrList.get(0).getAction());
-                                    }
-                                }
-                                else {
-                                    CallBrList.add(brListIntent);
-                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + CallBrList.size()  + ", Action : " + CallBrList.get(0).getAction());
-                                }
-
-                                //여기서 BrList에 남아 있는 갯수를 확인
-                                if(CallBrList!=null && CallBrList.size() > 1)
-                                {
-                                    return;
-                                }
+//                                if(CallBrList.size() > 1)
+//                                {
+//                                    if(CallBrList.get(0) != brListIntent)
+//                                    {
+//                                        CallBrList.add(brListIntent);
+//                                        Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + CallBrList.size()  + ", Action : " + CallBrList.get(0).getAction());
+//                                    }
+//                                }
+//                                else {
+//                                    CallBrList.add(brListIntent);
+//                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + CallBrList.size()  + ", Action : " + CallBrList.get(0).getAction());
+//                                }
+//
+//                                //여기서 BrList에 남아 있는 갯수를 확인
+//                                if(CallBrList!=null && CallBrList.size() > 1)
+//                                {
+//                                    return;
+//                                }
                                 Log.d(TAG, "jglee - Call Record");
                                 m_CallSubMenuScreen.callStartCallAPK(ID.LINKEDSCREEN.SubCall.Door_Record, nEmerState);
                             }
@@ -7169,12 +7169,12 @@ public class MainActivity extends WpadActivity {
 
     static public Handler CallIntentHandler = new Handler(Looper.getMainLooper()) {
         public void handleMessage(Message msg) {
-            if(CallBrList!=null && CallBrList.size() > 0)
-            {
-                Intent intent = CallBrList.get(0);
-                mContext_call.sendBroadcast(intent);
-                Log.d(TAG, "jglee - Call Handler Next 호출 > Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
-            }
+//            if(CallBrList!=null && CallBrList.size() > 0)
+//            {
+//                Intent intent = CallBrList.get(0);
+//                mContext_call.sendBroadcast(intent);
+//                Log.d(TAG, "jglee - Call Handler Next 호출 > Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
+//            }
 
         }
     };

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

@@ -2395,29 +2395,29 @@ public class iMapServer extends Service {
                                 Log.w(TAG, "[WallPadInterface.BTN_DOOR] New Call App!!!");
 
                                 //여기서 확인
-                                if(MainActivity.CallBrList == null)
-                                    MainActivity.CallBrList = new ArrayList<Intent>();
-                                Intent brListIntent = new Intent();
-                                brListIntent = intent;
-
-                                if(MainActivity.CallBrList.size() > 1)
-                                {
-                                    if(MainActivity.CallBrList.get(0) != brListIntent)
-                                    {
-                                        MainActivity.CallBrList.add(brListIntent);
-                                        Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
-                                    }
-                                }
-                                else {
-                                    MainActivity.CallBrList.add(brListIntent);
-                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
-                                }
-
-                                //여기서 BrList에 남아 있는 갯수를 확인
-                                if(MainActivity.CallBrList!=null && MainActivity.CallBrList.size() > 1)
-                                {
-                                    return;
-                                }
+//                                if(MainActivity.CallBrList == null)
+//                                    MainActivity.CallBrList = new ArrayList<Intent>();
+//                                Intent brListIntent = new Intent();
+//                                brListIntent = intent;
+//
+//                                if(MainActivity.CallBrList.size() > 1)
+//                                {
+//                                    if(MainActivity.CallBrList.get(0) != brListIntent)
+//                                    {
+//                                        MainActivity.CallBrList.add(brListIntent);
+//                                        Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
+//                                    }
+//                                }
+//                                else {
+//                                    MainActivity.CallBrList.add(brListIntent);
+//                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
+//                                }
+//
+//                                //여기서 BrList에 남아 있는 갯수를 확인
+//                                if(MainActivity.CallBrList!=null && MainActivity.CallBrList.size() > 1)
+//                                {
+//                                    return;
+//                                }
                                 Log.d(TAG, "jglee - Call Front");
 
                                 bBlockFrontCall = true;
@@ -15607,25 +15607,25 @@ public class iMapServer extends Service {
                     bWallPadCallLive = true;
                     Common.bWallPadCallLive = bWallPadCallLive;
                     //여기서 삭제
-                    if(MainActivity.CallBrList.size()>0) {
-                        Log.d(TAG, "jglee - CallBR Remove");
-                        MainActivity.CallBrList.remove(0);
-                        if(MainActivity.CallBrList.size() > 0) {
-                            //Log.d(TAG, "jglee - Call Next 호출 > Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
-                            //jglee - 내부 이슈가 수정이 되지 않으면, 아래 핸들러를 이용하여 사용 필요
-                            if(false)
-                            {
-                                if(MainActivity.CallIntentHandler!=null)
-                                    MainActivity.CallIntentHandler.sendMessageDelayed(MainActivity.CallIntentHandler.obtainMessage(), 1500);
-                            }
-                            else
-                            {
-                                getApplicationContext().sendBroadcast(MainActivity.CallBrList.get(0));
-                                Log.d(TAG, "jglee - Call 직접 Next 호출");
-                            }
-
-                        }
-                    }
+//                    if(MainActivity.CallBrList.size()>0) {
+//                        Log.d(TAG, "jglee - CallBR Remove");
+//                        MainActivity.CallBrList.remove(0);
+//                        if(MainActivity.CallBrList.size() > 0) {
+//                            //Log.d(TAG, "jglee - Call Next 호출 > Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
+//                            //jglee - 내부 이슈가 수정이 되지 않으면, 아래 핸들러를 이용하여 사용 필요
+//                            if(false)
+//                            {
+//                                if(MainActivity.CallIntentHandler!=null)
+//                                    MainActivity.CallIntentHandler.sendMessageDelayed(MainActivity.CallIntentHandler.obtainMessage(), 1500);
+//                            }
+//                            else
+//                            {
+//                                getApplicationContext().sendBroadcast(MainActivity.CallBrList.get(0));
+//                                Log.d(TAG, "jglee - Call 직접 Next 호출");
+//                            }
+//
+//                        }
+//                    }
                     nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT;
                     Log.w(TAG,"[WallPadCallLiveBRCheck] bWallPadCallLive [" + bWallPadCallLive + "]");