Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ipcamera] Add new channels for Dahua API-based doorphones #13313

Merged
merged 13 commits into from
Oct 26, 2024
Merged

[ipcamera] Add new channels for Dahua API-based doorphones #13313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
434ea01
Made all changes requested by codeowner, added additional useful chan…
mesetka Dec 3, 2022
8457e36
Merge branch 'openhab:main' into main
mesetka Dec 3, 2022
9b9e125
Merge branch 'main' into main
mesetka Dec 11, 2022
411b653
Update bundles/org.openhab.binding.ipcamera/src/main/resources/OH-INF…
mesetka Mar 22, 2023
4b1b20c
Merge remote-tracking branch 'upstream/main' into pr/13313
lsiepel Aug 23, 2024
4beabc5
Spotless after merge
lsiepel Aug 23, 2024
57cb162
Add thing upgrade instructions
lsiepel Aug 23, 2024
bb1b008
Merge branch 'main' into pr/mesetka/13313
lsiepel Sep 29, 2024
8448437
Merge branch 'main' into pr/mesetka/13313
lsiepel Oct 6, 2024
66022db
Merge branch 'main' into pr/mesetka/13313
lsiepel Oct 17, 2024
0ad36e8
Review comments
lsiepel Oct 21, 2024
9a84c9f
Adapt to OpenClosedType
lsiepel Oct 26, 2024
d637f7c
Review comment.
lsiepel Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 76 additions & 68 deletions bundles/org.openhab.binding.ipcamera/README.md
View file
Open in desktop

Large diffs are not rendered by default.

172 changes: 163 additions & 9 deletions ...ab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/DahuaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,41 @@
*/
package org.openhab.binding.ipcamera.internal;

import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.*;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ACCEPTED_CARD_NUMBER;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ACTIVATE_ALARM_OUTPUT;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ACTIVATE_ALARM_OUTPUT2;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_AUTO_LED;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_AUTO_WHITE_LED;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_CAR_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_DOOR_CONTACT;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_DOOR_UNLOCK;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ENABLE_AUDIO_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ENABLE_LED;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ENABLE_LINE_CROSSING_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ENABLE_MOTION_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ENABLE_PRIVACY_MODE;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_EXIT_BUTTON;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_EXIT_BUTTON_ENABLED;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_EXTERNAL_ALARM_INPUT;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_EXTERNAL_ALARM_INPUT2;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_FACE_DETECTED;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_FIELD_DETECTION_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_HUMAN_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ITEM_LEFT;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_ITEM_TAKEN;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_LAST_EVENT_DATA;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_LINE_CROSSING_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_MAGNETIC_LOCK_WARNING;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_MOTION_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_MOTION_DETECTION_LEVEL;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_PARKING_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_SCENE_CHANGE_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_TEXT_OVERLAY;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_THRESHOLD_AUDIO_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_TOO_BLURRY_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_TOO_DARK_ALARM;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_UNACCEPTED_CARD_NUMBER;
import static org.openhab.binding.ipcamera.internal.IpCameraBindingConstants.CHANNEL_WHITE_LED;

