|
@@ -581,7 +581,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
mCallInfo.setCallStatus(eCallType, CALLSTATUS.CALLING);
|
|
mCallInfo.setCallStatus(eCallType, CALLSTATUS.CALLING);
|
|
if (eCallOwner == CALLOWNER.MOBILE) {
|
|
if (eCallOwner == CALLOWNER.MOBILE) {
|
|
LOG("[CallScenarioManager] CALLOWNER [" + eCallOwner + "]");
|
|
LOG("[CallScenarioManager] CALLOWNER [" + eCallOwner + "]");
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.start();
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if(MainActivity.mDataSender !=null)
|
|
|
|
+ {
|
|
|
|
+ MainActivity.mDataSender.Init();
|
|
|
|
+ MainActivity.mDataSender.start();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
mCallEventListener.onCallEvent(eCallOwner, CALLSTATUS.CALLING, eCallType, strRemoteIP, strRemoteSIPID, strMessage);
|
|
mCallEventListener.onCallEvent(eCallOwner, CALLSTATUS.CALLING, eCallType, strRemoteIP, strRemoteSIPID, strMessage);
|
|
MainActivity.mSubPhoneController.sendACKFrontMonitoring(eCallOwner, eCallType);
|
|
MainActivity.mSubPhoneController.sendACKFrontMonitoring(eCallOwner, eCallType);
|
|
@@ -595,7 +600,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
else if (eCallType == CALLTYPE.RESIDENCE) {
|
|
else if (eCallType == CALLTYPE.RESIDENCE) {
|
|
if (eCallOwner == CALLOWNER.MOBILE) {
|
|
if (eCallOwner == CALLOWNER.MOBILE) {
|
|
((MainActivity) mContext).changeMenuNScreen(ID.MENU.MENU_TALKRESIDENCE);
|
|
((MainActivity) mContext).changeMenuNScreen(ID.MENU.MENU_TALKRESIDENCE);
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.start(); // 모바일에서 홈뷰어 요청하였을 때
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if(MainActivity.mDataSender !=null)
|
|
|
|
+ {
|
|
|
|
+ MainActivity.mDataSender.Init();
|
|
|
|
+ MainActivity.mDataSender.start();
|
|
|
|
+ }// 모바일에서 홈뷰어 요청하였을 때
|
|
|
|
|
|
if (mCallEventListener != null) {
|
|
if (mCallEventListener != null) {
|
|
mCallInfo.setCallStatus(eCallType, CALLSTATUS.HOMEVIEW);
|
|
mCallInfo.setCallStatus(eCallType, CALLSTATUS.HOMEVIEW);
|
|
@@ -702,7 +712,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.CALLED;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.CALLED;
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, RemoteCallMSG.REMOTE_CALLSTATUS);
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, RemoteCallMSG.REMOTE_CALLSTATUS);
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.start();
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if(MainActivity.mDataSender !=null)
|
|
|
|
+ {
|
|
|
|
+ MainActivity.mDataSender.Init();
|
|
|
|
+ MainActivity.mDataSender.start();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if (eCallType == CALLTYPE.LOBBY) {
|
|
else if (eCallType == CALLTYPE.LOBBY) {
|
|
@@ -712,7 +727,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.CALLED;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.CALLED;
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, RemoteCallMSG.REMOTE_CALLSTATUS);
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, RemoteCallMSG.REMOTE_CALLSTATUS);
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.start();
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if(MainActivity.mDataSender !=null)
|
|
|
|
+ {
|
|
|
|
+ MainActivity.mDataSender.Init();
|
|
|
|
+ MainActivity.mDataSender.start();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if (eCallType == CALLTYPE.GUARD) {
|
|
else if (eCallType == CALLTYPE.GUARD) {
|
|
@@ -720,7 +740,12 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
if (ConfigValues.bRemoteCall) {
|
|
if (ConfigValues.bRemoteCall) {
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
RemoteCallMSG.REMOTE_CALLTYPE = eCallType;
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, strRemoteSIPID, strRemoteIP);
|
|
MainActivity.mRemoteCallController.sendOpenRemoteCall(RemoteCallMSG.REMOTE_CALLTYPE, strRemoteSIPID, strRemoteIP);
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.start();
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if (MainActivity.mDataSender != null)
|
|
|
|
+ {
|
|
|
|
+ MainActivity.mDataSender.Init();
|
|
|
|
+ MainActivity.mDataSender.start();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if (eCallType == CALLTYPE.RESIDENCE) {
|
|
else if (eCallType == CALLTYPE.RESIDENCE) {
|
|
@@ -856,7 +881,11 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
if (RemoteCallMSG.REMOTE_CALLTYPE == CALLTYPE.LOBBY) {
|
|
if (RemoteCallMSG.REMOTE_CALLTYPE == CALLTYPE.LOBBY) {
|
|
if (mSIPInterface != null) mSIPInterface.videoSet(false, false, false); // 모바일에서 로비통화 종료시 영상 먼저 종료
|
|
if (mSIPInterface != null) mSIPInterface.videoSet(false, false, false); // 모바일에서 로비통화 종료시 영상 먼저 종료
|
|
}
|
|
}
|
|
- if (MainActivity.mDataSender != null) MainActivity.mDataSender.interrupt();
|
|
|
|
|
|
+ //jglee - 2023.02.02 데이터 초기화 후, 시작하는 것으로 수정
|
|
|
|
+ if (MainActivity.mDataSender != null) {
|
|
|
|
+ MainActivity.mDataSender.onClose();
|
|
|
|
+ MainActivity.mDataSender.interrupt();
|
|
|
|
+ }
|
|
RemoteCallMSG.REMOTE_CALLTYPE = CALLTYPE.NONE;
|
|
RemoteCallMSG.REMOTE_CALLTYPE = CALLTYPE.NONE;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.IDLE;
|
|
RemoteCallMSG.REMOTE_CALLSTATUS = CALLSTATUS.IDLE;
|
|
RemoteCallMSG.REMOTE_CALLOWNER = CALLOWNER.NONE;
|
|
RemoteCallMSG.REMOTE_CALLOWNER = CALLOWNER.NONE;
|
|
@@ -2844,6 +2873,10 @@ public class CallController extends CallManager implements SIPEventListener {
|
|
} finally {
|
|
} finally {
|
|
try {
|
|
try {
|
|
mFileOutputStream.close();
|
|
mFileOutputStream.close();
|
|
|
|
+ //여기서 비트맵 리소스 해제
|
|
|
|
+ //2023.04.21 jglee 메모리 해제
|
|
|
|
+ if(bitmap!=null) bitmap.recycle();
|
|
|
|
+ bitmap = null;
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
Log.e(TAG, "[IOException] saveBMPtoJPG(Bitmap bitmap, String strFilePath)");
|
|
Log.e(TAG, "[IOException] saveBMPtoJPG(Bitmap bitmap, String strFilePath)");
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|