|
@@ -151,6 +151,7 @@ public class MainActivity extends WpadActivity {
|
|
|
// [[ Declaration ]] region
|
|
|
// =================================================================================================
|
|
|
protected Context mContext = null;
|
|
|
+ static Context mContext_call = null;
|
|
|
public Context getContext() { return mContext; }
|
|
|
private WallPadAPI mWallPadAPI = null;
|
|
|
public static IOInterface mIOInterface = null;
|
|
@@ -705,6 +706,7 @@ public class MainActivity extends WpadActivity {
|
|
|
PopupActivityRun = false;
|
|
|
InfoActivityRun = false;
|
|
|
mContext = this;
|
|
|
+ mContext_call = mContext;
|
|
|
setCallAppRunning(false); // 메인앱 초기화시 통화앱 미실행값을 DB에 저장
|
|
|
// 2. 자동 종료 셋팅
|
|
|
DebugLogOutput("[Create] - Step2 : Auto Finish Setting");
|
|
@@ -2508,7 +2510,7 @@ public class MainActivity extends WpadActivity {
|
|
|
imapAlarmOperation.SetServerIPcfg(DstIP, DstPort);
|
|
|
imapAlarmOperation.DoWork(alarm_mode, cause);
|
|
|
imapAlarmOperation.SetRetCtr(new RetProci(){
|
|
|
-
|
|
|
+F
|
|
|
@Override
|
|
|
public void ProcSuccess() {
|
|
|
// TODO Auto-generated method stub
|
|
@@ -4528,7 +4530,7 @@ public class MainActivity extends WpadActivity {
|
|
|
else {
|
|
|
Log.w(TAG, "[runCallServices.run()] ############### This wallpad is set as a main-wallpad ###############");
|
|
|
// SIP/Subphone 서비스 실행
|
|
|
- Intent SIPServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.CeresSIPService.StartService");
|
|
|
+ Intent SIPServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.SIPStun.StartService");
|
|
|
getApplicationContext().startService(SIPServiceLauncher);
|
|
|
|
|
|
Intent SubPhoneServiceLauncher = new Intent ("kr.co.icontrols.callengine.subphone.SubPhoneSerialManager.StartService");
|
|
@@ -4544,12 +4546,12 @@ public class MainActivity extends WpadActivity {
|
|
|
int nModelType = Version.getModelType();
|
|
|
if (nModelType == MODEL_TYPE.IHN_750) {
|
|
|
// SIP 서비스만 실행
|
|
|
- Intent sipServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.CeresSIPService.StartService");
|
|
|
+ Intent sipServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.SIPStun.StartService");
|
|
|
getApplicationContext().startService(sipServiceLauncher);
|
|
|
}
|
|
|
else {
|
|
|
// SIP/PSTN/Subphone 서비스 실행
|
|
|
- Intent sipServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.CeresSIPService.StartService");
|
|
|
+ Intent sipServiceLauncher = new Intent ("kr.co.icontrols.callengine.sip.SIPStun.StartService");
|
|
|
getApplicationContext().startService(sipServiceLauncher);
|
|
|
|
|
|
Intent PSTNServiceLauncher = new Intent ("kr.co.icontrols.callengine.pstn.PSTNSerialManager.StartService");
|
|
@@ -9674,6 +9676,15 @@ public class MainActivity extends WpadActivity {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public static void ReDirectCall(String ip)
|
|
|
+ {
|
|
|
+ Intent Intent = new Intent();
|
|
|
+ Intent.setAction("CERES_CALL");
|
|
|
+
|
|
|
+ Intent.putExtra("REMOTEINFO", ip);
|
|
|
+ mContext_call.sendBroadcast(Intent);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|
|
|
|