import java.util.List;
import java.util.regex.Pattern;
Expand All @@ -23,6 +57,7 @@
import org.openhab.binding.ipcamera.internal.onvif.OnvifConnection.RequestType;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.OpenClosedType;
import org.openhab.core.library.types.PercentType;
import org.openhab.core.library.types.StringType;
import org.openhab.core.thing.ChannelUID;
Expand Down Expand Up @@ -172,18 +207,87 @@ private void processEvent(String content) {
ipCameraHandler.setChannelState(CHANNEL_TOO_BLURRY_ALARM, OnOffType.OFF);
}
break;
case "AccessControl":
if ("Pulse".equals(action)) {
if (content.contains("\"Method\" : 1")) {
if (content.contains("\"ErrorCode\" : 0")) {
startIndex = content.indexOf("CardNo", startIndex) + 11;
if (startIndex > 0) {
endIndex = content.indexOf(",", startIndex) - 1;
String cardNo = content.substring(startIndex, endIndex);
ipCameraHandler.setChannelState(CHANNEL_ACCEPTED_CARD_NUMBER, new StringType(cardNo));
ipCameraHandler.setChannelState(CHANNEL_DOOR_UNLOCK, OnOffType.ON);
}
}
} else if (content.contains("\"Method\" : 5")) {
ipCameraHandler.setChannelState(CHANNEL_DOOR_UNLOCK, OnOffType.ON);
ipCameraHandler.logger.debug("Door opened from button");
} else if (content.contains("\"Method\" : 4")) {
ipCameraHandler.setChannelState(CHANNEL_DOOR_UNLOCK, OnOffType.ON);
ipCameraHandler.logger.debug("Door opened remotely");
}
} else {
ipCameraHandler.logger.debug("Unrecognised Access control Dahua event, content={}", content);
}
break;
case "DoorCard":
if ("Pulse".equals(action)) {
if (content.contains("\"Number\"")) {
startIndex = content.indexOf("Number", startIndex) + 11;
if (startIndex > 0) {
endIndex = content.indexOf(",", startIndex) - 1;
String cardNo = content.substring(startIndex, endIndex);
ipCameraHandler.setChannelState(CHANNEL_UNACCEPTED_CARD_NUMBER, new StringType(cardNo));
}
}
} else {
ipCameraHandler.logger.debug("Unrecognised Access control Dahua event, content={}", content);
}
break;
case "ProfileAlarmTransmit":
if ("Start".equals(action)) {
if (content.contains("DoorMagnetism")) {
ipCameraHandler.setChannelState(CHANNEL_MAGNETIC_LOCK_WARNING, OnOffType.ON);
lsiepel marked this conversation as resolved.
Show resolved Hide resolved
}
} else if ("Stop".equals(action)) {
if (content.contains("DoorMagnetism")) {
ipCameraHandler.setChannelState(CHANNEL_MAGNETIC_LOCK_WARNING, OnOffType.OFF);
lsiepel marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
ipCameraHandler.logger.debug("Unrecognised Alarm Dahua event, content={}", content);
}
break;
case "DoorStatus":
if ("Pulse".equals(action)) {
if (content.contains("\"Relay\" : true")) {
ipCameraHandler.setChannelState(CHANNEL_DOOR_UNLOCK, OnOffType.OFF);
} else if (content.contains("\"Status\" : \"Close\"")) {
ipCameraHandler.setChannelState(CHANNEL_DOOR_CONTACT, OpenClosedType.CLOSED);
} else if (content.contains("\"Status\" : \"Open\"")) {
ipCameraHandler.setChannelState(CHANNEL_DOOR_CONTACT, OpenClosedType.OPEN);
} else {
ipCameraHandler.logger.debug("Unrecognised Door status Dahua event, content={}", content);
}
}
break;
case "AlarmLocal":
if ("Start".equals(action)) {
if (content.contains("index=0")) {
ipCameraHandler.setChannelState(CHANNEL_EXTERNAL_ALARM_INPUT, OnOffType.ON);
} else if (content.contains("index=3")) {
ipCameraHandler.setChannelState(CHANNEL_EXIT_BUTTON, OnOffType.ON);
} else {
ipCameraHandler.setChannelState(CHANNEL_EXTERNAL_ALARM_INPUT2, OnOffType.ON);
ipCameraHandler.logger.trace("External alarm Dahua event, content={}", content);
}
} else if ("Stop".equals(action)) {
if (content.contains("index=0")) {
ipCameraHandler.setChannelState(CHANNEL_EXTERNAL_ALARM_INPUT, OnOffType.OFF);
} else if (content.contains("index=3")) {
ipCameraHandler.setChannelState(CHANNEL_EXIT_BUTTON, OnOffType.OFF);
} else {
ipCameraHandler.setChannelState(CHANNEL_EXTERNAL_ALARM_INPUT2, OnOffType.OFF);
ipCameraHandler.logger.trace("External alarm Dahua event, content={}", content);
}
}
break;
Expand All @@ -209,6 +313,7 @@ private void processEvent(String content) {
case "LeFunctionStatusSync":
case "RecordDelete":
case "InterVideoAccess":
case "SIPRegisterResult":
break;
default:
ipCameraHandler.logger.debug("Unrecognised Dahua event, Code={}, action={}", code, action);
Expand All @@ -223,6 +328,12 @@ private void processSettings(String content) {
ipCameraHandler.setChannelState(CHANNEL_ENABLE_MOTION_ALARM, OnOffType.OFF);
}

// Handle MotionDetectLevel alarm
if (content.contains("table.MotionDetect[0].Level=")) {
String value = ipCameraHandler.returnValueFromString(content, "table.MotionDetect[0].Level=");
ipCameraHandler.setChannelState(CHANNEL_MOTION_DETECTION_LEVEL, DecimalType.valueOf(value));
}

// determine if the audio alarm is turned on or off.
if (content.contains("table.AudioDetect[" + nvrChannelAdjusted + "].MutationDetect=true")) {
ipCameraHandler.setChannelState(CHANNEL_ENABLE_AUDIO_ALARM, OnOffType.ON);
Expand All @@ -249,6 +360,13 @@ private void processSettings(String content) {
} else if (content.contains("table.LeLensMask[" + nvrChannelAdjusted + "].Enable=false")) {
ipCameraHandler.setChannelState(CHANNEL_ENABLE_PRIVACY_MODE, OnOffType.OFF);
}

// determine if exit button is enabled
if (content.contains("table.AccessControlGeneral.ButtonExitEnable=true")) {
ipCameraHandler.setChannelState(CHANNEL_ENABLE_PRIVACY_MODE, OnOffType.ON);
} else if (content.contains("table.AccessControlGeneral.ButtonExitEnable=false")) {
ipCameraHandler.setChannelState(CHANNEL_ENABLE_PRIVACY_MODE, OnOffType.OFF);
}
}

// This handles the incoming http replies back from the camera.
Expand Down Expand Up @@ -303,6 +421,14 @@ public void handleCommand(ChannelUID channelUID, Command command) {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=getConfig&name=Lighting_V2["
+ nvrChannelAdjusted + "][0][1].Mode");
return;
case CHANNEL_MOTION_DETECTION_LEVEL:
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=getConfig&name=MotionDetect["
+ nvrChannelAdjusted + "]");
return;
case CHANNEL_EXIT_BUTTON_ENABLED:
ipCameraHandler
.sendHttpGET("/cgi-bin/configManager.cgi?action=getConfig&name=AccessControlGeneral");
return;
}
return;
} // end of "REFRESH"
Expand Down Expand Up @@ -369,14 +495,14 @@ public void handleCommand(ChannelUID channelUID, Command command) {
}
return;
case CHANNEL_THRESHOLD_AUDIO_ALARM:
int threshold = Math.round(Float.valueOf(command.toString()));

if (threshold == 0) {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=setConfig&AudioDetect["
+ nvrChannelAdjusted + "].MutationThreold=1");
} else {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=setConfig&AudioDetect["
+ nvrChannelAdjusted + "].MutationThreold=" + threshold);
if (command instanceof PercentType percentCommand) {
if (PercentType.ZERO.equals(command)) {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=setConfig&AudioDetect["
+ nvrChannelAdjusted + "].MutationThreold=1");
} else {
ipCameraHandler.sendHttpGET("/cgi-bin/configManager.cgi?action=setConfig&AudioDetect["
+ nvrChannelAdjusted + "].MutationThreold=" + percentCommand.intValue());
}
}
return;
case CHANNEL_ENABLE_AUDIO_ALARM:
Expand Down Expand Up @@ -406,6 +532,19 @@ public void handleCommand(ChannelUID channelUID, Command command) {
+ nvrChannelAdjusted + "].Enable=false");
}
return;
case CHANNEL_MOTION_DETECTION_LEVEL:
if (command instanceof DecimalType decimalCommand) {
if (DecimalType.ZERO.equals(command)) {
ipCameraHandler.sendHttpGET(
"/cgi-bin/configManager.cgi?action=setConfig&MotionDetect[0].Enable=false&MotionDetect[0].Level="
+ decimalCommand.intValue());
} else {
ipCameraHandler.sendHttpGET(
"/cgi-bin/configManager.cgi?action=setConfig&MotionDetect[0].Enable=true&MotionDetect[0].EventHandler.Dejitter=1&MotionDetect[0].Level="
+ decimalCommand.intValue());
}
}
return;
case CHANNEL_ACTIVATE_ALARM_OUTPUT:
if (OnOffType.ON.equals(command)) {
ipCameraHandler.sendHttpGET(
Expand All @@ -431,6 +570,21 @@ public void handleCommand(ChannelUID channelUID, Command command) {
+ nvrChannelAdjusted + "].Enable=true");
}
return;
case CHANNEL_DOOR_UNLOCK:
if (OnOffType.ON.equals(command)) {
ipCameraHandler
.sendHttpGET("/cgi-bin/accessControl.cgi?action=openDoor&channel=1&UserID=101&Type=Remote");
}
return;
case CHANNEL_EXIT_BUTTON_ENABLED:
if (OnOffType.ON.equals(command)) {
ipCameraHandler.sendHttpGET(
"/cgi-bin/configManager.cgi?action=setConfig&AccessControlGeneral.ButtonExitEnable=true");
} else if (OnOffType.OFF.equals(command)) {
ipCameraHandler.sendHttpGET(
"/cgi-bin/configManager.cgi?action=setConfig&AccessControlGeneral.ButtonExitEnable=false");
}
return;
}
}

Expand Down
8 changes: 8 additions & 0 deletions ...pcamera/src/main/java/org/openhab/binding/ipcamera/internal/IpCameraBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,12 @@ public enum FFmpegFormat {
public static final String CHANNEL_ENABLE_PUSH = "enablePush";
public static final String CHANNEL_ENABLE_RECORDINGS = "enableRecordings";
public static final String CHANNEL_AUTO_TRACKING = "autoTracking";
public static final String CHANNEL_ACCEPTED_CARD_NUMBER = "acceptedCardNumber";
public static final String CHANNEL_UNACCEPTED_CARD_NUMBER = "unacceptedCardNumber";
public static final String CHANNEL_DOOR_UNLOCK = "doorUnlock";
public static final String CHANNEL_DOOR_CONTACT = "doorContact";
public static final String CHANNEL_EXIT_BUTTON = "exitButton";
public static final String CHANNEL_MOTION_DETECTION_LEVEL = "motionDetectionLevel";
public static final String CHANNEL_EXIT_BUTTON_ENABLED = "exitButtonEnabled";
public static final String CHANNEL_MAGNETIC_LOCK_WARNING = "magneticLockWarning";
}
Loading