|
@@ -1561,6 +1561,9 @@ public class MainActivity extends WpadActivity {
|
|
|
strCallEvent = mIntent.getStringExtra(CALLTRIGGER.CALLEVENTTYPE);
|
|
strCallEvent = mIntent.getStringExtra(CALLTRIGGER.CALLEVENTTYPE);
|
|
|
strCallType = mIntent.getStringExtra(CALLTRIGGER.CALLTYPE);
|
|
strCallType = mIntent.getStringExtra(CALLTRIGGER.CALLTYPE);
|
|
|
strRemoteInfo = mIntent.getStringExtra(CALLTRIGGER.REMOTEINFO);
|
|
strRemoteInfo = mIntent.getStringExtra(CALLTRIGGER.REMOTEINFO);
|
|
|
|
|
+ //이정보를 가지고 체크
|
|
|
|
|
+ bArsAutoCall = mIntent.getBooleanExtra(CALLTRIGGER.ARSAUTOCALL, false);
|
|
|
|
|
+
|
|
|
nRemoteInfo_Dong = mIntent.getIntExtra(CALLTRIGGER.REMOTEINFO_DONG, 0);
|
|
nRemoteInfo_Dong = mIntent.getIntExtra(CALLTRIGGER.REMOTEINFO_DONG, 0);
|
|
|
nRemoteInfo_Ho = mIntent.getIntExtra(CALLTRIGGER.REMOTEINFO_HO, 0);
|
|
nRemoteInfo_Ho = mIntent.getIntExtra(CALLTRIGGER.REMOTEINFO_HO, 0);
|
|
|
|
|
|
|
@@ -2217,6 +2220,7 @@ public class MainActivity extends WpadActivity {
|
|
|
String strCallEvent = "NONE";
|
|
String strCallEvent = "NONE";
|
|
|
String strCallType = "NONE";
|
|
String strCallType = "NONE";
|
|
|
String strRemoteInfo = "NONE";
|
|
String strRemoteInfo = "NONE";
|
|
|
|
|
+ boolean bArsAutoCall = false;
|
|
|
int nRemoteInfo_Dong = 0;
|
|
int nRemoteInfo_Dong = 0;
|
|
|
int nRemoteInfo_Ho = 0;
|
|
int nRemoteInfo_Ho = 0;
|
|
|
|
|
|
|
@@ -2300,6 +2304,8 @@ public class MainActivity extends WpadActivity {
|
|
|
else if (calltype == CALLTYPE.PSTN) {
|
|
else if (calltype == CALLTYPE.PSTN) {
|
|
|
RemoteIDInfo.bAutoCall = true;
|
|
RemoteIDInfo.bAutoCall = true;
|
|
|
RemoteIDInfo.strPSTNInfo = strRemoteInfo;
|
|
RemoteIDInfo.strPSTNInfo = strRemoteInfo;
|
|
|
|
|
+ RemoteIDInfo.mARSAutoCall = bArsAutoCall;
|
|
|
|
|
+
|
|
|
if (mCallController != null) {
|
|
if (mCallController != null) {
|
|
|
mCallController.mCallInfo.setCallOwner(callowner);
|
|
mCallController.mCallInfo.setCallOwner(callowner);
|
|
|
mCallController.CallScenarioManager(callowner, calleventtype, calltype, null, null, null);
|
|
mCallController.CallScenarioManager(callowner, calleventtype, calltype, null, null, null);
|
|
@@ -5493,9 +5499,12 @@ public class MainActivity extends WpadActivity {
|
|
|
|
|
|
|
|
// [bell]
|
|
// [bell]
|
|
|
case SND.bell.FRONT: FileName = "bell/Bell_Front.wav"; break;
|
|
case SND.bell.FRONT: FileName = "bell/Bell_Front.wav"; break;
|
|
|
- case SND.bell.GUARDROOM: FileName = "bell/Bell_GuardRoom.wav"; break;
|
|
|
|
|
- case SND.bell.LOBBY: FileName = "bell/Bell_Lobby.wav"; break;
|
|
|
|
|
- case SND.bell.NEIGHBOOR: FileName = "bell/Bell_Neighboor.wav"; break;
|
|
|
|
|
|
|
+ //case SND.bell.GUARDROOM: FileName = "bell/Bell_GuardRoom.wav"; break;
|
|
|
|
|
+ case SND.bell.GUARDROOM: FileName = "bell/Bell_Front.wav"; break;
|
|
|
|
|
+ //case SND.bell.LOBBY: FileName = "bell/Bell_Lobby.wav"; break;
|
|
|
|
|
+ case SND.bell.LOBBY: FileName = "bell/Bell_Front.wav"; break;
|
|
|
|
|
+ //case SND.bell.NEIGHBOOR: FileName = "bell/Bell_Neighboor.wav"; break;
|
|
|
|
|
+ case SND.bell.NEIGHBOOR: FileName = "bell/Bell_Front.wav"; break;
|
|
|
case SND.bell.PSTN: FileName = "bell/Bell_Pstn.wav"; break;
|
|
case SND.bell.PSTN: FileName = "bell/Bell_Pstn.wav"; break;
|
|
|
case SND.bell.ALRAM: FileName = "bell/Alram.wav"; break;
|
|
case SND.bell.ALRAM: FileName = "bell/Alram.wav"; break;
|
|
|
case SND.bell.MONINGCALL_01: FileName = "bell/MoningCall01.wav"; break;
|
|
case SND.bell.MONINGCALL_01: FileName = "bell/MoningCall01.wav"; break;
|