Skip to content

Commit 16e12f7

Browse files
mnpgmnpg
authored
Merge branch 'Jezza34000:beta' into beta
2 parents b54d217 + 777f2e3 commit 16e12f7

File tree

2 files changed

+41
-58
lines changed

2 files changed

+41
-58
lines changed

‎core/class/reolink.class.php‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -212,21 +212,6 @@ public static function updatePTZpreset($id, $data) {
212212
}
213213
}
214214

215-
public static function getRevertValue($id,$EqLId) {
216-
foreach (reolinkCmd::byEqLogicId($id) as $cmd) {
217-
$cmdLId = $cmd->getLogicalId();
218-
if ($cmd->getType() == "info" && $cmdLId == $EqLId) {
219-
$RVval = $cmd->getConfiguration('revertvalue');
220-
log::add('reolink', 'debug', 'cmdLId : ' . $cmdLId . ' -> revertvalue : ' . $RVval);
221-
}
222-
}
223-
if ($RVval != NULL) {
224-
return $RVval;
225-
} else {
226-
return false;
227-
}
228-
}
229-
230215
public static function refreshNFO($id) {
231216
$camcmd = reolink::byId($id, 'reolink');
232217
$camcnx = reolink::getReolinkConnection($id);
@@ -238,10 +223,7 @@ public static function refreshNFO($id) {
238223

239224
log::add('reolink', 'debug', 'Rafraichissement des informations de la caméra...');
240225

241-
$channel = $camcmd->getConfiguration('defined_channel');
242-
if ($channel == NULL) {
243-
$channel = 0;
244-
}
226+
$channel = $camcmd->getConfiguration('defined_channel', 0);
245227

246228
// Prepare request with INFO needed
247229
foreach (reolinkCmd::byEqLogicId($id) as $cmd) {
@@ -250,8 +232,7 @@ public static function refreshNFO($id) {
250232
$payload = str_replace('#CHANNEL#', $channel, $payload);
251233
$payload = str_replace('\\', '', $payload);
252234

253-
if (!in_array($payload, $cmdarr))
254-
{
235+
if (!in_array($payload, $cmdarr)){
255236
$cmdarr[] = $payload;
256237
}
257238
$cmd_block = array_chunk($cmdarr, config::byKey('cmdblock', __CLASS__, CMD_SEND_QTY));
@@ -478,8 +459,8 @@ public static function refreshNFO($id) {
478459
break;
479460

480461
case reolinkAPI::CAM_GET_MDALARM:
481-
$revert_value = reolink::getRevertValue($id,'SetMdDefaultSensitivityState');
482-
$mdsensdef = ($revert_value - ((int) $json_data['value']['MdAlarm']['newSens']['sensDef']));
462+
$revert_value = reolinkCmd::byEqLogicIdAndLogicalId($id,'SetMdDefaultSensitivityState')->getConfiguration('revertvalue', 0);
463+
$mdsensdef = $revert_value - $json_data['value']['MdAlarm']['newSens']['sensDef'];
483464
$camcmd->checkAndUpdateCmd('SetMdDefaultSensitivityState', $mdsensdef);
484465
break;
485466

‎core/config/reolinkapicmd.json‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,8 @@
622622
"subtype": "slider",
623623
"configuration": {
624624
"option": "slider",
625-
"minValue": "0",
626-
"maxValue" : "100",
625+
"minValue": 0,
626+
"maxValue" : 100,
627627
"valueFrom" : "SetWhitLedLuxState",
628628
"actionapi": "SetWhiteLed",
629629
"payload": "{\"WhiteLed\":{\"channel\":#CHANNEL#,\"bright\":#OPTSLIDER#}}"
@@ -854,10 +854,10 @@
854854
"subtype": "slider",
855855
"configuration": {
856856
"option": "slider",
857-
"minValue": "1",
858-
"maxValue" : "64",
859-
"setValue": "32",
860-
"speedvalue":"32"
857+
"minValue": 1,
858+
"maxValue" : 64,
859+
"setValue": 32,
860+
"speedvalue":32
861861
},
862862
"IsHistorized": 0,
863863
"isVisible": 1,
@@ -882,8 +882,8 @@
882882
"subtype": "slider",
883883
"configuration": {
884884
"option": "slider",
885-
"minValue": "0",
886-
"maxValue" : "249",
885+
"minValue": 0,
886+
"maxValue" : 249,
887887
"valueFrom" : "SetZoomState",
888888
"actionapi": "StartZoomFocus",
889889
"payload": "{\"ZoomFocus\":{\"channel\":#CHANNEL#,\"pos\":#OPTSLIDER#,\"op\":\"ZoomPos\"}}"
@@ -993,8 +993,8 @@
993993
"subtype": "slider",
994994
"configuration": {
995995
"option": "slider",
996-
"minValue": "0",
997-
"maxValue" : "100",
996+
"minValue": 0,
997+
"maxValue" : 100,
998998
"valueFrom" : "SetSirenVolumeState",
999999
"actionapi": "SetAudioCfg",
10001000
"payload": "{\"AudioCfg\":{\"channel\":#CHANNEL#,\"volume\":#OPTSLIDER#}}"
@@ -1250,8 +1250,8 @@
12501250
"subtype": "slider",
12511251
"configuration": {
12521252
"option": "slider",
1253-
"minValue": "1",
1254-
"maxValue" : "255",
1253+
"minValue": 1,
1254+
"maxValue" : 255,
12551255
"valueFrom" : "SetBrightState",
12561256
"actionapi": "SetImage",
12571257
"payload": "{\"Image\":{\"channel\":#CHANNEL#,\"bright\":#OPTSLIDER#}}"
@@ -1279,8 +1279,8 @@
12791279
"subtype": "slider",
12801280
"configuration": {
12811281
"option": "slider",
1282-
"minValue": "1",
1283-
"maxValue" : "255",
1282+
"minValue": 1,
1283+
"maxValue" : 255,
12841284
"valueFrom" : "SetContrastState",
12851285
"actionapi": "SetImage",
12861286
"payload": "{\"Image\":{\"channel\":#CHANNEL#,\"contrast\":#OPTSLIDER#}}"
@@ -1308,8 +1308,8 @@
13081308
"subtype": "slider",
13091309
"configuration": {
13101310
"option": "slider",
1311-
"minValue": "1",
1312-
"maxValue" : "255",
1311+
"minValue": 1,
1312+
"maxValue" : 255,,
13131313
"valueFrom" : "SetSaturationState",
13141314
"actionapi": "SetImage",
13151315
"payload": "{\"Image\":{\"channel\":#CHANNEL#,\"saturation\":#OPTSLIDER#}}"
@@ -1337,8 +1337,8 @@
13371337
"subtype": "slider",
13381338
"configuration": {
13391339
"option": "slider",
1340-
"minValue": "1",
1341-
"maxValue" : "255",
1340+
"minValue": 1,
1341+
"maxValue" : 255,
13421342
"valueFrom" : "SetHueState",
13431343
"actionapi": "SetImage",
13441344
"payload": "{\"Image\":{\"channel\":#CHANNEL#,\"hue\":#OPTSLIDER#}}"
@@ -1366,8 +1366,8 @@
13661366
"subtype": "slider",
13671367
"configuration": {
13681368
"option": "slider",
1369-
"minValue": "1",
1370-
"maxValue" : "255",
1369+
"minValue": 1,
1370+
"maxValue" : 255,
13711371
"valueFrom" : "SetSharpenState",
13721372
"actionapi": "SetImage",
13731373
"payload": "{\"Image\":{\"channel\":#CHANNEL#,\"sharpen\":#OPTSLIDER#}}"
@@ -1661,7 +1661,9 @@
16611661
"type": "info",
16621662
"subtype": "numeric",
16631663
"configuration": {
1664-
"revertvalue" : "51",
1664+
"revertvalue" : 51,
1665+
"minValue": 1,
1666+
"maxValue" : 50,
16651667
"payload": "{\"cmd\":\"GetMdAlarm\",\"action\":0,\"param\":{\"channel\":#CHANNEL#}}"
16661668
},
16671669
"IsHistorized": 0,
@@ -1675,15 +1677,15 @@
16751677
"subtype": "slider",
16761678
"configuration": {
16771679
"option": "slider",
1678-
"minValue": "1",
1679-
"maxValue" : "50",
1680-
"revertvalue" : "51",
1680+
"minValue": 1,
1681+
"maxValue" : 50,
1682+
"revertvalue" : 51,
16811683
"valueFrom" : "SetMdDefaultSensitivityState",
16821684
"actionapi": "SetMdAlarm",
16831685
"payload": "{\"MdAlarm\":{\"channel\":#CHANNEL#,\"newSens\":{\"sensDef\":#OPTR_SLIDER#},\"useNewSens\":1}}"
16841686
},
16851687
"IsHistorized": 0,
1686-
"isVisible": 1,
1688+
"isVisible": 0,
16871689
"logicalId": "SetMdDefaultSensitivity"
16881690
},
16891691
{
@@ -1707,8 +1709,8 @@
17071709
"subtype": "slider",
17081710
"configuration": {
17091711
"option": "slider",
1710-
"minValue": "0",
1711-
"maxValue" : "100",
1712+
"minValue": 0,
1713+
"maxValue" : 100,
17121714
"valueFrom" : "SetSdSensitivityPeopleState",
17131715
"actionapi": "SetAiAlarm",
17141716
"payload": "{\"AiAlarm\":{\"channel\":#CHANNEL#,\"sensitivity\":#OPTSLIDER#,\"ai_type\":\"people\"}}"
@@ -1738,8 +1740,8 @@
17381740
"subtype": "slider",
17391741
"configuration": {
17401742
"option": "slider",
1741-
"minValue": "0",
1742-
"maxValue" : "100",
1743+
"minValue": 0,
1744+
"maxValue" : 100,
17431745
"valueFrom" : "SetSdSensitivityVehicleState",
17441746
"actionapi": "SetAiAlarm",
17451747
"payload": "{\"AiAlarm\":{\"channel\":#CHANNEL#,\"sensitivity\":#OPTSLIDER#,\"ai_type\":\"vehicle\"}}"
@@ -1770,8 +1772,8 @@
17701772
"subtype": "slider",
17711773
"configuration": {
17721774
"option": "slider",
1773-
"minValue": "0",
1774-
"maxValue" : "8",
1775+
"minValue": 0,
1776+
"maxValue" : 8,
17751777
"valueFrom" : "SetAlarmDelayPeopleState",
17761778
"actionapi": "SetAiAlarm",
17771779
"payload": "{\"AiAlarm\":{\"channel\":#CHANNEL#,\"stay_time\":#OPTSLIDER#,\"ai_type\":\"people\"}}"
@@ -1802,8 +1804,8 @@
18021804
"subtype": "slider",
18031805
"configuration": {
18041806
"option": "slider",
1805-
"minValue": "0",
1806-
"maxValue" : "8",
1807+
"minValue": 0,
1808+
"maxValue" : 8,
18071809
"valueFrom" : "SetAlarmDelayVehicleState",
18081810
"actionapi": "SetAiAlarm",
18091811
"payload": "{\"AiAlarm\":{\"channel\":#CHANNEL#,\"stay_time\":#OPTSLIDER#,\"ai_type\":\"vehicle\"}}"
@@ -1906,8 +1908,8 @@
19061908
"subtype": "slider",
19071909
"configuration": {
19081910
"option": "slider",
1909-
"minValue": "10",
1910-
"maxValue" : "300",
1911+
"minValue": 10,
1912+
"maxValue" : 300,
19111913
"valueFrom" : "SetIntervalAutoReturnPtzGuardPointState",
19121914
"actionapi": "SetPtzGuard",
19131915
"payload": "{\"PtzGuard\":{\"benable\":1,\"channel\":#CHANNEL#,\"timeout\":#OPTSLIDER#,\"cmdStr\":\"setPos\"}}"

0 commit comments

Comments
 (0)