|
@@ -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 + "]");
|
|
|
|