|
@@ -326,7 +326,7 @@ public class MainActivity extends WpadActivity {
|
|
// 끝
|
|
// 끝
|
|
|
|
|
|
//월패드 CallBr 관리하기 위한 List
|
|
//월패드 CallBr 관리하기 위한 List
|
|
- static public ArrayList<Intent> CallBrList;
|
|
|
|
|
|
+ //static public ArrayList<Intent> CallBrList;
|
|
|
|
|
|
IconManager mIconManager;
|
|
IconManager mIconManager;
|
|
public IconInfoTable mIconInfoTable;
|
|
public IconInfoTable mIconInfoTable;
|
|
@@ -2765,31 +2765,31 @@ public class MainActivity extends WpadActivity {
|
|
// yjyoon. 2443에서는 Call 앱에서 녹화 수행
|
|
// yjyoon. 2443에서는 Call 앱에서 녹화 수행
|
|
// 여기서 해당하는 br 정보를 저장 해야 함
|
|
// 여기서 해당하는 br 정보를 저장 해야 함
|
|
//jglee - 여기서 BR들을 관리하기 위하여
|
|
//jglee - 여기서 BR들을 관리하기 위하여
|
|
- if(CallBrList == null)
|
|
|
|
- CallBrList = new ArrayList<Intent>();
|
|
|
|
|
|
+// if(CallBrList == null)
|
|
|
|
+// CallBrList = new ArrayList<Intent>();
|
|
|
|
|
|
Intent brListIntent = new Intent();
|
|
Intent brListIntent = new Intent();
|
|
brListIntent.setAction(define.NOTIFY_ACNAME);
|
|
brListIntent.setAction(define.NOTIFY_ACNAME);
|
|
brListIntent.putExtra(define.NOTIBR_KIND, define.NOTIFY_SMART_DCAM_DETECT);
|
|
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");
|
|
Log.d(TAG, "jglee - Call Record");
|
|
m_CallSubMenuScreen.callStartCallAPK(ID.LINKEDSCREEN.SubCall.Door_Record, nEmerState);
|
|
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()) {
|
|
static public Handler CallIntentHandler = new Handler(Looper.getMainLooper()) {
|
|
public void handleMessage(Message msg) {
|
|
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) );
|
|
|
|
+// }
|
|
|
|
|
|
}
|
|
}
|
|
};
|
|
};
|