|
@@ -73,7 +73,7 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
public final String TXT_SECOND = "초";
|
|
public final String TXT_SECOND = "초";
|
|
|
|
|
|
public final String TXT_TAKINGPIC_SETTING = "거동수상자 사진촬영 설정";
|
|
public final String TXT_TAKINGPIC_SETTING = "거동수상자 사진촬영 설정";
|
|
- public final String TXT_SENSOR_SENSITIVITY = "센서감도 설정";
|
|
|
|
|
|
+ //public final String TXT_SENSOR_SENSITIVITY = "센서감도 설정";
|
|
public final String TXT_SENSOR_PERIOD = "사진촬영 주기 설정";
|
|
public final String TXT_SENSOR_PERIOD = "사진촬영 주기 설정";
|
|
public final String TXT_CAM_BRIGHTNESS = "화면밝기 설정";
|
|
public final String TXT_CAM_BRIGHTNESS = "화면밝기 설정";
|
|
|
|
|
|
@@ -120,7 +120,7 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
|
|
|
|
title = new WpadTextView(context, false, 990, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._46, true, ID.POPUP.SMARTIOT_SETTING.ELEMENT.TEXT.TITLE);
|
|
title = new WpadTextView(context, false, 990, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._46, true, ID.POPUP.SMARTIOT_SETTING.ELEMENT.TEXT.TITLE);
|
|
ViewRegistration(layout, title, 0, 0);
|
|
ViewRegistration(layout, title, 0, 0);
|
|
- title.setText("스마트현관카메라 설정");
|
|
|
|
|
|
+ title.setText("현관카메라 설정");
|
|
|
|
|
|
DrawContents();
|
|
DrawContents();
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
@@ -157,10 +157,11 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
changeTakingPicSet(true);
|
|
changeTakingPicSet(true);
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.CHECK_NOTUSE) {
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.CHECK_NOTUSE) {
|
|
changeTakingPicSet(false);
|
|
changeTakingPicSet(false);
|
|
- } else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV1) {
|
|
|
|
- ChangeSensorSensitivity(false);
|
|
|
|
- } else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT1) {
|
|
|
|
- ChangeSensorSensitivity(true);
|
|
|
|
|
|
+ //jglee - 2022.08.24 민감도1로 무조건 고정
|
|
|
|
+// } else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV1) {
|
|
|
|
+// ChangeSensorSensitivity(false);
|
|
|
|
+// } else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT1) {
|
|
|
|
+// ChangeSensorSensitivity(true);
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV2) {
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV2) {
|
|
ChangeSensorPeriod(false);
|
|
ChangeSensorPeriod(false);
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT2) {
|
|
} else if (TargetId == ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT2) {
|
|
@@ -183,11 +184,12 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
Log.d(TAG, "[initInfo] mWallPadAPI.Check_Connect() SUCCESS!!");
|
|
Log.d(TAG, "[initInfo] mWallPadAPI.Check_Connect() SUCCESS!!");
|
|
smartKeyRfDoorAPI = mWallPadAPI.Get_SmartKeyRfDoorController();
|
|
smartKeyRfDoorAPI = mWallPadAPI.Get_SmartKeyRfDoorController();
|
|
|
|
|
|
|
|
+ //jglee - 2022.08.24 민감도1로 무조건 고정
|
|
// 항목 추가
|
|
// 항목 추가
|
|
- SetKind data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV1, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT1, TXT_SENSOR_SENSITIVITY);
|
|
|
|
- SettingData.add(data);
|
|
|
|
|
|
+// SetKind data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV1, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT1, TXT_SENSOR_SENSITIVITY);
|
|
|
|
+// SettingData.add(data);
|
|
|
|
|
|
- data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV2, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT2, TXT_SENSOR_PERIOD);
|
|
|
|
|
|
+ SetKind data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV2, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT2, TXT_SENSOR_PERIOD);
|
|
SettingData.add(data);
|
|
SettingData.add(data);
|
|
|
|
|
|
data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV3, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT3, TXT_CAM_BRIGHTNESS);
|
|
data = new SetKind(ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.PREV3, ID.POPUP.SMARTIOT_SETTING.ELEMENT.BUTTON.NEXT3, TXT_CAM_BRIGHTNESS);
|
|
@@ -362,9 +364,9 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
SettingData.get(j).SetViewIdx(arrayIdx);
|
|
SettingData.get(j).SetViewIdx(arrayIdx);
|
|
|
|
|
|
SetKind item = SettingData.get(j);
|
|
SetKind item = SettingData.get(j);
|
|
- if (item.mTitle.equals(TXT_SENSOR_SENSITIVITY)) {
|
|
|
|
- DrawSensorSensitivity(mCurrentSensitivity);
|
|
|
|
- }
|
|
|
|
|
|
+// if (item.mTitle.equals(TXT_SENSOR_SENSITIVITY)) {
|
|
|
|
+// DrawSensorSensitivity(mCurrentSensitivity);
|
|
|
|
+// }
|
|
if (item.mTitle.equals(TXT_SENSOR_PERIOD)) {
|
|
if (item.mTitle.equals(TXT_SENSOR_PERIOD)) {
|
|
DrawSensorPeriod(mCurrentSensorPeriod);
|
|
DrawSensorPeriod(mCurrentSensorPeriod);
|
|
}
|
|
}
|
|
@@ -569,26 +571,27 @@ public class SmartIOTCamSetting extends WpadScreen {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //jglee - 2022.08.24 민감도1로 무조건 고정
|
|
private void DrawSensorSensitivity(int val) {
|
|
private void DrawSensorSensitivity(int val) {
|
|
- try {
|
|
|
|
- int idx = getViewIdx(TXT_SENSOR_SENSITIVITY);
|
|
|
|
- if(textValue[idx]!=null)
|
|
|
|
- textValue[idx].setText(String.valueOf(val));
|
|
|
|
- if (val == MAX_SENSOR_SENSITIVITY) {
|
|
|
|
- if(btnNext[idx]!=null)btnNext[idx].setButtonRearImage();
|
|
|
|
- } else if (val == MIN_SENSOR_SENSITIVITY) {
|
|
|
|
- if(btnPrev[idx]!=null)btnPrev[idx].setButtonRearImage();
|
|
|
|
- } else {
|
|
|
|
- if(btnNext[idx]!=null)btnNext[idx].setButtonFrontImage();
|
|
|
|
- if(btnPrev[idx]!=null) btnPrev[idx].setButtonFrontImage();
|
|
|
|
- }
|
|
|
|
- } catch (RuntimeException re) {
|
|
|
|
- LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
- } catch (Exception e) {
|
|
|
|
- Log.e(TAG, "[Exception] DrawSensorSensitivity(int val)");
|
|
|
|
- //e.printStackTrace();
|
|
|
|
- LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
- }
|
|
|
|
|
|
+// try {
|
|
|
|
+// int idx = getViewIdx(TXT_SENSOR_SENSITIVITY);
|
|
|
|
+// if(textValue[idx]!=null)
|
|
|
|
+// textValue[idx].setText(String.valueOf(val));
|
|
|
|
+// if (val == MAX_SENSOR_SENSITIVITY) {
|
|
|
|
+// if(btnNext[idx]!=null)btnNext[idx].setButtonRearImage();
|
|
|
|
+// } else if (val == MIN_SENSOR_SENSITIVITY) {
|
|
|
|
+// if(btnPrev[idx]!=null)btnPrev[idx].setButtonRearImage();
|
|
|
|
+// } else {
|
|
|
|
+// if(btnNext[idx]!=null)btnNext[idx].setButtonFrontImage();
|
|
|
|
+// if(btnPrev[idx]!=null) btnPrev[idx].setButtonFrontImage();
|
|
|
|
+// }
|
|
|
|
+// } catch (RuntimeException re) {
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, re);
|
|
|
|
+// } catch (Exception e) {
|
|
|
|
+// Log.e(TAG, "[Exception] DrawSensorSensitivity(int val)");
|
|
|
|
+// //e.printStackTrace();
|
|
|
|
+// LogUtil.errorLogInfo("", TAG, e);
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
private void ChangeSensorPeriod(boolean Up) {
|
|
private void ChangeSensorPeriod(boolean Up) {
|