|
@@ -490,6 +490,8 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
|
|
|
String strSIPID = call_history_inquiry.GetAttributeVal(i, "recv_id_high") + "동" + call_history_inquiry.GetAttributeVal(i, "recv_id_low") + "호";
|
|
|
String strTimestamp = call_history_inquiry.GetAttributeVal(i, "event_time");
|
|
|
|
|
|
+ LOG_INFO("[send_call_history_inquiry] " + i + " strName : " + strName + " strCallResult : " + strCallResult + " strRemoteIP : " + strRemoteIP);
|
|
|
+
|
|
|
mInfoTable.addCallHistoryInfo("", strName, strCallResult, strRemoteIP, strSIPID, "", "", strTimestamp);
|
|
|
|
|
|
mAllInfoTable.addCallHistoryInfo(call_history_inquiry.GetAttributeVal(i, "event_time"),
|
|
@@ -1047,6 +1049,27 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private String getNameTitleText(String strIPAddress) {
|
|
|
+ try {
|
|
|
+ //CALLTYPE eCallType = Global.getCallType(strIPAddress);
|
|
|
+
|
|
|
+ if (strIPAddress.equals("doorcamera")) return "현관";
|
|
|
+ else if (strIPAddress.equals("lobby"))
|
|
|
+ return "로비";
|
|
|
+ else if (strIPAddress.equals("homedev"))
|
|
|
+ return "이웃";
|
|
|
+ else return "경비실";
|
|
|
+ } catch (RuntimeException re) {
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
+ return "경비실";
|
|
|
+ } catch (Exception e) {
|
|
|
+ Log.e(TAG, "[Exception] getNameImgText(String strIPAddress)");
|
|
|
+ //e.printStackTrace();
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
|
+ return "경비실";
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private boolean activateTalkBTN(String strName) {
|
|
|
try {
|
|
|
if (strName.contains("로비")) return false;
|
|
@@ -1131,21 +1154,23 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
|
|
|
mLIST_VALUE[i].CHECK = false;
|
|
|
if (i < nInfoCnt) {
|
|
|
mLIST_VALUE[i].ID = mInfoTable.getCallHistoryInfo(i+iListCount).getID();
|
|
|
- if (mInfoTable.getCallHistoryInfo(i).getName().equals("lobby")) {
|
|
|
- mLIST_VALUE[i].NAME = "101동 10번 로비";
|
|
|
+
|
|
|
+
|
|
|
+ mLIST_VALUE[i].TIME = makeUnitTimestamp(mInfoTable.getCallHistoryInfo(i+iListCount).getTimestamp());
|
|
|
+ mLIST_VALUE[i].TYPE = makeUnitType(mInfoTable.getCallHistoryInfo(i+iListCount).getCallResult());
|
|
|
+ mLIST_VALUE[i].REMOTE_IP = mInfoTable.getCallHistoryInfo(i+iListCount).getName();
|
|
|
+
|
|
|
+ if (mLIST_VALUE[i].REMOTE_IP.equals("lobby")) {
|
|
|
+ mLIST_VALUE[i].NAME = "정문 로비";
|
|
|
}
|
|
|
- else if (mInfoTable.getCallHistoryInfo(i+iListCount).getName().equals("homedev")) {
|
|
|
+ else if (mLIST_VALUE[i].REMOTE_IP.equals("homedev")) {
|
|
|
//String[] strEndIP = {"10.1.1.1", "10.1.2.1", "10.1.3.1", "10.1.3.2", "10.1.1.3", "10.1.1.2", "10.1.2.2"};
|
|
|
mLIST_VALUE[i].NAME = makeResiType(mInfoTable.getCallHistoryInfo(i+iListCount).getSIPID());
|
|
|
}
|
|
|
- else if (mInfoTable.getCallHistoryInfo(i+iListCount).getName().equals("doorcamera")) {
|
|
|
+ else if (mLIST_VALUE[i].REMOTE_IP.equals("doorcamera")) {
|
|
|
//String[] strEndIP = {"10.1.1.1", "10.1.2.1", "10.1.3.1", "10.1.3.2", "10.1.1.3", "10.1.1.2", "10.1.2.2"};
|
|
|
mLIST_VALUE[i].NAME = "현관";
|
|
|
}
|
|
|
-
|
|
|
- mLIST_VALUE[i].TIME = makeUnitTimestamp(mInfoTable.getCallHistoryInfo(i+iListCount).getTimestamp());
|
|
|
- mLIST_VALUE[i].TYPE = makeUnitType(mInfoTable.getCallHistoryInfo(i+iListCount).getCallResult());
|
|
|
- mLIST_VALUE[i].REMOTE_IP = mInfoTable.getCallHistoryInfo(i+iListCount).getName();
|
|
|
mLIST_VALUE[i].NEW = "";
|
|
|
nStartIndex++;
|
|
|
} else {
|
|
@@ -1161,6 +1186,17 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
|
|
|
for (int i = 0; i < nInfoCnt; i++) {
|
|
|
mLIST[i].IMG_NAME.setText(getNameImgText(mLIST_VALUE[i].REMOTE_IP));
|
|
|
mLIST[i].TXT_TYPE.setText(mLIST_VALUE[i].TYPE);
|
|
|
+
|
|
|
+// if(getNameTitleText(mLIST_VALUE[i].REMOTE_IP).equals("이웃"))
|
|
|
+// {
|
|
|
+// mLIST[i].TXT_NAME.setText(mLIST_VALUE[i].NAME);
|
|
|
+// }
|
|
|
+// else
|
|
|
+// {
|
|
|
+// mLIST[i].TXT_NAME.setText(getNameTitleText(mLIST_VALUE[i].REMOTE_IP));
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
mLIST[i].TXT_NAME.setText(mLIST_VALUE[i].NAME);
|
|
|
mLIST[i].TXT_TIME.setText(mLIST_VALUE[i].TIME);
|
|
|
mLIST[i].TXT_TYPE.setVisibility(View.VISIBLE);
|
|
@@ -1173,8 +1209,12 @@ public class InquiryCallHistory extends WpadScreen implements CallEventListener,
|
|
|
mLIST[i].IMG_NAME.setVisibility(View.VISIBLE);
|
|
|
mLIST[i].TXT_NAME.setVisibility(View.VISIBLE);
|
|
|
mLIST[i].TXT_TIME.setVisibility(View.VISIBLE);
|
|
|
- if (activateTalkBTN(mLIST_VALUE[i].NAME))
|
|
|
- mLIST[i].BTN_TALK.setVisibility(View.VISIBLE);
|
|
|
+ if (activateTalkBTN(mLIST_VALUE[i].NAME)) {
|
|
|
+ LOG_DEBUG("[getHistoryFromDB] Global.strDeviceName = " + Global.strDeviceName);
|
|
|
+ LOG_DEBUG("[getHistoryFromDB] mLIST_VALUE[i].NAME = " + mLIST_VALUE[i].NAME);
|
|
|
+ if(!Global.strDeviceName.contains(mLIST_VALUE[i].NAME))
|
|
|
+ mLIST[i].BTN_TALK.setVisibility(View.VISIBLE);
|
|
|
+ }
|
|
|
if (mLIST_VALUE[i].NEW.equals("FALSE"))
|
|
|
mLIST[i].IMG_NEW.setVisibility(View.VISIBLE);
|
|
|
}
|