|
|
@@ -432,7 +432,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
|
|
|
|
|
|
private String makeUnitName(String strName) {
|
|
|
try {
|
|
|
-// LOG("[makeUnitName] strName = " + strName);
|
|
|
+ LOG("[makeUnitName] strName = " + strName);
|
|
|
String strResult = "NONE";
|
|
|
if (strName.contains("PSTN")) {
|
|
|
String[] strParse_01 = strName.split(":");
|
|
|
@@ -691,8 +691,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
|
|
|
|
|
|
for (int i = 0; i < LIST_CNT; i++) {
|
|
|
if (mLIST[i].IMG_UNIT != null) mLIST[i].IMG_UNIT.setVisibility(View.INVISIBLE);
|
|
|
- if (mLIST[i].IMG_VISITORPICTURE != null)
|
|
|
- mLIST[i].IMG_VISITORPICTURE.setVisibility(View.INVISIBLE);
|
|
|
+ if (mLIST[i].IMG_VISITORPICTURE != null) mLIST[i].IMG_VISITORPICTURE.setVisibility(View.INVISIBLE);
|
|
|
if (mLIST[i].BTN_CHECK != null) mLIST[i].BTN_CHECK.setVisibility(View.INVISIBLE);
|
|
|
if (mLIST[i].TXT_INFO != null) mLIST[i].TXT_INFO.setVisibility(View.INVISIBLE);
|
|
|
if (mLIST[i].IMG_NEW != null) mLIST[i].IMG_NEW.setVisibility(View.INVISIBLE);
|
|
|
@@ -732,17 +731,17 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
|
|
|
if (i < nInfoCnt) {
|
|
|
mLIST_VALUE[i].ID = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getID();
|
|
|
if (ConfigValues.bEasyModeUse) {
|
|
|
- mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + "\n"
|
|
|
- + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
|
|
|
- } else {
|
|
|
- mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName())
|
|
|
- + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
|
|
|
+ mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ mLIST_VALUE[i].INFO = makeUnitName(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getName()) + makeUnitTimestamp(mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getTimestamp());
|
|
|
}
|
|
|
mLIST_VALUE[i].URI = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getURI();
|
|
|
mLIST_VALUE[i].NEW = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getChecked();
|
|
|
mLIST_VALUE[i].THIEF = mVisitorPictureHistoryInfoTable.getVisitorPictureHistoryInfo(i).getThief();
|
|
|
nStartIndex++;
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else {
|
|
|
mLIST_VALUE[i].ID = "";
|
|
|
mLIST_VALUE[i].INFO = "";
|
|
|
mLIST_VALUE[i].URI = "";
|
|
|
@@ -755,8 +754,7 @@ public class InquiryVisitorPictureHistory extends WpadScreen implements CallEven
|
|
|
mLIST[i].TXT_INFO.setText(mLIST_VALUE[i].INFO);
|
|
|
mLIST[i].IMG_UNIT.setVisibility(View.VISIBLE);
|
|
|
mLIST[i].TXT_INFO.setVisibility(View.VISIBLE);
|
|
|
- if (mLIST_VALUE[i].NEW.equals("FALSE"))
|
|
|
- mLIST[i].IMG_NEW.setVisibility(View.VISIBLE);
|
|
|
+ if (mLIST_VALUE[i].NEW.equals("FALSE")) mLIST[i].IMG_NEW.setVisibility(View.VISIBLE);
|
|
|
// if (mLIST_VALUE[i].THIEF.equals("TRUE"))
|
|
|
// mLIST[i].IMG_THIEF.setVisibility(View.VISIBLE);
|
|
|
drawVisitorPicture(i, mLIST_VALUE[i].URI);
|