From 316ce17b5c5af81770fec48e1e8dffff10fad08b Mon Sep 17 00:00:00 2001 From: skysilver Date: Wed, 22 Aug 2018 23:49:58 +0300 Subject: [PATCH] v.1.8.5-beta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Для Aqara AC Companion добавлен функционал чтения (обучения) IR-команд, отправки IR-команд (метрика ir_play), управления встроенным реле (метрика power), получения потребляемой мощности (метрика load_power). * Передача параметров *NEW_VALUE* и *OLD_VALUE* в привязанный метод. * Мелкие исправления. --- languages/xiaomimiio_default.php | 1 + languages/xiaomimiio_ru.php | 1 + languages/xiaomimiio_ua.php | 1 + modules/xiaomimiio/miio_devices_edit.inc.php | 65 +-- modules/xiaomimiio/xiaomimiio.class.php | 147 +++--- scripts/cycle_xiaomimiio.php | 6 +- templates/xiaomimiio/action_admin.html | 2 +- templates/xiaomimiio/img/aqara_ir_learn.png | Bin 0 -> 9260 bytes .../xiaomimiio/miio_devices_edit_default.html | 421 ++++++++++++------ 9 files changed, 407 insertions(+), 237 deletions(-) create mode 100644 templates/xiaomimiio/img/aqara_ir_learn.png diff --git a/languages/xiaomimiio_default.php b/languages/xiaomimiio_default.php index c78222b..7231837 100644 --- a/languages/xiaomimiio_default.php +++ b/languages/xiaomimiio_default.php @@ -43,6 +43,7 @@ 'XIMI_APP_TEACH1' => 'Learning IR code', 'XIMI_APP_TEACH2' => 'IR-code learning', 'XIMI_APP_TEACH_TEXT' => 'To read the IR code from the remote control, press the Start button, point the remote control towards Mi IR Remote 360 and press the button whose code you want to know several times. Upon successful completion of the procedure, the code read will be displayed in the log.', +'XIMI_APP_TEACH_TEXT_AQARA' => 'To read the IR code from the remote control, press the Start button, point the remote control towards Aqara AC Companion and press the button whose code you want to know several times. Upon successful completion of the procedure, the code read will be displayed in the log.', 'XIMI_APP_START' => 'Start', 'XIMI_APP_TRAINING' => 'Learning mode activated', 'XIMI_APP_ERROR' => 'The problem with getting data from the device', diff --git a/languages/xiaomimiio_ru.php b/languages/xiaomimiio_ru.php index fddc80a..71e3e64 100644 --- a/languages/xiaomimiio_ru.php +++ b/languages/xiaomimiio_ru.php @@ -44,6 +44,7 @@ 'XIMI_APP_TEACH1' => 'Обучить IR-коду', 'XIMI_APP_TEACH2' => 'Обучение IR-командам', 'XIMI_APP_TEACH_TEXT' => 'Чтобы считать IR-код с пульта дистанционного управления, нажмите кнопку Старт, направьте пульт в сторону Mi IR Remote 360 и нажмите несколько раз кнопку, код которой требуется узнать. При успешном завершении процедуры прочитанный код отобразится в логе.', +'XIMI_APP_TEACH_TEXT_AQARA' => 'Чтобы считать IR-код с пульта дистанционного управления, нажмите кнопку Старт, направьте пульт в сторону Aqara AC Companion и нажмите несколько раз кнопку, код которой требуется узнать. При успешном завершении процедуры прочитанный код отобразится в логе.', 'XIMI_APP_START' => 'Старт', 'XIMI_APP_TRAINING' => 'Режим обучения активирован', 'XIMI_APP_ERROR' => 'Проблема с получением данных от устройства', diff --git a/languages/xiaomimiio_ua.php b/languages/xiaomimiio_ua.php index b1ee80b..46acc6d 100644 --- a/languages/xiaomimiio_ua.php +++ b/languages/xiaomimiio_ua.php @@ -44,6 +44,7 @@ 'XIMI_APP_TEACH1' => 'Навчити коду', 'XIMI_APP_TEACH2' => 'Навчання IR-командам', 'XIMI_APP_TEACH_TEXT' => 'Щоб отримати IR-код з пульта дистанційного керування, натисніть кнопку "Старт", направте пульт в сторону Mi IR Remote 360 і натисніть кілька разів кнопку, код якої потрібно дізнатися. При успішному завершенні процедури отриманий код відобразиться на сторінці.', +'XIMI_APP_TEACH_TEXT_AQARA' => 'Щоб отримати IR-код з пульта дистанційного керування, натисніть кнопку "Старт", направте пульт в сторону Aqara AC Companion і натисніть кілька разів кнопку, код якої потрібно дізнатися. При успішному завершенні процедури отриманий код відобразиться на сторінці.', 'XIMI_APP_START' => 'Старт', 'XIMI_APP_TRAINING' => 'Режим навчання активований', 'XIMI_APP_ERROR' => 'Проблема з отриманням даних від пристрою', diff --git a/modules/xiaomimiio/miio_devices_edit.inc.php b/modules/xiaomimiio/miio_devices_edit.inc.php index 58488ff..9a84410 100644 --- a/modules/xiaomimiio/miio_devices_edit.inc.php +++ b/modules/xiaomimiio/miio_devices_edit.inc.php @@ -2,7 +2,7 @@ /* * @author * @copyright 2017-2018 Agaphonov Dmitri aka skysilver (c) -* @version 1.8b +* @version 1.8.5b */ if ($this->owner->name == 'panel') { @@ -17,7 +17,7 @@ $this->getConfig(); $ok = 1; - + if ($this->tab == '') { global $title; @@ -33,10 +33,10 @@ $out['ERR_IP'] = 1; $ok = 0; } - + global $token; $rec['TOKEN'] = $token; - + global $device_type; $rec['DEVICE_TYPE'] = $device_type; @@ -45,21 +45,23 @@ if ($rec['UPDATE_PERIOD'] > 0) { $rec['NEXT_UPDATE'] = date('Y-m-d H:i:s'); } - + $commands = array('online', 'command', 'message'); if (($rec['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($rec['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { $commands[] = 'add_program'; $commands[] = 'del_program'; } - if ($rec['DEVICE_TYPE'] == 'chuangmi.ir.v2') { + if ($rec['DEVICE_TYPE'] == 'chuangmi.ir.v2' || $rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { $commands[] = 'ir_play'; - //$commands[] = 'freq'; } if ($rec['DEVICE_TYPE'] == 'xiaomi.wifispeaker.v1') { $commands[] = 'vol_up'; $commands[] = 'vol_down'; } - + if ($rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $commands[] = 'power'; + $commands[] = 'load_power'; + } } if ($ok) { @@ -95,7 +97,13 @@ if ($rec['TOKEN'] != '' && $rec['IP'] != '') { $this->requestInfo($rec['ID']); // а также, если определен тип устройства, то запросим текущие параметры (статус). - if ((int)$update_period == 0 && $rec['DEVICE_TYPE'] != '') $this->requestStatus($rec['ID']); + if ($rec['DEVICE_TYPE'] != '') { + $this->requestStatus($rec['ID']); + if (($rec['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($rec['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { + $this->addToQueue($rec['ID'], 'get_lumi_dpf_aes_key', '[]'); + $this->addToQueue($rec['ID'], 'get_zigbee_channel', '[]'); + } + } // Если тип устройства не указан, то пробуем получить тип устройства из miIO.info if ($rec['DEVICE_TYPE'] == '') { if ($this->config['API_LOG_DEBMES']) DebMes('Try to get device model from miIO.info for the device ' . $rec['IP'], 'xiaomimiio'); @@ -135,44 +143,46 @@ $new_id = 0; global $delete_id; - + if ($delete_id) { SQLExec("DELETE FROM miio_commands WHERE ID='" . (int)$delete_id . "'"); } - - if (($rec['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($rec['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { - // Для шлюза на вкладку data выводим только определенные свойства, т.к. для свойств радио есть отдельная вкладка - $properties = SQLSelect("SELECT * FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "' AND TITLE IN ('online','command','message','lumi_dpf_aes_key','zigbee_channel') ORDER BY ID"); - } else { - $properties = SQLSelect("SELECT * FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "' ORDER BY ID"); - } - + + if ($rec['DEVICE_TYPE'] == 'lumi.gateway.v3') { + // Для шлюза на вкладку data выводим только определенные свойства, т.к. для свойств радио есть отдельная вкладка + $properties = SQLSelect("SELECT * FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "' AND TITLE IN ('online','command','message','lumi_dpf_aes_key','zigbee_channel') ORDER BY ID"); + } else if ($rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $properties = SQLSelect("SELECT * FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "' AND TITLE IN ('online','command','message','lumi_dpf_aes_key','zigbee_channel', 'ir_play', 'power', 'load_power') ORDER BY ID"); + } else { + $properties = SQLSelect("SELECT * FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "' ORDER BY ID"); + } + $total = count($properties); - + for($i = 0; $i < $total; $i++) { if ($properties[$i]['ID'] == $new_id) continue; - + if ($this->mode == 'update') { - + global ${'linked_object'.$properties[$i]['ID']}; $properties[$i]['LINKED_OBJECT'] = trim(${'linked_object'.$properties[$i]['ID']}); - + global ${'linked_property'.$properties[$i]['ID']}; $properties[$i]['LINKED_PROPERTY'] = trim(${'linked_property'.$properties[$i]['ID']}); - + global ${'linked_method'.$properties[$i]['ID']}; $properties[$i]['LINKED_METHOD'] = trim(${'linked_method'.$properties[$i]['ID']}); - + SQLUpdate('miio_commands', $properties[$i]); - + $old_linked_object = $properties[$i]['LINKED_OBJECT']; $old_linked_property = $properties[$i]['LINKED_PROPERTY']; - + if ($old_linked_object && $old_linked_object != $properties[$i]['LINKED_OBJECT'] && $old_linked_property && $old_linked_property != $properties[$i]['LINKED_PROPERTY']) { removeLinkedProperty($old_linked_object, $old_linked_property, $this->name); } } - + $properties[$i]['VALUE'] = str_replace('",','", ',$properties[$i]['VALUE']); if ($properties[$i]['LINKED_OBJECT'] && $properties[$i]['LINKED_PROPERTY']) { @@ -280,7 +290,6 @@ } else { $out['LAN_KEY'] = ''; } - //$out['LAN_KEY'] = ''; } if ($this->tab == 'help') { diff --git a/modules/xiaomimiio/xiaomimiio.class.php b/modules/xiaomimiio/xiaomimiio.class.php index e36012e..5199aaf 100644 --- a/modules/xiaomimiio/xiaomimiio.class.php +++ b/modules/xiaomimiio/xiaomimiio.class.php @@ -319,22 +319,22 @@ function discover($ip = '') { else $bind_ip = '0.0.0.0'; if ($miio_module->config['API_LOG_MIIO']) $miio_debug = true; else $miio_debug = false; - + if (!class_exists('miIO', false)) { include_once(DIR_MODULES . 'xiaomimiio/lib/miio.class.php'); } - + $midev = new miIO(null, $bind_ip, null, $miio_debug); - + // Выполняем broadcast-поиск устройств в локальной сети if ($this->config['API_LOG_DEBMES']) DebMes("Run miIO-discover command", 'xiaomimiio'); $res = $midev->discover(); if ($this->config['API_LOG_DEBMES']) DebMes("End miIO-discover command", 'xiaomimiio'); - + if ($res) { // Обрабатываем результат поиска $reply = $midev->data; - + if ($reply != '') { if ($this->config['API_LOG_DEBMES']) DebMes("Reply = $reply", 'xiaomimiio'); @@ -342,7 +342,7 @@ function discover($ip = '') { $count_devices = count($all_devices); if ($this->config['API_LOG_DEBMES']) DebMes("Current count of devices $count_devices", 'xiaomimiio'); $found_devices = json_decode($reply, true); - + if (is_array($found_devices['devices'])) { foreach($found_devices['devices'] as $dev) { $dev = json_decode($dev, true); @@ -350,26 +350,26 @@ function discover($ip = '') { $device_type_code = $dev['devicetype']; $device_serial = $dev['serial']; $token = $dev['token']; - + if (preg_match('/^[0fF]+$/', $token)) $token = ''; - + if (preg_match('/^[0fF]+$/', $device_type_code) || preg_match('/^[0fF]+$/', $device_serial)) { if ($this->config['API_LOG_DEBMES']) DebMes("Device $ip has wrong type code $device_type_code and serial number $device_serial", 'xiaomimiio'); continue; } - + //TO-DO: новые сравниваются по sid и devcode, но если устройство было добавлено вручную, то эти параметры будут отсутствовать, //соотвественно устройство добавится как новое, а не перезапишет (обновит) добавленно вручную. $dev_rec = SQLSelectOne("SELECT * FROM miio_devices WHERE DEVICE_TYPE_CODE='$device_type_code' AND SERIAL='$device_serial'"); - + if ($dev_rec['ID']) { // Если устройство уже есть в БД, то обновим его IP, токен и свойство online $dev_rec['IP'] = $ip; if ($token != '') $dev_rec['TOKEN'] = $token; - + if ($this->config['API_LOG_DEBMES']) DebMes("Update the ip address and the token for the device $ip", 'xiaomimiio'); SQLUpdate('miio_devices', $dev_rec); - + // Ответившее устройство выкинем из претендентов на оффлайн for ($i = 0; $i < $count_devices; $i++) { if ($dev_rec['ID'] == $all_devices[$i]['ID']) { @@ -377,7 +377,7 @@ function discover($ip = '') { break; } } - + $this->processCommand($dev_rec['ID'], 'online', 1); } else { // Если устройство нет в БД, то добавим его @@ -389,13 +389,13 @@ function discover($ip = '') { $dev_rec['DEVICE_TYPE_CODE'] = $device_type_code; $dev_rec['TITLE'] = 'New ' . $dev_rec['DEVICE_TYPE_CODE']; if ($this->config['API_LOG_DEBMES']) DebMes("Add new device with $ip", 'xiaomimiio'); - + // Если есть токен, то пробуем получить тип устройства из miIO.info if ($dev_rec['TOKEN']) { if ($this->config['API_LOG_DEBMES']) DebMes('Try to get device model from miIO.info for the device ' . $dev_rec['IP'], 'xiaomimiio'); $midev->data = ''; $midev->ip = $dev_rec['IP']; - $midev->token = $dev_rec['TOKEN']; + $midev->token = $dev_rec['TOKEN']; if ($midev->getInfo(time())) { if ($midev->data != '') { $info = json_decode($midev->data, true); @@ -405,25 +405,32 @@ function discover($ip = '') { } } } - + $dev_rec['ID'] = SQLInsert('miio_devices', $dev_rec); - - if ($dev_rec['DEVICE_TYPE'] != '') { + + // Базовые метрики устройств + $this->processCommand($dev_rec['ID'], 'online', 1); + $this->processCommand($dev_rec['ID'], 'command', ''); + $this->processCommand($dev_rec['ID'], 'message', ''); + + if ($dev_rec['DEVICE_TYPE'] != '') { $this->requestStatus($dev_rec['ID']); if (($dev_rec['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($dev_rec['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { $this->processCommand($dev_rec['ID'], 'add_program', ''); $this->processCommand($dev_rec['ID'], 'del_program', ''); } - if ($dev_rec['DEVICE_TYPE'] == 'chuangmi.ir.v2') { + if ($dev_rec['DEVICE_TYPE'] == 'chuangmi.ir.v2' || $dev_rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { $this->processCommand($dev_rec['ID'], 'ir_play', ''); } if ($dev_rec['DEVICE_TYPE'] == 'xiaomi.wifispeaker.v1') { $this->processCommand($dev_rec['ID'], 'vol_up', ''); $this->processCommand($dev_rec['ID'], 'vol_down', ''); } + if ($dev_rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $this->processCommand($dev_rec['ID'], 'power', ''); + $this->processCommand($dev_rec['ID'], 'load_power', ''); + } } - - $this->processCommand($dev_rec['ID'], 'online', 1); } } } @@ -539,12 +546,17 @@ function requestStatus($device_id) { } } elseif (($device_rec['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($device_rec['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { // - $this->addToQueue($device_id, 'get_prop_fm', '[]'); + if ($device_rec['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $this->addToQueue($device_id, 'get_device_prop', '["lumi.0","ac_power"]'); + } + $this->addToQueue($device_id, 'get_prop_fm', '[]'); if ($this->view_mode == 'propupd_miio_devices') { $this->addToQueue($device_id, 'get_lumi_dpf_aes_key', '[]'); $this->addToQueue($device_id, 'get_zigbee_channel', '[]'); } $this->addToQueue($device_id, 'get_channels', '{"start":0}'); + //TODO: $this->addToQueue($device_id, 'get_channels', '{"start":10}'); + // Если станций больше 10, 20. } elseif ($device_rec['DEVICE_TYPE'] == 'philips.light.ceiling') { // $props = explode(',', MIIO_PHILIPS_LIGHT_CEILING_PROPS); @@ -755,12 +767,12 @@ function edit_miio_devices(&$out, $id) { */ function delete_miio_devices($id) { - + $rec = SQLSelectOne("SELECT * FROM miio_devices WHERE ID='$id'"); - + SQLExec("DELETE FROM miio_commands WHERE DEVICE_ID='" . $rec['ID'] . "'"); SQLExec("DELETE FROM miio_devices WHERE ID='" . $rec['ID'] . "'"); - + } /** @@ -806,13 +818,18 @@ function propertySetHandle($object, $property, $value) { //что может быть неприемлемо. //$this->requestStatus($properties[$i]['DEVICE_ID']); } elseif ($properties[$i]['TITLE'] == 'power') { - // Команда на включение и выключение - if ($value) { - $this->addToQueue($properties[$i]['DEVICE_ID'], 'set_power', '["on"]'); - } else { - $this->addToQueue($properties[$i]['DEVICE_ID'], 'set_power', '["off"]'); - } - // TO-DO: Если у-во yeelight, то используем дополнительные опции команды (effect, duration, mode). + // Команда на включение и выключение + if ($properties[$i]['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $method = 'toggle_plug'; + } else { + $method = 'set_power'; + } + if ($value) { + $this->addToQueue($properties[$i]['DEVICE_ID'], $method, '["on"]'); + } else { + $this->addToQueue($properties[$i]['DEVICE_ID'], $method, '["off"]'); + } + // TO-DO: Если у-во yeelight, то используем дополнительные опции команды (effect, duration, mode). } elseif ($properties[$i]['TITLE'] == 'buzzer') { // Команда на включение и выключение пищалки if ($value) { @@ -861,9 +878,14 @@ function propertySetHandle($object, $property, $value) { $this->addToQueue($properties[$i]['DEVICE_ID'], 'set_usb_off', '[]'); } } elseif ($properties[$i]['TITLE'] == 'ir_play') { - // Команда для отправки IR-кода - $this->addToQueue($properties[$i]['DEVICE_ID'], 'miIO.ir_play', '{"freq":38400,"code":"' . $value . '"}'); - //{"id":1,"method":"miIO.ir_play","params":{"freq":38400,"code":"Z6VHABACAABE...QA="}} + // Команда для отправки IR-кода + if ($properties[$i]['DEVICE_TYPE'] == 'chuangmi.ir.v2') { + $this->addToQueue($properties[$i]['DEVICE_ID'], 'miIO.ir_play', '{"freq":38400,"code":"' . $value . '"}'); + } + else if ($properties[$i]['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + $this->addToQueue($properties[$i]['DEVICE_ID'], 'send_ir_code', '["' . $value . '"]'); + } + //{"id":1,"method":"miIO.ir_play","params":{"freq":38400,"code":"Z6VHABACAABE...QA="}} } elseif ($properties[$i]['TITLE'] == 'snm') { // Установить фиксированные сцены (1-Яркий, 2-ТВ, 3-тёплый, 4-ночь) if ($value < 1) $value = 1; @@ -1021,9 +1043,7 @@ function propertySetHandle($object, $property, $value) { $this->addToQueue($properties[$i]['DEVICE_ID'], 'remove_channels', '{"chs":[{"id":' . $value . ',"url":"' . $ch_url . '","type":0}]}'); } } - - SQLExec("UPDATE miio_commands SET VALUE='".DBSafe($value)."' WHERE ID=".$properties[$i]['ID']); - //TO-DO: также обновлять поле UPDATED + SQLExec("UPDATE miio_commands SET VALUE='" . DBSafe($value) . "', UPDATED='" . date('Y-m-d H:i:s') . "' WHERE ID=" . $properties[$i]['ID']); } } } @@ -1036,11 +1056,11 @@ function propertySetHandle($object, $property, $value) { * * @access private */ - + function processCommand($device_id, $command, $value, $params = 0) { - + $cmd_rec = SQLSelectOne("SELECT * FROM miio_commands WHERE DEVICE_ID=".(int)$device_id." AND TITLE LIKE '".DBSafe($command)."'"); - + if (!$cmd_rec['ID']) { $cmd_rec = array(); $cmd_rec['TITLE'] = $command; @@ -1053,23 +1073,29 @@ function processCommand($device_id, $command, $value, $params = 0) { $cmd_rec['VALUE'] = $value; $cmd_rec['UPDATED'] = date('Y-m-d H:i:s'); SQLUpdate('miio_commands', $cmd_rec); - - if ($old_value == $value) return; - if ($cmd_rec['LINKED_OBJECT'] && $cmd_rec['LINKED_PROPERTY']) { - setGlobal($cmd_rec['LINKED_OBJECT'] . '.' . $cmd_rec['LINKED_PROPERTY'], $value, array($this->name => '0')); - } - - if ($cmd_rec['LINKED_OBJECT'] && $cmd_rec['LINKED_METHOD']) { - if (!is_array($params)) { - $params = array(); - } - $params['VALUE'] = $value; - callMethodSafe($cmd_rec['LINKED_OBJECT'] . '.' . $cmd_rec['LINKED_METHOD'], $params); - } + // Если значение метрики не изменилось, то выходим. + if ($old_value == $value) return; + + // Иначе обновляем привязанное свойство. + if ($cmd_rec['LINKED_OBJECT'] && $cmd_rec['LINKED_PROPERTY']) { + setGlobal($cmd_rec['LINKED_OBJECT'] . '.' . $cmd_rec['LINKED_PROPERTY'], $value, array($this->name => '0')); + } + + // И вызываем привязанный метод. + if ($cmd_rec['LINKED_OBJECT'] && $cmd_rec['LINKED_METHOD']) { + if (!is_array($params)) { + $params = array(); + } + $params['VALUE'] = $value; + $params['OLD_VALUE'] = $old_value; + $params['NEW_VALUE'] = $value; + + callMethodSafe($cmd_rec['LINKED_OBJECT'] . '.' . $cmd_rec['LINKED_METHOD'], $params); + } } - + /** * processMessage * @@ -1132,12 +1158,10 @@ function processMessage($message, $command, $device_id) { } } } elseif ($device['ID']) { - + $res_commands[] = array('command' => 'online', 'value' => 1); - $res_commands[] = array('command' => 'command', 'value' => ''); $res_commands[] = array('command' => 'message', 'value' => $message); - - + if (($device['DEVICE_TYPE'] == 'lumi.gateway.v3') || ($device['DEVICE_TYPE'] == 'lumi.acpartner.v3')) { if ($command == 'get_prop_fm' && is_array($data['result'])) { foreach($data['result'] as $key => $value) { @@ -1153,6 +1177,11 @@ function processMessage($message, $command, $device_id) { if ($command == 'get_zigbee_channel' && is_array($data['result'])) { $res_commands[] = array('command' => 'zigbee_channel', 'value' => $data['result'][0]); } + if ($device['DEVICE_TYPE'] == 'lumi.acpartner.v3') { + if ($command == 'get_device_prop' && is_array($data['result'])) { + $res_commands[] = array('command' => 'load_power', 'value' => $data['result'][0]); + } + } } elseif ($device['DEVICE_TYPE'] == 'yeelink.light.mono1' && $command == 'get_prop' && is_array($data['result'])) { $props = explode(',', MIIO_YEELIGHT_WHITE_BULB_PROPS); $i = 0; diff --git a/scripts/cycle_xiaomimiio.php b/scripts/cycle_xiaomimiio.php index 34f0966..f335c9d 100644 --- a/scripts/cycle_xiaomimiio.php +++ b/scripts/cycle_xiaomimiio.php @@ -3,7 +3,7 @@ * Xiaomi miIO Cycle * @author * @copyright 2017-2018 Agaphonov Dmitri aka skysilver (c) -* @version 1.8b +* @version 1.8.5b */ chdir(dirname(__FILE__) . '/../'); @@ -92,11 +92,7 @@ if($dev->msgSendRcv($queue[$i]['METHOD'], $queue[$i]['DATA'], $msg_id)) { $reply = $dev->data; } else { - if ($cycle_debug) echo date('H:i:s') . ' Reply: device not answered' . PHP_EOL; $reply = '{"error":"Device not answered"}'; - $url = BASE_URL.'/ajax/xiaomimiio.html?op=process&command='.urlencode($queue[$i]['METHOD']).'&device_id='.$queue[$i]['DEVICE_ID'].'&message='.urlencode($reply); - getURLBackground($url, 0); - if ($cycle_debug) echo date('H:i:s') . ' Background processing of the response is started' . PHP_EOL; } } diff --git a/templates/xiaomimiio/action_admin.html b/templates/xiaomimiio/action_admin.html index 5554c42..47ff021 100644 --- a/templates/xiaomimiio/action_admin.html +++ b/templates/xiaomimiio/action_admin.html @@ -156,7 +156,7 @@

Xiaomi miIO

-

v.1.8

+

v.1.8.5

<#LANG_XIMI_APP_MODULE#>

diff --git a/templates/xiaomimiio/img/aqara_ir_learn.png b/templates/xiaomimiio/img/aqara_ir_learn.png new file mode 100644 index 0000000000000000000000000000000000000000..3ee1d46aed675084621ac234eda11d24a1081040 GIT binary patch literal 9260 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 O0000 [#endif#] - - [#if DEVICE_TYPE="chuangmi.ir.v2"#] + [#if DEVICE_TYPE="chuangmi.ir.v2" || DEVICE_TYPE="lumi.acpartner.v3"#]