Przeglądaj źródła

[WallPadMain]
1. 거동 수상자 시나리오 관련 버그 수정
- CallBrList에 잘못된 BR 추가 수정(현관 딩동)
- Call 호출 시, 거동 수상자감지 딜레이 신호 전달

jglee 2 lat temu
rodzic
commit
a57c42cac6

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

@@ -2377,20 +2377,19 @@ public class iMapServer extends Service {
                                 if(MainActivity.CallBrList == null)
                                     MainActivity.CallBrList = new ArrayList<Intent>();
                                 Intent brListIntent = new Intent();
-                                brListIntent.setAction(define.NOTIFY_ACNAME);
-                                brListIntent.putExtra(define.NOTIBR_KIND, define.NOTIFY_SMART_DCAM_DETECT);
+                                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()  + ", Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
+                                        Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
                                     }
                                 }
                                 else {
                                     MainActivity.CallBrList.add(brListIntent);
-                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + ", Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0));
+                                    Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size()  + "현관 딩동");
                                 }
 
                                 //여기서 BrList에 남아 있는 갯수를 확인
@@ -2422,6 +2421,11 @@ public class iMapServer extends Service {
                                     mDingDongHandler.sendEmptyMessage(0); // 띵똥
                                 }
 
+                                Intent Newintent = new Intent();
+                                Newintent.setAction(Common.BR_RECORD_DELAY);
+                                getApplicationContext().sendBroadcast(Newintent);
+                                Log.w(TAG, "jglee - 띵동 수신 거동수상자 딜레이");
+                                
                                 runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus);
                             } catch (RuntimeException re) {
                                 LogUtil.errorLogInfo("", TAG, re);
@@ -15576,10 +15580,10 @@ public class iMapServer extends Service {
                     Common.bWallPadCallLive = bWallPadCallLive;
                     //여기서 삭제
                     if(MainActivity.CallBrList.size()>0) {
-                        Log.d(TAG, "jglee - CallBR Remove > Action : " + MainActivity.CallBrList.get(0).getAction() +  ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,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) );
+                            //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)
                             {
@@ -15589,7 +15593,7 @@ public class iMapServer extends Service {
                             else
                             {
                                 getApplicationContext().sendBroadcast(MainActivity.CallBrList.get(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) );
+                                Log.d(TAG, "jglee - Call 직접 Next 호출");
                             }
 
                         }