|
@@ -985,33 +985,81 @@ public class iMapServer extends Service {
|
|
case define.NOTIFY_SMART_DCAM_DETECT:
|
|
case define.NOTIFY_SMART_DCAM_DETECT:
|
|
// 스마트현관카메라 거동수상자 발생
|
|
// 스마트현관카메라 거동수상자 발생
|
|
// Toast.makeText(getApplicationContext(), "Front camera sensor: DETECTED!!", Toast.LENGTH_SHORT).show();
|
|
// Toast.makeText(getApplicationContext(), "Front camera sensor: DETECTED!!", Toast.LENGTH_SHORT).show();
|
|
- Log.i(TAG, "[mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
|
|
|
|
|
|
+ //jglee - 통화중일 경우
|
|
|
|
+ if(Common.bWallPadCallingLive || bBlockFrontCall)
|
|
|
|
+ {
|
|
|
|
+ //현관문일 경우만 return 함
|
|
|
|
+ Log.i(TAG, "[mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> bWallPadCallLive [" + bWallPadCallLive + "] return - BR_RECORD_DELAY");
|
|
|
|
+ Intent Newintent = new Intent();
|
|
|
|
+ Newintent.setAction(Common.BR_RECORD_DELAY);
|
|
|
|
+ getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+ Log.w(TAG, "jglee - StrangeRecord Delay by Call");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if(Common.bRecordDelay)
|
|
|
|
+ {
|
|
|
|
+ Log.w(TAG, "jglee - [NOTIFY_SMART_DCAM_DETECT] bRecordDelay is return ");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Log.i(TAG, "jglee - [mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
|
|
|
|
+ //Call앱이 실행되어 있지 않으면서, 현관호출이 아닌경우
|
|
if (!bWallPadCallLive && !bBlockFrontCall) {
|
|
if (!bWallPadCallLive && !bBlockFrontCall) {
|
|
if (getStrangerRecordingManagerSetting()) {
|
|
if (getStrangerRecordingManagerSetting()) {
|
|
if (getStrangerRecordingUserSetting()) {
|
|
if (getStrangerRecordingUserSetting()) {
|
|
Log.d(TAG, "[mWallPadNotifyBR] Send BR --> Common.BR_MAIN_NOTI.NOTICE_DETECT_STRANGER");
|
|
Log.d(TAG, "[mWallPadNotifyBR] Send BR --> Common.BR_MAIN_NOTI.NOTICE_DETECT_STRANGER");
|
|
|
|
+ //거동 수상자 감지 또는 딜레인 경우 처리
|
|
|
|
+ if(Common.bRecordStatus && !bWallPadCallLive)
|
|
|
|
+ {
|
|
|
|
+ Common.bRecordStatus = false;
|
|
|
|
+ Log.w(TAG, "jglee - [mWallPadNotifyBR] Stranger recording Status Error is Status -> false");
|
|
|
|
+ }
|
|
|
|
+ if(Common.bRecordDelay || Common.bRecordStatus)
|
|
|
|
+ {
|
|
|
|
+ Log.w(TAG, "jglee - [mWallPadNotifyBR] Stranger recording is return ");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //거동 수상자 신호가 이중으로 빨리 오는 경우에 대한 처리가 필요
|
|
|
|
+ Log.d(TAG, "Strange Recording Start - BR_RECORD_DELAY");
|
|
|
|
+ Intent DelayIntent = new Intent();
|
|
|
|
+ DelayIntent.setAction(Common.BR_RECORD_DELAY);
|
|
|
|
+ getApplicationContext().sendBroadcast(DelayIntent);
|
|
|
|
+ Log.w(TAG, "jglee - Strange Record Start so Delay Start");
|
|
|
|
+
|
|
Intent Newintent = new Intent();
|
|
Intent Newintent = new Intent();
|
|
Newintent.setAction(Common.BR_MAIN_NOTI.ACNAME_MAIN_NOTI);
|
|
Newintent.setAction(Common.BR_MAIN_NOTI.ACNAME_MAIN_NOTI);
|
|
Newintent.putExtra(Common.BR_MAIN_NOTI.KIND, BR_MAIN_NOTI.NOTICE_DETECT_STRANGER);
|
|
Newintent.putExtra(Common.BR_MAIN_NOTI.KIND, BR_MAIN_NOTI.NOTICE_DETECT_STRANGER);
|
|
Newintent.putExtra("DOORCAM_TYPE", getSmartDoorCamType());
|
|
Newintent.putExtra("DOORCAM_TYPE", getSmartDoorCamType());
|
|
getApplicationContext().sendBroadcast(Newintent);
|
|
getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+ Log.d(TAG, "Strange Recording Start");
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_OFF);
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_OFF);
|
|
- Log.w(TAG, "[mWallPadNotifyBR] Stranger recording setting is disabled by user!! ");
|
|
|
|
|
|
+ Log.w(TAG, "jglee - [mWallPadNotifyBR] Stranger recording setting is disabled by user!! ");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_OFF);
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_AUTO_OFF);
|
|
- Log.w(TAG, "[mWallPadNotifyBR] Stranger recording setting is disabled by manager!!");
|
|
|
|
|
|
+ Log.w(TAG, "jglee - [mWallPadNotifyBR] Stranger recording setting is disabled by manager!!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_OFF);
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_OFF);
|
|
- Log.w(TAG, "[mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> Call Blocked!!");
|
|
|
|
|
|
+ //MOIP 통화 중, 거동 수상자 신호가 들어오는 경우 중복 신호 방지
|
|
|
|
+ //MOIP 통화 중, 거동 수상자 신호 입력에 대해서는 Call 내부에서 처리됨
|
|
|
|
+ if(Common.bWallPadCallLive)
|
|
|
|
+ {
|
|
|
|
+ Log.w(TAG, "jglee - StrangeRecord Delay by Call - BR_RECORD_DELAY");
|
|
|
|
+ Intent Newintent = new Intent();
|
|
|
|
+ Newintent.setAction(Common.BR_RECORD_DELAY);
|
|
|
|
+ getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+ }
|
|
|
|
+ Log.w(TAG, "jglee - [mWallPadNotifyBR] define.NOTIFY_SMART_DCAM_DETECT -> Call Blocked!!");
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -2342,12 +2390,92 @@ public class iMapServer extends Service {
|
|
// 현관 도어폰 벨 눌림 입력 상태
|
|
// 현관 도어폰 벨 눌림 입력 상태
|
|
// Jeff added below codes for call app (2018.01.25)
|
|
// Jeff added below codes for call app (2018.01.25)
|
|
Log.i(TAG, "[WallPadInterface.BTN_DOOR] bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
|
|
Log.i(TAG, "[WallPadInterface.BTN_DOOR] bWallPadCallLive [" + bWallPadCallLive + "], bBlockFrontCall [" + bBlockFrontCall + "]");
|
|
|
|
+
|
|
if (!bWallPadCallLive && !bBlockFrontCall) {
|
|
if (!bWallPadCallLive && !bBlockFrontCall) {
|
|
|
|
+ try {
|
|
|
|
+ Log.w(TAG, "[WallPadInterface.BTN_DOOR] New Call App!!!");
|
|
|
|
+
|
|
|
|
+ //여기서 확인
|
|
|
|
+// if(MainActivity.CallBrList == null)
|
|
|
|
+// MainActivity.CallBrList = new ArrayList<Intent>();
|
|
|
|
+// Intent brListIntent = new Intent();
|
|
|
|
+// brListIntent = intent;
|
|
|
|
+//
|
|
|
|
+// if(MainActivity.CallBrList.size() > 1)
|
|
|
|
+// {
|
|
|
|
+// if(MainActivity.CallBrList.get(0) != brListIntent)
|
|
|
|
+// {
|
|
|
|
+// MainActivity.CallBrList.add(brListIntent);
|
|
|
|
+// Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size() + "현관 딩동");
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// else {
|
|
|
|
+// MainActivity.CallBrList.add(brListIntent);
|
|
|
|
+// Log.d(TAG, "jglee - Call 인텐트 추가 > size : " + MainActivity.CallBrList.size() + "현관 딩동");
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// //여기서 BrList에 남아 있는 갯수를 확인
|
|
|
|
+// if(MainActivity.CallBrList!=null && MainActivity.CallBrList.size() > 1)
|
|
|
|
+// {
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+ Log.d(TAG, "jglee - Call Front");
|
|
|
|
+
|
|
|
|
+ bBlockFrontCall = true;
|
|
|
|
+ handlerCallCtrl.removeMessages(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL);
|
|
|
|
+ handlerCallCtrl.sendEmptyMessageDelayed(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL, 3000);
|
|
|
|
+ mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
|
|
|
|
+
|
|
|
|
+ if (ModelType == MODEL_TYPE.IHN_1020GL) {
|
|
|
|
+ mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
|
|
|
|
+ mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.BELL_CONT, true);
|
|
|
|
+ }
|
|
|
|
+ else if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I
|
|
|
|
+ || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|
+ || Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I
|
|
|
|
+ || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_2443 || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I_6410
|
|
|
|
+ || Version.getModelType() == MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
|
+ mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.DOOR_POWER, true);
|
|
|
|
+ mIGW300.ctrlDeviceIO(IGW300API.OUTPUT.BELL_CONT, true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!Version.getGatewayUsage()) {
|
|
|
|
+ mDingDongHandler.sendEmptyMessage(0); // 띵똥
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Log.w(TAG, "jglee - 띵동 수신 거동수상자 딜레이 - BR_RECORD_DELAY");
|
|
|
|
+ Intent Newintent = new Intent();
|
|
|
|
+ Newintent.setAction(Common.BR_RECORD_DELAY);
|
|
|
|
+ getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus);
|
|
|
|
+ } catch (RuntimeException re) {
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+ }
|
|
|
|
+ catch (Exception e) {
|
|
|
|
+ Log.e(TAG, "[Exception] onReceive().BTN_DOOR");
|
|
|
|
+ //e.printStackTrace();
|
|
|
|
+ LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else if(Common.bRecordStatus)
|
|
|
|
+ {
|
|
|
|
+ //여기서 거동 수상자 확인이 필요함
|
|
|
|
+ //녹화 여부 확인 후, 거동 수상자 녹화 중지 BR을 전송
|
|
|
|
+ // 거동수상자 녹화 중 현관 띵똥 눌리는 경우 BR 전송 (녹화 여부 판별 위해)
|
|
|
|
+ Log.d(TAG, "[WallPadInterface.BTN_DOOR] Now Stranger Recording!!! bRecordStatus [" + Common.bRecordStatus + "]");
|
|
|
|
+
|
|
bBlockFrontCall = true;
|
|
bBlockFrontCall = true;
|
|
handlerCallCtrl.removeMessages(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL);
|
|
handlerCallCtrl.removeMessages(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL);
|
|
handlerCallCtrl.sendEmptyMessageDelayed(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL, 3000);
|
|
handlerCallCtrl.sendEmptyMessageDelayed(CALLCTRLHANDLERMSG.RELEASE_BLOCK_FRONTCALL, 3000);
|
|
mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
|
|
mWallPadAPI.SetDevService_DoorCamUseOnOff(true);
|
|
|
|
|
|
|
|
+ // yjyoon. 녹화 중지 브로드캐스트
|
|
|
|
+ Intent iIntent = new Intent();
|
|
|
|
+ iIntent.setAction(Common.BR_RECORD_STOP);
|
|
|
|
+ getApplicationContext().sendBroadcast(iIntent);
|
|
|
|
+
|
|
try {
|
|
try {
|
|
if (ModelType == MODEL_TYPE.IHN_1020GL) {
|
|
if (ModelType == MODEL_TYPE.IHN_1020GL) {
|
|
mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
|
|
mIGW200.ctrlDeviceIO(IGW200dAPI.OUTPUT.DOOR_POWER, true);
|
|
@@ -2366,8 +2494,27 @@ public class iMapServer extends Service {
|
|
mDingDongHandler.sendEmptyMessage(0); // 띵똥
|
|
mDingDongHandler.sendEmptyMessage(0); // 띵똥
|
|
}
|
|
}
|
|
|
|
|
|
- Log.w(TAG, "[WallPadInterface.BTN_DOOR] New Call App!!!");
|
|
|
|
- runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus);
|
|
|
|
|
|
+ // yjyoon. 현재 Call 앱이 켜진 상태.
|
|
|
|
+ // WallPadCall > MainActivity > onCreate() 에서 generateCallEvent()를 통해 콜 이벤트를 생성.
|
|
|
|
+ if (false) {
|
|
|
|
+ // yjyoon. 기존 소스코드. 주석처리
|
|
|
|
+ Log.w(TAG, "[WallPadInterface.BTN_DOOR] New Call App!!!");
|
|
|
|
+ runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus);
|
|
|
|
+ } else {
|
|
|
|
+ // yjyoon.
|
|
|
|
+ // 현관 콜 이벤트 생성 및 전송. runCallMainActivity(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT, AlarmStatus) 참조
|
|
|
|
+ sendLCDBacklightStatus(true);
|
|
|
|
+
|
|
|
|
+ Intent mIntent = new Intent();
|
|
|
|
+ mIntent.setAction(define.NOTIFY_ACNAME);
|
|
|
|
+ mIntent.putExtra(define.NOTIBR_KIND, 9999); // yjyoon. 임시로 9999로 설정.
|
|
|
|
+ mIntent.putExtra(CALLTRIGGER.CALLOWNER, CALLOWNER.NONE.toString());
|
|
|
|
+ mIntent.putExtra(CALLTRIGGER.CALLEVENTTYPE, CALLEVENTTYPE.RECEIVE_CALL.toString());
|
|
|
|
+ mIntent.putExtra(CALLTRIGGER.CALLTYPE, CALLTYPE.FRONT.toString());
|
|
|
|
+
|
|
|
|
+ getApplicationContext().sendBroadcast(mIntent);
|
|
|
|
+ playFrontBell(CALLOWNER.NONE, CALLEVENTTYPE.RECEIVE_CALL, CALLTYPE.FRONT);
|
|
|
|
+ }
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
}
|
|
}
|
|
@@ -2919,6 +3066,21 @@ public class iMapServer extends Service {
|
|
|
|
|
|
checkDoorCamConfig(); // 현관카메라 설정정보 확인
|
|
checkDoorCamConfig(); // 현관카메라 설정정보 확인
|
|
|
|
|
|
|
|
+ //여기서 감지시간을 3초로 초기화 jglee
|
|
|
|
+ try
|
|
|
|
+ {
|
|
|
|
+ if (getStrangerRecordingManagerSetting()) {
|
|
|
|
+ if (mSmartKeyRfDoorAPI != null) {
|
|
|
|
+ mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte) 0x01);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ catch (Exception e)
|
|
|
|
+ {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
getAirQualityUsage();
|
|
getAirQualityUsage();
|
|
|
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020SA_A) {
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020SA_A) {
|
|
@@ -14878,6 +15040,13 @@ public class iMapServer extends Service {
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_OFF);
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_OFF);
|
|
ctrlSmartIOTCamLEDMode(Common.SmartRFCamLEDMode.LED_OFF);
|
|
|
|
|
|
|
|
+ if (getStrangerRecordingManagerSetting()) {
|
|
|
|
+ if (mSmartKeyRfDoorAPI != null) {
|
|
|
|
+ mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte) 0x01);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
if (getStrangerRecordingManagerSetting() && getStrangerRecordingUserSetting()) {
|
|
if (getStrangerRecordingManagerSetting() && getStrangerRecordingUserSetting()) {
|
|
// 설정값을 확인하여 스마트 IoT 현관카메라의 상태를 전송한다. (거동수상자 녹화를 위한 자동 On 기능 활성화)
|
|
// 설정값을 확인하여 스마트 IoT 현관카메라의 상태를 전송한다. (거동수상자 녹화를 위한 자동 On 기능 활성화)
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
|
|
ctrlSmartIOTCamStatusMode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
|
|
@@ -15523,6 +15692,7 @@ public class iMapServer extends Service {
|
|
int MAX_WALLPADCALL_LIVE_CNT = 2;
|
|
int MAX_WALLPADCALL_LIVE_CNT = 2;
|
|
int nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT; // MAX_WALLPADCALL_LIVE_CNT회 이상 응답이 없으면 WallPadCall이 종료된것으로 판단한다.
|
|
int nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT; // MAX_WALLPADCALL_LIVE_CNT회 이상 응답이 없으면 WallPadCall이 종료된것으로 판단한다.
|
|
public static boolean bWallPadCallLive = false; // WallPadCall의 Live 상태를 나타낸다.
|
|
public static boolean bWallPadCallLive = false; // WallPadCall의 Live 상태를 나타낸다.
|
|
|
|
+ public static boolean bWallPadRecoder = false; // WallPadCall의 Live 상태를 나타낸다.
|
|
int nWallPadCallPID = 0; // WallPadCall을 강제 종료하기 위한 PID (WallPadCall로부터 BR로 수신한다.)
|
|
int nWallPadCallPID = 0; // WallPadCall을 강제 종료하기 위한 PID (WallPadCall로부터 BR로 수신한다.)
|
|
Handler handlerCheckWallPadCallLive = new Handler() {
|
|
Handler handlerCheckWallPadCallLive = new Handler() {
|
|
public void handleMessage(Message msg) {
|
|
public void handleMessage(Message msg) {
|
|
@@ -15544,7 +15714,10 @@ public class iMapServer extends Service {
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
bWallPadCallLive = false;
|
|
bWallPadCallLive = false;
|
|
|
|
+ bWallPadRecoder = false;
|
|
Common.bWallPadCallLive = bWallPadCallLive;
|
|
Common.bWallPadCallLive = bWallPadCallLive;
|
|
|
|
+ //jglee - 변수 초기화
|
|
|
|
+ Common.bWallPadCallingLive = false;
|
|
}
|
|
}
|
|
|
|
|
|
if (bWallPadCallLive != getCallAppRunning()) {
|
|
if (bWallPadCallLive != getCallAppRunning()) {
|
|
@@ -15571,8 +15744,52 @@ public class iMapServer extends Service {
|
|
if (strActionName.equals(Common.BR_ACK_WALLPADCALL_LIVE)) {
|
|
if (strActionName.equals(Common.BR_ACK_WALLPADCALL_LIVE)) {
|
|
bWallPadCallLive = true;
|
|
bWallPadCallLive = true;
|
|
Common.bWallPadCallLive = bWallPadCallLive;
|
|
Common.bWallPadCallLive = bWallPadCallLive;
|
|
|
|
+ //여기서 삭제
|
|
|
|
+// if(MainActivity.CallBrList.size()>0) {
|
|
|
|
+// Log.d(TAG, "jglee - CallBR Remove");
|
|
|
|
+// MainActivity.CallBrList.remove(0);
|
|
|
|
+// if(MainActivity.CallBrList.size() > 0) {
|
|
|
|
+// //Log.d(TAG, "jglee - Call Next 호출 > Action : " + MainActivity.CallBrList.get(0).getAction() + ", Extra : " + MainActivity.CallBrList.get(0).getIntExtra(Common.BR_MAIN_NOTI.KIND,0) );
|
|
|
|
+// //jglee - 내부 이슈가 수정이 되지 않으면, 아래 핸들러를 이용하여 사용 필요
|
|
|
|
+// if(false)
|
|
|
|
+// {
|
|
|
|
+// if(MainActivity.CallIntentHandler!=null)
|
|
|
|
+// MainActivity.CallIntentHandler.sendMessageDelayed(MainActivity.CallIntentHandler.obtainMessage(), 1500);
|
|
|
|
+// }
|
|
|
|
+// else
|
|
|
|
+// {
|
|
|
|
+// getApplicationContext().sendBroadcast(MainActivity.CallBrList.get(0));
|
|
|
|
+// Log.d(TAG, "jglee - Call 직접 Next 호출");
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+// }
|
|
nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT;
|
|
nWallPadCallACKCnt = MAX_WALLPADCALL_LIVE_CNT;
|
|
Log.w(TAG,"[WallPadCallLiveBRCheck] bWallPadCallLive [" + bWallPadCallLive + "]");
|
|
Log.w(TAG,"[WallPadCallLiveBRCheck] bWallPadCallLive [" + bWallPadCallLive + "]");
|
|
|
|
+
|
|
|
|
+ //jglee 여기서 Extra변수값을 적용
|
|
|
|
+ boolean isCalling = false;
|
|
|
|
+ isCalling = intent.getBooleanExtra("isCalling", false);
|
|
|
|
+
|
|
|
|
+ if(Common.bWallPadCallingLive != isCalling)
|
|
|
|
+ {
|
|
|
|
+ if(isCalling)
|
|
|
|
+ {
|
|
|
|
+ //현관문사용일 경우
|
|
|
|
+ Intent Newintent = new Intent();
|
|
|
|
+ Newintent.setAction(Common.BR_RECORD_NOT_USE);
|
|
|
|
+ getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ //현관문 사용안하는 경우
|
|
|
|
+ Intent Newintent = new Intent();
|
|
|
|
+ Newintent.setAction(Common.BR_RECORD_DELAY);
|
|
|
|
+ getApplicationContext().sendBroadcast(Newintent);
|
|
|
|
+ Log.w(TAG, "[WallPadCallLiveBRCheck] BR_RECORD_DELAY");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ Common.bWallPadCallingLive = isCalling;
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
Log.w(TAG,"[WallPadCallLiveBRCheck] Not supported strActionName [" + strActionName + "]");
|
|
Log.w(TAG,"[WallPadCallLiveBRCheck] Not supported strActionName [" + strActionName + "]");
|