|
@@ -24,6 +24,8 @@ import com.util.LogUtil;
|
|
|
import java.io.BufferedReader;
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStreamReader;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
import kr.co.icontrols.callengine.engine.CallController.CallEventListener;
|
|
|
import kr.co.icontrols.callengine.engine.CallManager.CALLEVENTTYPE;
|
|
@@ -51,7 +53,9 @@ import kr.co.icontrols.wallpadcall.declare.Global.CALLDIRECTION;
|
|
|
import kr.co.icontrols.wallpadcall.declare.Global.CALLRESULT;
|
|
|
import kr.co.icontrols.wallpadcall.declare.Global.ConfigValues;
|
|
|
import kr.co.icontrols.wallpadcall.declare.ID;
|
|
|
+import kr.co.icontrols.wallpadcall.imap.Request_call_history_save;
|
|
|
import kr.co.icontrols.wallpadcall.imap.Request_check_sip_activation;
|
|
|
+import kr.co.icontrols.wallpadcall.imap.Request_visitor_picture_delete;
|
|
|
import kr.co.icontrols.wallpadsupport.Version;
|
|
|
import kr.co.icontrols.wallpadsupport.WpadImageView;
|
|
|
import kr.co.icontrols.wallpadsupport.WpadImageView.TOUCH_KIND;
|
|
@@ -100,21 +104,23 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
WpadImageView BTN_PORTRAIT;
|
|
|
WpadImageView BTN_DELETE;
|
|
|
WpadImageView BTN_DIVISION;
|
|
|
- WpadImageView[] BTN_TENKEY = new WpadImageView[12];
|
|
|
+ WpadImageView[] BTN_TENKEY = new WpadImageView[6];
|
|
|
int[][] TENKEYS = {
|
|
|
- {R.drawable.btn_num_1_normal, R.drawable.btn_num_1_pressed},
|
|
|
- {R.drawable.btn_num_2_normal, R.drawable.btn_num_2_pressed},
|
|
|
- {R.drawable.btn_num_3_normal, R.drawable.btn_num_3_pressed},
|
|
|
- {R.drawable.btn_num_4_normal, R.drawable.btn_num_4_pressed},
|
|
|
- {R.drawable.btn_num_5_normal, R.drawable.btn_num_5_pressed},
|
|
|
- {R.drawable.btn_num_6_normal, R.drawable.btn_num_6_pressed},
|
|
|
- {R.drawable.btn_num_7_normal, R.drawable.btn_num_7_pressed},
|
|
|
- {R.drawable.btn_num_8_normal, R.drawable.btn_num_8_pressed},
|
|
|
- {R.drawable.btn_num_9_normal, R.drawable.btn_num_9_pressed},
|
|
|
- {R.drawable.btn_num_dong_normal, R.drawable.btn_num_dong_pressed},
|
|
|
- {R.drawable.btn_num_0_normal, R.drawable.btn_num_0_pressed},
|
|
|
- {R.drawable.btn_num_ho_normal, R.drawable.btn_num_ho_pressed}
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_pressed, R.drawable.btn_floor_1_selected}, //10.1.1.1
|
|
|
+ {R.drawable.btn_floor_2_normal, R.drawable.btn_floor_2_pressed, R.drawable.btn_floor_2_selected}, //10.1.2.1
|
|
|
+ {R.drawable.btn_floor_3_normal, R.drawable.btn_floor_3_pressed, R.drawable.btn_floor_3_selected}, //10.1.3.1
|
|
|
+ {R.drawable.btn_main_room_normal, R.drawable.btn_main_room_pressed, R.drawable.btn_main_room_selected}, //10.1.3.2
|
|
|
+ {R.drawable.btn_driver_normal, R.drawable.btn_driver_pressed, R.drawable.btn_driver_selected}, //10.1.1.3
|
|
|
+ {R.drawable.btn_maid_normal, R.drawable.btn_maid_pressed, R.drawable.btn_maid_selected}, //10.1.1.2
|
|
|
+ {R.drawable.btn_kitchen_normal, R.drawable.btn_kitchen_pressed, R.drawable.btn_kitchen_selected}, //10.1.2.2
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal},
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal},
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal},
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal},
|
|
|
+ {R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal, R.drawable.btn_floor_1_normal}
|
|
|
};
|
|
|
+
|
|
|
+ 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"};
|
|
|
WpadTextView TXT_RESIDENCEINFO; // 세대정보
|
|
|
WpadTextView TXT_INSTRUCTION; // 안내문구
|
|
|
|
|
@@ -124,6 +130,9 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
SeekBar SEEKBAR_VOLUME;
|
|
|
WpadTextView TXT_VOLUME_LEVEL;
|
|
|
|
|
|
+ int m_nIDCnt_type = 0;
|
|
|
+ boolean m_bCallStateThreadStop = true;
|
|
|
+
|
|
|
class TextResources {
|
|
|
static final String strDong = "동";
|
|
|
static final String strHo = "호";
|
|
@@ -144,6 +153,8 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
int MINLENGTH_HO = 3;
|
|
|
int KEYBALANCE = ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 - 1;
|
|
|
|
|
|
+
|
|
|
+
|
|
|
int nCurrentVolume = 0;
|
|
|
|
|
|
boolean bshowMyVideo = false;
|
|
@@ -162,21 +173,22 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
|
|
|
IMG_RESIDENCE_BACKGROUND = new WpadImageView(context, TOUCH_KIND.NONE, 724, 544, R.drawable.bg_residence, 0, ID.SCREEN.TALKRESIDENCE.ELEMENT.IMAGE.BACKGROUND);
|
|
|
ViewRegistration(layout, IMG_RESIDENCE_BACKGROUND, Common.ImgPosition.GetX(142), Common.ImgPosition.GetY(110));
|
|
|
+ IMG_RESIDENCE_BACKGROUND.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
IMG_VIDEO_MODULE = new WpadImageView(context, TOUCH_KIND.NONE, 720, 540, R.drawable.image_neig, 0, ID.SCREEN.TALKRESIDENCE.ELEMENT.IMAGE.VIDEO_MODULE);
|
|
|
ViewRegistration(layout, IMG_VIDEO_MODULE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(112));
|
|
|
-
|
|
|
+ IMG_VIDEO_MODULE.setVisibility(View.INVISIBLE);
|
|
|
IMG_VOLUME = new WpadImageView(context, TOUCH_KIND.NONE, 40, 40, R.drawable.bar_icon_sound, 0, ID.SCREEN.TALKRESIDENCE.ELEMENT.IMAGE.VOLUME);
|
|
|
- ViewRegistration(layout, IMG_VOLUME, Common.ImgPosition.GetX(454), Common.ImgPosition.GetY(707));
|
|
|
+ ViewRegistration(layout, IMG_VOLUME, Common.ImgPosition.GetX(318), Common.ImgPosition.GetY(707));
|
|
|
|
|
|
TXT_VOLUME_LEVEL = new WpadTextView(context, false, 40, 40, Gravity.CENTER, Color.WHITE, Common.fontsize._30, false, ID.SCREEN.TALKFRONT.ELEMENT.TEXT.VOLUME_LEVEL);
|
|
|
- ViewRegistration(layout, TXT_VOLUME_LEVEL, Common.ImgPosition.GetX(785), Common.ImgPosition.GetY(705));
|
|
|
+ ViewRegistration(layout, TXT_VOLUME_LEVEL, Common.ImgPosition.GetX(644), Common.ImgPosition.GetY(705));
|
|
|
|
|
|
if (WpadScale.getWidthPixels() == WpadScale.DEFAULT_WIDTH_PIXELS) {
|
|
|
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
|
LinearLayout volumeLayout = (LinearLayout) inflater.inflate(R.layout.volume_seekbar_1280, null);
|
|
|
LayoutParams volumeParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
|
|
- int volMarginLeft = WpadScale.getWidth(Common.ImgPosition.GetX(507));
|
|
|
+ int volMarginLeft = WpadScale.getWidth(Common.ImgPosition.GetX(359));
|
|
|
int volMarginTop = WpadScale.getHeight(Common.ImgPosition.GetY(707));
|
|
|
volumeParams.setMargins(volMarginLeft, volMarginTop, 0, 0);
|
|
|
volumeLayout.setLayoutParams(volumeParams);
|
|
@@ -189,7 +201,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
|
LinearLayout volumeLayout = (LinearLayout) inflater.inflate(R.layout.volume_seekbar, null);
|
|
|
LayoutParams volumeParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
|
|
|
- int volMarginLeft = WpadScale.getWidth(Common.ImgPosition.GetX(502));
|
|
|
+ int volMarginLeft = WpadScale.getWidth(Common.ImgPosition.GetX(366));
|
|
|
int volMarginTop = WpadScale.getHeight(Common.ImgPosition.GetY(703));
|
|
|
volumeParams.setMargins(volMarginLeft, volMarginTop, 0, 0);
|
|
|
volumeLayout.setLayoutParams(volumeParams);
|
|
@@ -199,18 +211,36 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
layout.addView(volumeLayout);
|
|
|
}
|
|
|
|
|
|
- int nTenKeyGuide_X = Common.ImgPosition.GetX(460);
|
|
|
- int nTenKeyGuide_Y = Common.ImgPosition.GetY(112);
|
|
|
+ int nTenKeyGuide_X = Common.ImgPosition.GetX(142);
|
|
|
+ int nTenKeyGuide_Y = Common.ImgPosition.GetY(148);
|
|
|
int nIDCnt = 0;
|
|
|
- for (int i = 0; i < 4; i++) {
|
|
|
+
|
|
|
+ //String[] strEndIP = {"10.1.1.1", "10.1.1.2", "10.1.1.3", "10.1.1.4", "10.1.1.5", "10.1.1.6", "10.1.1.7"};
|
|
|
+
|
|
|
+
|
|
|
+ int nIDCnt_img = -1;
|
|
|
+ for(int i = 0; i < strEndIP.length; i++)
|
|
|
+ {
|
|
|
+ if (ConfigValues.strDeviceIPaddress.equals(strEndIP[i])) {
|
|
|
+ m_nIDCnt_type = i;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ for (int i = 0; i < 2; i++) {
|
|
|
for (int j = 0; j < 3; j++) {
|
|
|
- BTN_TENKEY[nIDCnt] = new WpadImageView(context, TOUCH_KIND.BUTTON, 132, 132, TENKEYS[nIDCnt][0], TENKEYS[nIDCnt][1], ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 + nIDCnt);
|
|
|
+ if(m_nIDCnt_type == nIDCnt)
|
|
|
+ nIDCnt_img +=2;
|
|
|
+ else
|
|
|
+ nIDCnt_img++;
|
|
|
+ BTN_TENKEY[nIDCnt] = new WpadImageView(context, TOUCH_KIND.BUTTON, 236, 230, TENKEYS[nIDCnt_img][0], TENKEYS[nIDCnt_img][1], ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 + nIDCnt_img);
|
|
|
ViewRegistration(layout, BTN_TENKEY[nIDCnt], nTenKeyGuide_X, nTenKeyGuide_Y);
|
|
|
- nTenKeyGuide_X += 136;
|
|
|
+
|
|
|
+ nTenKeyGuide_X += 244;
|
|
|
nIDCnt++;
|
|
|
}
|
|
|
- nTenKeyGuide_X = Common.ImgPosition.GetX(460);
|
|
|
- nTenKeyGuide_Y += 136;
|
|
|
+ nTenKeyGuide_X = Common.ImgPosition.GetX(142);
|
|
|
+ nTenKeyGuide_Y += 238;
|
|
|
}
|
|
|
|
|
|
LOG("[TalkResidence] bWallPadCameraEnable [" + ConfigValues.bWallPadCameraEnable + "]");
|
|
@@ -236,25 +266,27 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
}
|
|
|
|
|
|
// 부분 임대세대 적용여부 판단
|
|
|
- if (ConfigValues.bEnableHouseDivision) {
|
|
|
- Log.d(TAG, "[TalkResidenceScreen] bEnableHouseDivision TRUE 분리세대");
|
|
|
- BTN_DELETE = new WpadImageView(context, TOUCH_KIND.BUTTON_LC, 154, 132, R.drawable.btn_num_del_normal2, R.drawable.btn_num_del_pressed2, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE);
|
|
|
- ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
|
-
|
|
|
- BTN_DIVISION = new WpadImageView(context, TOUCH_KIND.BUTTON, 154, 132, R.drawable.btn_num_separation_normal, R.drawable.btn_num_separation_pressed, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DIVISION);
|
|
|
- ViewRegistration(layout, BTN_DIVISION, Common.ImgPosition.GetX(302), Common.ImgPosition.GetY(520));
|
|
|
- } else {
|
|
|
- BTN_DELETE = new WpadImageView(context, TOUCH_KIND.BUTTON_LC, 312, 132, R.drawable.btn_num_del_normal, R.drawable.btn_num_del_pressed, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE);
|
|
|
- ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
|
- }
|
|
|
-
|
|
|
+// if (ConfigValues.bEnableHouseDivision) {
|
|
|
+// Log.d(TAG, "[TalkResidenceScreen] bEnableHouseDivision TRUE 분리세대");
|
|
|
+// BTN_DELETE = new WpadImageView(context, TOUCH_KIND.BUTTON_LC, 154, 132, R.drawable.btn_num_del_normal2, R.drawable.btn_num_del_pressed2, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE);
|
|
|
+// ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
|
+//
|
|
|
+// BTN_DIVISION = new WpadImageView(context, TOUCH_KIND.BUTTON, 154, 132, R.drawable.btn_num_separation_normal, R.drawable.btn_num_separation_pressed, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DIVISION);
|
|
|
+// ViewRegistration(layout, BTN_DIVISION, Common.ImgPosition.GetX(302), Common.ImgPosition.GetY(520));
|
|
|
+// } else {
|
|
|
+// BTN_DELETE = new WpadImageView(context, TOUCH_KIND.BUTTON_LC, 312, 132, R.drawable.btn_num_del_normal, R.drawable.btn_num_del_pressed, ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.DELETE);
|
|
|
+// ViewRegistration(layout, BTN_DELETE, Common.ImgPosition.GetX(144), Common.ImgPosition.GetY(520));
|
|
|
+// }
|
|
|
+//
|
|
|
TXT_RESIDENCEINFO = new WpadTextView(context, false, 292, 284, Gravity.LEFT, context.getResources().getColor(R.color.orange), Common.fontsize._46, false, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.RESIDENCEINFO);
|
|
|
ViewRegistration(layout, TXT_RESIDENCEINFO, Common.ImgPosition.GetX(155), Common.ImgPosition.GetY(111));
|
|
|
TXT_RESIDENCEINFO.setText(strTXT_RESIDENCEINFO);
|
|
|
+ //TXT_RESIDENCEINFO.setVisibility(View.GONE);
|
|
|
|
|
|
TXT_INSTRUCTION = new WpadTextView(context, false, 317, 364, Gravity.CENTER, context.getResources().getColor(R.color.orange), Common.fontsize._52, true, ID.SCREEN.TALKRESIDENCE.ELEMENT.TEXT.INSTRUCTION);
|
|
|
ViewRegistration(layout, TXT_INSTRUCTION, Common.ImgPosition.GetX(142), Common.ImgPosition.GetY(255));
|
|
|
TXT_INSTRUCTION.setText(strTXT_INSTRUCTION);
|
|
|
+ //TXT_INSTRUCTION.setVisibility(View.GONE);
|
|
|
|
|
|
displayScreenValues();
|
|
|
sendHandlerMsg(HANDLERMSG.PROC_ADDCALL, 0, 0);
|
|
@@ -289,7 +321,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.bFFMPEGEnable) ((MainActivity)mContext).showRemoteVideo(false, false);
|
|
|
|
|
|
MainActivity.mCallController.mVideoJNI.setDecoderInfo_V40(116, 85, 576, 405); // 세대통화시 영상 좌표 재설정
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
} catch (Exception e) {
|
|
@@ -324,6 +356,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
mPathCheckHandler.removeMessages(0);
|
|
|
mPathCheckHandler.removeMessages(1);
|
|
|
}
|
|
|
+ mbCallState = false;
|
|
|
initCallVariables();
|
|
|
MainActivity.mCallController.mSIPInterface.videoSet(false, false, false);
|
|
|
MainActivity.mCallController.selectVideoSourceToSubPhone(CALLTYPE.NONE, true);
|
|
@@ -436,19 +469,25 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
}
|
|
|
else if (ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01 <= nID && nID <= ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_09) {
|
|
|
int nPressedNum = nID - KEYBALANCE;
|
|
|
- if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
|
- RemoteIDInfo.strDong += nPressedNum;
|
|
|
- if (RemoteIDInfo.strDong.length() > MAXLENGTH_DONG) {
|
|
|
- RemoteIDInfo.strDong = RemoteIDInfo.strDong.substring(1, 5);
|
|
|
- }
|
|
|
- playTenkeyNo(nID);
|
|
|
- } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO) {
|
|
|
- RemoteIDInfo.strHo += nPressedNum;
|
|
|
- if (RemoteIDInfo.strHo.length() > MAXLENGTH_HO) {
|
|
|
- RemoteIDInfo.strHo = RemoteIDInfo.strHo.substring(1, 5);
|
|
|
- }
|
|
|
- playTenkeyNo(nID);
|
|
|
- }
|
|
|
+ Global.TargetInputStep = TARGETINFOINPUTSTEP.DONG;
|
|
|
+
|
|
|
+ playTenkeyNo(nID);
|
|
|
+ Global.TargetInputStep = TARGETINFOINPUTSTEP.DONE;
|
|
|
+
|
|
|
+
|
|
|
+// if (Global.TargetInputStep == TARGETINFOINPUTSTEP.DONG) {
|
|
|
+// RemoteIDInfo.strDong += nPressedNum;
|
|
|
+// if (RemoteIDInfo.strDong.length() > MAXLENGTH_DONG) {
|
|
|
+// RemoteIDInfo.strDong = RemoteIDInfo.strDong.substring(1, 5);
|
|
|
+// }
|
|
|
+// playTenkeyNo(nID);
|
|
|
+// } else if (Global.TargetInputStep == TARGETINFOINPUTSTEP.HO) {
|
|
|
+// RemoteIDInfo.strHo += nPressedNum;
|
|
|
+// if (RemoteIDInfo.strHo.length() > MAXLENGTH_HO) {
|
|
|
+// RemoteIDInfo.strHo = RemoteIDInfo.strHo.substring(1, 5);
|
|
|
+// }
|
|
|
+// playTenkeyNo(nID);
|
|
|
+// }
|
|
|
updateResidenceInfo();
|
|
|
} else if (nID == ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_00) {
|
|
|
int nPressedNum = 0;
|
|
@@ -554,6 +593,41 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
super.onKeyDown(keyCode, event);
|
|
|
}
|
|
|
|
|
|
+ private boolean send_call_history_save(String strType, String strTime) {
|
|
|
+ try {
|
|
|
+ LOG_INFO("[send_call_history_save] strType() "+ strType + " strTime " + strTime);
|
|
|
+ final Request_call_history_save call_history_save = new Request_call_history_save(mContext);
|
|
|
+ if (call_history_save.send_call_history_save(RemoteIDInfo.strDong, RemoteIDInfo.strHo, strType, strTime)) {
|
|
|
+ call_history_save.setResultCtrl(new RetProci() {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void ProcSuccess() {
|
|
|
+
|
|
|
+ LOG_INFO("[send_call_history_save] ProcSuccess() ");
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void ProcError() {
|
|
|
+ LOG_INFO("[send_call_history_save] ProcError()");
|
|
|
+ //MainActivity.mCallController.mSIPInterface.cancelCallForwardToStun();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void ProcDoing() {
|
|
|
+ LOG_INFO("[send_call_history_save] ProcDoing()");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ Log.e(TAG, "[Exception] send_call_history_save(String strTargetIP, String strMessage)");
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ boolean mbCallState = false;
|
|
|
+
|
|
|
@Override
|
|
|
public void onCallEvent(CALLOWNER eCallOwner, CALLSTATUS eCallStatus, CALLTYPE eCallType, String strRemoteIP, String strRemoteSIPID, String strMessage) {
|
|
|
try {
|
|
@@ -564,6 +638,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
MainActivity.mCallController.setRemoteInfo(strRemoteSIPID, strRemoteIP);
|
|
|
setBTNStatus();
|
|
|
if (eCallStatus == CALLSTATUS.CALLING) {
|
|
|
+ mbCallState = true;
|
|
|
bRcvEnd = false;
|
|
|
Global.playMelodyRepeat(eCallType);
|
|
|
super.setFinishTimerDestroy();
|
|
@@ -573,6 +648,20 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLING);
|
|
|
updateInstruction();
|
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.OUT, CALLACTION.MISS, CALLRESULT.OUT_MISS);
|
|
|
+
|
|
|
+// String[] strEndIP = {"10.1.1.1", "10.1.1.2", "10.1.1.3", "10.1.1.4", "10.1.1.5", "10.1.1.6", "10.1.1.7"};
|
|
|
+//
|
|
|
+// for(int i = 0; i < strEndIP.length; i++)
|
|
|
+// {
|
|
|
+// if (strRemoteIP.equals(strEndIP[i])) {
|
|
|
+//
|
|
|
+// CallStateThread nr = new CallStateThread(i) ;
|
|
|
+// Thread t = new Thread(nr) ;
|
|
|
+// t.start() ;
|
|
|
+// break;
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
} else if (eCallStatus == CALLSTATUS.CALLED) {
|
|
|
bRcvEnd = false;
|
|
|
Global.playMelodyRepeat(eCallType);
|
|
@@ -584,6 +673,19 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
MainActivity.mCallController.set1stCallTimer(eCallType, MainActivity.mCallController.mCTT.CALLED);
|
|
|
updateScreen();
|
|
|
Global.make1stCallHistoryInfo(strRemoteIP, strRemoteSIPID, CALLDIRECTION.IN, CALLACTION.MISS, CALLRESULT.IN_MISS);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ for(int i = 0; i < strEndIP.length; i++)
|
|
|
+ {
|
|
|
+ if (strRemoteIP.equals(strEndIP[i])) {
|
|
|
+
|
|
|
+ CallStateThread nr = new CallStateThread(i) ;
|
|
|
+ Thread t = new Thread(nr) ;
|
|
|
+ t.start() ;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
else if (eCallStatus == CALLSTATUS.TALKING) {
|
|
|
Global.stopMelodyRepeat();
|
|
@@ -608,6 +710,24 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
updateInstruction();
|
|
|
Global.change1stCallLogAction(CALLACTION.TALK);
|
|
|
Global.add1stCallHistoryInfoFinal();
|
|
|
+ if(mbCallState)
|
|
|
+ {
|
|
|
+ String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
|
+ send_call_history_save("call", strTimeStamp);
|
|
|
+ mbCallState = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ //String[] strEndIP = {"10.1.1.1", "10.1.1.2", "10.1.1.3", "10.1.1.4", "10.1.1.5", "10.1.1.6", "10.1.1.7"};
|
|
|
+
|
|
|
+ for(int i = 0; i < strEndIP.length; i++)
|
|
|
+ {
|
|
|
+ if (strRemoteIP.equals(strEndIP[i])) {
|
|
|
+ m_bCallStateThreadStop = false;
|
|
|
+ Thread.sleep(1000);
|
|
|
+ setTunkeyImage(i);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
else if (eCallStatus == CALLSTATUS.HOMEVIEW) {
|
|
|
LOG_WARN("[onCallEvent] MOBILE HOMEVIEW!!!!");
|
|
@@ -634,7 +754,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
bRcvEnd = true;
|
|
|
|
|
|
if (eCallOwner != CALLOWNER.WALLPAD) {
|
|
|
- ((MainActivity) mContext).showRemoteCallNoticeText(false);
|
|
|
+ //((MainActivity) mContext).showRemoteCallNoticeText(false);
|
|
|
((MainActivity) mContext).finishPopUp(ID.POPUP.POPUP_NOTICE_SUBPHONETALK);
|
|
|
}
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.IDLE);
|
|
@@ -646,6 +766,13 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
} else if (eCallStatus == CALLSTATUS.REJECT) {
|
|
|
Global.stopMelodyRepeat();
|
|
|
+ if(mbCallState)
|
|
|
+ {
|
|
|
+ String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
|
+ send_call_history_save("reject_call", strTimeStamp);
|
|
|
+ mbCallState = false;
|
|
|
+ }
|
|
|
+
|
|
|
bRemoteVideoShow = false;
|
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
|
prepareMyVideo(false);
|
|
@@ -667,6 +794,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
Global.change1stCallLogAction(CALLACTION.REJECT);
|
|
|
showMyVideo(false);
|
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
+
|
|
|
}
|
|
|
else if (eCallStatus == CALLSTATUS.BUSY) {
|
|
|
Global.stopMelodyRepeat();
|
|
@@ -718,6 +846,12 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
MainActivity.mCallController.stop1stCallTimer();
|
|
|
tryAutoCall(strMessage);
|
|
|
} else if (eCallStatus == CALLSTATUS.TIMEOUT_1STCALL) {
|
|
|
+ if(mbCallState)
|
|
|
+ {
|
|
|
+ String strTimeStamp = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(new Date());
|
|
|
+ send_call_history_save("missed_call", strTimeStamp);
|
|
|
+ mbCallState = false;
|
|
|
+ }
|
|
|
Global.stopMelodyRepeat();
|
|
|
bRemoteVideoShow = false;
|
|
|
if (ConfigValues.bWallPadCameraEnable) {
|
|
@@ -736,6 +870,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
updateScreen();
|
|
|
showMyVideo(false);
|
|
|
MainActivity.mCallController.MultiCallScenarioManager();
|
|
|
+
|
|
|
} else {
|
|
|
Log.w(TAG, "[onCallEvent] Incorrect eCallStatus!!! eCallStatus = " + eCallStatus);
|
|
|
}
|
|
@@ -782,10 +917,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
- }
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
+// MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// }
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
|
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
@@ -845,10 +980,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
- }
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
+// MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// }
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
|
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
@@ -1114,10 +1249,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
- }
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
+// MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// }
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
|
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
@@ -1127,11 +1262,11 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
else ctrlAlphaBlending(false);
|
|
|
}
|
|
|
}
|
|
|
- if (bFinish
|
|
|
- && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT))
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// if (bFinish
|
|
|
+// && (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT))
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
} else if (nScreen == ID.POPUP.POPUP_NOTICE_SUBPHONETALK) {
|
|
|
if (nID == ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END) {
|
|
|
LOG_INFO("[onPopupResult] ID.POPUP.NOTICE_SUBPHONETALK.ELEMENT.BUTTON.END");
|
|
@@ -1141,10 +1276,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
} else if (nScreen == ID.POPUP.POPUP_MULTICALL_NOTICE) {
|
|
|
if (nID == ID.POPUP.MUTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM) {
|
|
|
LOG_INFO("[onPopupResult] ID.POPUP.POPUP_MULTICALL_NOTICE.ELEMENT.BUTTON.CONFIRM");
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
- }
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
+// MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// }
|
|
|
|
|
|
/**
|
|
|
* JEFF, 2020.01.01
|
|
@@ -1153,10 +1288,10 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
if (MainActivity.mPSTNController != null) MainActivity.mPSTNController.stopPSTNRingCntThread(); // PSTN 멀티콜 거절시 ring cnt 초기화
|
|
|
MainActivity.mCallController.stop2ndCallTimer();
|
|
|
doMultiCallReject();
|
|
|
- if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
- || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
- }
|
|
|
+// if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
|
+// || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT) {
|
|
|
+// MainActivity.mIOInterface.ctrlPopupGUI_Resi(false, bshowMyVideo); // 현재 통화패스가 IHN-1010 이웃통화일 경우 멀티콜 거절시 GUI 화면이 아래로(영상이 위로)
|
|
|
+// }
|
|
|
sendHandlerMsgDelayed(HANDLERMSG.REFRESH_BTNLED_STATUS, 0, 0, 1000);
|
|
|
|
|
|
if (ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40 || ConfigValues.DEVICE_BOARDTYPE == BOARD_TYPE.V40_NOUGAT
|
|
@@ -1226,7 +1361,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
Log.e(TAG, "[Exception] doTalk -> EthernetCtrl.makeIPAddress(...)");
|
|
|
((MainActivity) mContext).setMenuBTNEnable(true);
|
|
|
//e.printStackTrace();
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
|
}
|
|
|
|
|
|
if (!send_check_sip_activation_request(RemoteIDInfo.strIP)) {
|
|
@@ -1237,6 +1372,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
MainActivity.mCallController.mCallInfo.setCallOwner(eCallOwner);
|
|
|
MainActivity.mCallController.mCallInfo.setCallStatus(CALLTYPE.RESIDENCE, CALLSTATUS.TRYING_CALL);
|
|
|
}
|
|
@@ -1585,14 +1721,14 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
int BOARDTYPE = ConfigValues.DEVICE_BOARDTYPE;
|
|
|
if (BOARDTYPE == BOARD_TYPE.V40_IGW300 || BOARDTYPE == BOARD_TYPE.V40 || BOARDTYPE == BOARD_TYPE.V40_IGW300_NOUGAT || BOARDTYPE == BOARD_TYPE.V40_NOUGAT) {
|
|
|
if (bON) {
|
|
|
- IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back);
|
|
|
+ //IMG_VIDEO_MODULE.setImageResource(R.drawable.video_black_back);
|
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(116, 85, 240, 160);
|
|
|
}
|
|
|
else {
|
|
|
- IMG_VIDEO_MODULE.setImageResource(R.drawable.image_neig);
|
|
|
+ //IMG_VIDEO_MODULE.setImageResource(R.drawable.image_neig);
|
|
|
MainActivity.mCallController.mVideoJNI.setPreviewInfo_V40(0, 0, 0, 0);
|
|
|
}
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bON, bshowMyVideo);
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bON, bshowMyVideo);
|
|
|
}
|
|
|
else {
|
|
|
Log.w(TAG, "[ctrlAlphaBlending] Not supported BOARDTYPE!! [" + BOARDTYPE + "]");
|
|
@@ -1649,6 +1785,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled2);
|
|
|
}
|
|
|
showTalkMode(true);
|
|
|
+
|
|
|
setOnCallLED();
|
|
|
} else if (MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.HOMEVIEW) {
|
|
|
((MainActivity) mContext).setMenuBTNEnable(false);
|
|
@@ -1659,6 +1796,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
BTN_TALK.setButtonEventOffEnable(R.drawable.btn_residence_call_disabled2);
|
|
|
}
|
|
|
showTalkMode(true);
|
|
|
+
|
|
|
} else {
|
|
|
((MainActivity) mContext).setMenuBTNEnable(true);
|
|
|
// 버튼 이미지 조작
|
|
@@ -1854,36 +1992,56 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
LOG("[showTalkMode] bTalk [" + bTalk + "]");
|
|
|
if (bTalk) {
|
|
|
// 세대정보/안내문구
|
|
|
- TXT_RESIDENCEINFO.setVisibility(View.INVISIBLE);
|
|
|
- TXT_INSTRUCTION.setVisibility(View.INVISIBLE);
|
|
|
+// TXT_RESIDENCEINFO.setVisibility(View.VISIBLE);
|
|
|
+// TXT_INSTRUCTION.setVisibility(View.VISIBLE);
|
|
|
|
|
|
// 텐키 이미지 조작
|
|
|
- IMG_VIDEO_MODULE.setVisibility(View.VISIBLE);
|
|
|
- BTN_DELETE.setVisibility(View.INVISIBLE);
|
|
|
- if (ConfigValues.bEnableHouseDivision) {
|
|
|
- if(BTN_DIVISION!=null)
|
|
|
- BTN_DIVISION.setVisibility(View.INVISIBLE);
|
|
|
- }for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
- BTN_TENKEY[i].setVisibility(View.INVISIBLE);
|
|
|
- }
|
|
|
+ //IMG_VIDEO_MODULE.setVisibility(View.VISIBLE);
|
|
|
+// TXT_RESIDENCEINFO.setVisibility(View.VISIBLE);
|
|
|
+// TXT_INSTRUCTION.setVisibility(View.VISIBLE);
|
|
|
+ //BTN_DELETE.setVisibility(View.INVISIBLE);
|
|
|
+// if (ConfigValues.bEnableHouseDivision) {
|
|
|
+// if(BTN_DIVISION!=null)
|
|
|
+// BTN_DIVISION.setVisibility(View.INVISIBLE);
|
|
|
+// }
|
|
|
+// for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
+// BTN_TENKEY[i].setVisibility(View.INVISIBLE);
|
|
|
+// }
|
|
|
|
|
|
// 통화상대 정보
|
|
|
- ((MainActivity) mContext).displayRemoteID(RemoteIDInfo.strName);
|
|
|
+ ((MainActivity) mContext).displayRemoteID(null);
|
|
|
} else {
|
|
|
// 세대정보/안내문구
|
|
|
- TXT_RESIDENCEINFO.setVisibility(View.VISIBLE);
|
|
|
- TXT_INSTRUCTION.setVisibility(View.VISIBLE);
|
|
|
|
|
|
- // 텐키 이미지 조작
|
|
|
- BTN_DELETE.setVisibility(View.VISIBLE);
|
|
|
- if (ConfigValues.bEnableHouseDivision) {
|
|
|
- if(BTN_DIVISION!=null)
|
|
|
- BTN_DIVISION.setVisibility(View.VISIBLE);
|
|
|
- }
|
|
|
- for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
- if(BTN_TENKEY[i]!=null)
|
|
|
+ if(MainActivity.mCallController.mCallInfo.getRESI() == CALLSTATUS.IDLE)
|
|
|
+ {
|
|
|
+ TXT_RESIDENCEINFO.setVisibility(View.INVISIBLE);
|
|
|
+ TXT_INSTRUCTION.setVisibility(View.INVISIBLE);
|
|
|
+
|
|
|
+ for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+// TXT_RESIDENCEINFO.setVisibility(View.VISIBLE);
|
|
|
+// TXT_INSTRUCTION.setVisibility(View.VISIBLE);
|
|
|
+ for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
+ BTN_TENKEY[i].setButtonEventOffEnable();
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+ // 텐키 이미지 조작
|
|
|
+ //BTN_DELETE.setVisibility(View.VISIBLE);
|
|
|
+// if (ConfigValues.bEnableHouseDivision) {
|
|
|
+// if(BTN_DIVISION!=null)
|
|
|
+// BTN_DIVISION.setVisibility(View.VISIBLE);
|
|
|
+// }
|
|
|
+// for (int i = 0; i < BTN_TENKEY.length; i++) {
|
|
|
+// if(BTN_TENKEY[i]!=null)
|
|
|
+// BTN_TENKEY[i].setVisibility(View.VISIBLE);
|
|
|
+// }
|
|
|
IMG_VIDEO_MODULE.setVisibility(View.INVISIBLE);
|
|
|
|
|
|
// 통화상대 정보
|
|
@@ -1916,7 +2074,7 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
} else {
|
|
|
BTN_PORTRAIT.setImageResource(R.drawable.btn_residence_me_normal3);
|
|
|
}
|
|
|
- MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
+ //MainActivity.mIOInterface.ctrlPopupGUI_Resi(!bRemoteVideoShow, bshowMyVideo); // 세대통화 시작시 초기화
|
|
|
}
|
|
|
else {
|
|
|
LOG_WARN("[showMyVideo] BTN_PORTRAIT is null!!");
|
|
@@ -1951,58 +2109,218 @@ public class TalkResidence extends WpadScreen implements CallEventListener, Main
|
|
|
//e.printStackTrace();
|
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+// Handler mHandler = new Handler() ;
|
|
|
+//
|
|
|
+// class CallStateThread extends Thread {
|
|
|
+// Handler handler = mHandler ;
|
|
|
+// int m_iVal = 0;
|
|
|
+// int m_iVal1 = 0;
|
|
|
+// boolean m_bImageSet = false;
|
|
|
+// boolean m_bStop = true;
|
|
|
+//
|
|
|
+// public void CallStateThread(int val)
|
|
|
+// {
|
|
|
+// m_iVal = val;
|
|
|
+// if(m_nIDCnt_type < val)
|
|
|
+// m_iVal1 = val - 1;
|
|
|
+// }
|
|
|
+//
|
|
|
+// public void ThreadStop()
|
|
|
+// {
|
|
|
+// m_bStop = false;
|
|
|
+// }
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void run() {
|
|
|
+// while (m_bStop) {
|
|
|
+// // create Runnable instance.
|
|
|
+// Runnable runnable = new Runnable() {
|
|
|
+// @Override
|
|
|
+// public void run() {
|
|
|
+// // TODO : 실행 코드 작성.
|
|
|
+// if(m_bImageSet)
|
|
|
+// {
|
|
|
+// BTN_TENKEY[m_iVal1].setButtonDefaultImageID();
|
|
|
+// m_bImageSet = false;
|
|
|
+// }
|
|
|
+// else
|
|
|
+// {
|
|
|
+// BTN_TENKEY[m_iVal1].setButtonPressedImageID();
|
|
|
+// m_bImageSet = true;
|
|
|
+// }
|
|
|
+//
|
|
|
+// //BTN_TENKEY[m_iVal1].setImageResource(TENKEYS[m_iVal][2]);
|
|
|
+// }
|
|
|
+// };
|
|
|
+//
|
|
|
+// // send runnable object.
|
|
|
+// handler.post(runnable) ;
|
|
|
+//
|
|
|
+// try {
|
|
|
+// Thread.sleep(500);
|
|
|
+// } catch (InterruptedException e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+// }
|
|
|
+
|
|
|
+ class CallStateThread implements Runnable {
|
|
|
+
|
|
|
+ int m_iVal = 0;
|
|
|
+ int m_iImageSet = 0;
|
|
|
+
|
|
|
+ CallStateThread(int val) {
|
|
|
+
|
|
|
+ if(m_nIDCnt_type < val)
|
|
|
+ m_iVal = val - 1;
|
|
|
+ else
|
|
|
+ m_iVal = val;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void run() {
|
|
|
+ // TODO : thread running codes.
|
|
|
+ while (m_bCallStateThreadStop) {
|
|
|
+
|
|
|
+ Message msg = handler.obtainMessage();
|
|
|
+
|
|
|
+ msg.arg1 = m_iVal;
|
|
|
+ msg.arg2 = m_iImageSet;
|
|
|
+ handler.sendMessage(msg);
|
|
|
+
|
|
|
+ if(m_iImageSet == 0) m_iImageSet = 1;
|
|
|
+ else if(m_iImageSet == 1) m_iImageSet = 0;
|
|
|
+
|
|
|
+ try {
|
|
|
+ Thread.sleep(500);
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ final Handler handler = new Handler()
|
|
|
+
|
|
|
+ {
|
|
|
+ public void handleMessage(Message msg)
|
|
|
+ {
|
|
|
+ if(msg.arg2 == 0)
|
|
|
+ {
|
|
|
+ BTN_TENKEY[msg.arg1].setButtonPressedImageID();
|
|
|
+ }
|
|
|
+ else if(msg.arg2 == 1)
|
|
|
+ {
|
|
|
+ BTN_TENKEY[msg.arg1].setButtonDefaultImageID();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
+
|
|
|
+ private void setTunkeyImage(int val)
|
|
|
+ {
|
|
|
+
|
|
|
+ int ival = 0;
|
|
|
+ if(m_nIDCnt_type < val)
|
|
|
+ ival = val - 1;
|
|
|
+ else
|
|
|
+ ival = val;
|
|
|
+
|
|
|
+
|
|
|
+ for(int i = 0; i < BTN_TENKEY.length; i++)
|
|
|
+ {
|
|
|
+
|
|
|
+ if(ival == i)
|
|
|
+ {
|
|
|
+ BTN_TENKEY[i].setImageResource(TENKEYS[val][2]);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ BTN_TENKEY[i].setButtonDefaultImageID();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private void playTenkeyNo(int nBTN) {
|
|
|
try {
|
|
|
- int nSoundIndex = SND.number.NUM0;
|
|
|
+ int nSoundIndex = SND.effect.TOUCH_LATCHED;
|
|
|
switch (nBTN) {
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_00:
|
|
|
- nSoundIndex = SND.number.NUM0;
|
|
|
+ //nSoundIndex = SND.number.NUM0;
|
|
|
break;
|
|
|
-
|
|
|
+//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"};
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_01:
|
|
|
- nSoundIndex = SND.number.NUM1;
|
|
|
+ //nSoundIndex = SND.number.NUM1;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "101";
|
|
|
+
|
|
|
+ setTunkeyImage(0);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_02:
|
|
|
- nSoundIndex = SND.number.NUM2;
|
|
|
+ //nSoundIndex = SND.number.NUM2;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "201";
|
|
|
+ setTunkeyImage(1);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_03:
|
|
|
- nSoundIndex = SND.number.NUM3;
|
|
|
+ //nSoundIndex = SND.number.NUM3;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "301";
|
|
|
+ setTunkeyImage(2);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_04:
|
|
|
- nSoundIndex = SND.number.NUM4;
|
|
|
+ //nSoundIndex = SND.number.NUM4;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "302";
|
|
|
+ setTunkeyImage(3);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_05:
|
|
|
- nSoundIndex = SND.number.NUM5;
|
|
|
+ //nSoundIndex = SND.number.NUM5;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "103";
|
|
|
+ setTunkeyImage(4);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_06:
|
|
|
- nSoundIndex = SND.number.NUM6;
|
|
|
+ //nSoundIndex = SND.number.NUM6;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "102";
|
|
|
+ setTunkeyImage(5);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_07:
|
|
|
- nSoundIndex = SND.number.NUM7;
|
|
|
+ //nSoundIndex = SND.number.NUM7;
|
|
|
+ RemoteIDInfo.strDong = "101";
|
|
|
+ RemoteIDInfo.strHo = "202";
|
|
|
+ setTunkeyImage(6);
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_08:
|
|
|
- nSoundIndex = SND.number.NUM8;
|
|
|
+ //nSoundIndex = SND.number.NUM8;
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_09:
|
|
|
- nSoundIndex = SND.number.NUM9;
|
|
|
+ //nSoundIndex = SND.number.NUM9;
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_DONG:
|
|
|
- nSoundIndex = SND.setting.DONG;
|
|
|
+ //nSoundIndex = SND.setting.DONG;
|
|
|
break;
|
|
|
|
|
|
case ID.SCREEN.TALKRESIDENCE.ELEMENT.BUTTON.TENKEY_HO:
|
|
|
- nSoundIndex = SND.setting.HO;
|
|
|
+ //nSoundIndex = SND.setting.HO;
|
|
|
break;
|
|
|
}
|
|
|
|