|
@@ -10187,7 +10187,7 @@ public class MainActivity extends WpadActivity {
|
|
//여기서 감지시간을 강제로 늘림
|
|
//여기서 감지시간을 강제로 늘림
|
|
if(mSmartKeyRfDoorAPI!=null)
|
|
if(mSmartKeyRfDoorAPI!=null)
|
|
{
|
|
{
|
|
- String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x10);
|
|
|
|
|
|
+ String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x240);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -10269,7 +10269,7 @@ public class MainActivity extends WpadActivity {
|
|
//여기서 감지시간을 강제로 늘림
|
|
//여기서 감지시간을 강제로 늘림
|
|
if(mSmartKeyRfDoorAPI!=null)
|
|
if(mSmartKeyRfDoorAPI!=null)
|
|
{
|
|
{
|
|
- String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x10);
|
|
|
|
|
|
+ String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x240);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -10311,23 +10311,28 @@ public class MainActivity extends WpadActivity {
|
|
public void handleMessage(Message msg) {
|
|
public void handleMessage(Message msg) {
|
|
Common.bRecordDelay = false;
|
|
Common.bRecordDelay = false;
|
|
|
|
|
|
- Log.d(TAG, "[recordDelayHandler] RecordDelay Init");
|
|
|
|
|
|
+ Log.d(TAG, "[recordDelayHandler] RecordDelay Init + CallingStatus : " +Common.bWallPadCallingLive);
|
|
|
|
|
|
if (cv_bStrangerVideoRecordUsage) {
|
|
if (cv_bStrangerVideoRecordUsage) {
|
|
if (cv_bStrangerUserVideoRecordUsage) {
|
|
if (cv_bStrangerUserVideoRecordUsage) {
|
|
|
|
|
|
- if (mSmartKeyRfDoorAPI != null) mSmartKeyRfDoorAPI.SetLEDmode(Common.SmartRFCamLEDMode.LED_AUTO_ON);
|
|
|
|
- else Log.w(TAG, "[recordDelayHandler] Status LED ON smartKeyRfDoorAPI is null!!");
|
|
|
|
|
|
+ if(!Common.bWallPadCallingLive)
|
|
|
|
+ {
|
|
|
|
+ if (mSmartKeyRfDoorAPI != null) mSmartKeyRfDoorAPI.SetLEDmode(Common.SmartRFCamLEDMode.LED_AUTO_ON);
|
|
|
|
+ else Log.w(TAG, "[recordDelayHandler] Status LED ON smartKeyRfDoorAPI is null!!");
|
|
|
|
|
|
- if (mSmartKeyRfDoorAPI != null) mSmartKeyRfDoorAPI.SetCAMERAmode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
|
|
|
|
- else Log.w(TAG, "[recordDelayHandler] Status Auto ON smartKeyRfDoorAPI is null!!");
|
|
|
|
|
|
+ if (mSmartKeyRfDoorAPI != null) mSmartKeyRfDoorAPI.SetCAMERAmode(Common.SmartRFCamStatusMode.STATUS_AUTO_ON);
|
|
|
|
+ else Log.w(TAG, "[recordDelayHandler] Status Auto ON smartKeyRfDoorAPI is null!!");
|
|
|
|
|
|
- //여기서 감지시간을 원래대로 복구
|
|
|
|
- if(mSmartKeyRfDoorAPI!=null)
|
|
|
|
- {
|
|
|
|
- String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x01);
|
|
|
|
- Log.i(TAG, "[recordDelayHandler SenSorConfig] - Test Setting result = " + ret);
|
|
|
|
|
|
+ //여기서 감지시간을 원래대로 복구
|
|
|
|
+ if(mSmartKeyRfDoorAPI!=null)
|
|
|
|
+ {
|
|
|
|
+ String ret = mSmartKeyRfDoorAPI.SetSensorConfig((byte) 0x05, (byte)0x01);
|
|
|
|
+ Log.i(TAG, "[recordDelayHandler SenSorConfig] - Test Setting result = " + ret);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -10346,7 +10351,7 @@ public class MainActivity extends WpadActivity {
|
|
filter.addAction(Common.BR_RECORD_STOP);
|
|
filter.addAction(Common.BR_RECORD_STOP);
|
|
filter.addAction(Common.BR_RECORD_DELAY);
|
|
filter.addAction(Common.BR_RECORD_DELAY);
|
|
filter.addAction(Common.BR_RECORD_NOT_USE);
|
|
filter.addAction(Common.BR_RECORD_NOT_USE);
|
|
- //filter.addAction(Common.BR_RECORD_USE);
|
|
|
|
|
|
+ filter.addAction(Common.BR_RECORD_DELAY_INIT);
|
|
mContext.registerReceiver(StrangeRecordBroadcastReceiver, filter);
|
|
mContext.registerReceiver(StrangeRecordBroadcastReceiver, filter);
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -10381,6 +10386,16 @@ public class MainActivity extends WpadActivity {
|
|
{
|
|
{
|
|
RecordNotUse(false);
|
|
RecordNotUse(false);
|
|
}
|
|
}
|
|
|
|
+ else if(intent.getAction().equals(Common.BR_RECORD_DELAY_INIT))
|
|
|
|
+ {
|
|
|
|
+ //jglee - 거동수상자 초기화
|
|
|
|
+ //시나리오에 따라 딜레이가 있는 경우, 딜레이가 완료 되고 해당 초기화 진행
|
|
|
|
+ //거동 수상자 설정(사용함)일 경우, 해당 BR 받음
|
|
|
|
+ Log.d(TAG, "Recrod Delay Init Config, RecordDelay Status :" + Common.bRecordDelay);
|
|
|
|
+ if(!Common.bRecordDelay)
|
|
|
|
+ RecordNotUse(true);
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|
|
};
|
|
};
|
|
}
|
|
}
|