|
@@ -320,6 +320,9 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
// 끝
|
|
|
|
|
|
+ //월패드 CallBr 관리하기 위한 List
|
|
|
+ static public ArrayList<Intent> CallBrList;
|
|
|
+
|
|
|
IconManager mIconManager;
|
|
|
public IconInfoTable mIconInfoTable;
|
|
|
public static int nShortcutCnt = 0;
|
|
@@ -2728,6 +2731,34 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
if (!bFromCall) {
|
|
|
// yjyoon. 2443에서는 Call 앱에서 녹화 수행
|
|
|
+ // 여기서 해당하는 br 정보를 저장 해야 함
|
|
|
+ //jglee - 여기서 BR들을 관리하기 위하여
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ Log.d(TAG, "jglee - Call Record");
|
|
|
m_CallSubMenuScreen.callStartCallAPK(ID.LINKEDSCREEN.SubCall.Door_Record, nEmerState);
|
|
|
}
|
|
|
break;
|
|
@@ -7085,6 +7116,8 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
Log.i(TAG, "[runWallPadCallAPKByUX] eCallOwner [" + eCallOwner + "], eEventType [" + eEventType + "], eCallType [" + eCallType + "]");
|
|
|
|
|
|
+
|
|
|
+
|
|
|
if (getIsSubWallpad()) {
|
|
|
// 서브월패드는 국선 기능을 제공하지 않는다.
|
|
|
if (eCallType != CALLTYPE.PSTN) runCallMainActivity(eCallOwner, eEventType, eCallType, nEmerState);
|
|
@@ -7092,6 +7125,7 @@ public class MainActivity extends WpadActivity {
|
|
|
else {
|
|
|
runCallMainActivity(eCallOwner, eEventType, eCallType, nEmerState);
|
|
|
}
|
|
|
+
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
}
|
|
@@ -7100,6 +7134,18 @@ public class MainActivity extends WpadActivity {
|
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ 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) );
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
public void runCallMainActivity(CALLOWNER eCallOwner, CALLEVENTTYPE eEventType, CALLTYPE eCallType) {
|
|
|
try {
|