Merge pull request #1 from ggottwald/b1acn01_switch

ggottwald · web-flow · commit e6380d819a04 · 2019-10-02T09:30:04.000+02:00
ADD switch
diff --git a/src/Models/Gateway.php b/src/Models/Gateway.php
@@ -10,13 +10,13 @@
  *
  * @package Aqara\Models
  *
- * @property string $ip
- * @property int $port
- * @property bool $ready
- * @property string $rgb
- * @property string $brightness
+ * @property string      $ip
+ * @property int         $port
+ * @property bool        $ready
+ * @property string      $rgb
+ * @property string      $brightness
  * @property Subdevice[] $subDevices
- * @property \Closure $sendUnicast
+ * @property \Closure    $sendUnicast
  *
  * @method sendUnicast(string $payload)
  */
@@ -73,7 +73,7 @@ public function handleMessage($response)
                         case 'sensor_magnet.aq2':
                             $subDevice = new Magnet(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
@@ -82,11 +82,12 @@ public function handleMessage($response)
                         case 'sensor_switch.aq2':
                         case '86sw1':
                         case '86sw2':
+                        case 'remote.b1acn01';
                         case 'remote.b186acn01':
                         case 'remote.b286acn01':
                             $subDevice = new SwitchDevice(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
@@ -95,7 +96,7 @@ public function handleMessage($response)
                         case 'sensor_motion.aq2':
                             $subDevice = new Motion(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
@@ -104,39 +105,39 @@ public function handleMessage($response)
                         case 'weather.v1':
                             $subDevice = new Sensor(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
                             break;
                         case 'sensor_wleak.aq1':
                             $subDevice = new Leak(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
                             break;
                         case 'cube':
                             $subDevice = new Cube(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
                             break;
                         case 'smoke':
                             $subDevice = new Smoke(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             );
                             break;
                         default:
                             $subDevice = new Class(
                                 [
-                                    'sid' => $response->sid,
+                                    'sid'   => $response->sid,
                                     'model' => $response->model,
                                 ]
                             ) extends Subdevice
@@ -151,9 +152,9 @@ public function __construct(array $attributes = [])
 
                     if (isset($subDevice)) {
                         $subDevice->handleState($state);
-                        $subDevices = $this->subDevices;
+                        $subDevices                 = $this->subDevices;
                         $subDevices[$response->sid] = $subDevice;
-                        $this->subDevices = $subDevices;
+                        $this->subDevices           = $subDevices;
                         $this->emit('subdevice', [$subDevice]);
                     }
                 }
@@ -196,7 +197,7 @@ protected function handleState($state)
 
             if (strlen($hexValue) >= 7) {
                 $this->brightness = strrev(substr(strrev($hexValue), 6));
-                $this->rgb = strrev(substr(strrev($hexValue), 0, 6));
+                $this->rgb        = strrev(substr(strrev($hexValue), 0, 6));
                 $this->emit('lightState', ['rgb' => $this->rgb, 'brightness' => $this->brightness]);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@`
`10`	`10`	`*`
`11`	`11`	`* @package Aqara\Models`
`12`	`12`	`*`
`13`		`- * @property string $ip`
`14`		`- * @property int $port`
`15`		`- * @property bool $ready`
`16`		`- * @property string $rgb`
`17`		`- * @property string $brightness`
	`13`	`+ * @property string $ip`
	`14`	`+ * @property int $port`
	`15`	`+ * @property bool $ready`
	`16`	`+ * @property string $rgb`
	`17`	`+ * @property string $brightness`
`18`	`18`	`* @property Subdevice[] $subDevices`
`19`		`- * @property \Closure $sendUnicast`
	`19`	`+ * @property \Closure $sendUnicast`
`20`	`20`	`*`
`21`	`21`	`* @method sendUnicast(string $payload)`
`22`	`22`	`*/`
`@@ -73,7 +73,7 @@ public function handleMessage($response)`
`73`	`73`	`case 'sensor_magnet.aq2':`
`74`	`74`	`$subDevice = new Magnet(`
`75`	`75`	`[`
`76`		`- 'sid' => $response->sid,`
	`76`	`+ 'sid' => $response->sid,`
`77`	`77`	`'model' => $response->model,`
`78`	`78`	`]`
`79`	`79`	`);`
`@@ -82,11 +82,12 @@ public function handleMessage($response)`
`82`	`82`	`case 'sensor_switch.aq2':`
`83`	`83`	`case '86sw1':`
`84`	`84`	`case '86sw2':`
	`85`	`+ case 'remote.b1acn01';`
`85`	`86`	`case 'remote.b186acn01':`
`86`	`87`	`case 'remote.b286acn01':`
`87`	`88`	`$subDevice = new SwitchDevice(`
`88`	`89`	`[`
`89`		`- 'sid' => $response->sid,`
	`90`	`+ 'sid' => $response->sid,`
`90`	`91`	`'model' => $response->model,`
`91`	`92`	`]`
`92`	`93`	`);`
`@@ -95,7 +96,7 @@ public function handleMessage($response)`
`95`	`96`	`case 'sensor_motion.aq2':`
`96`	`97`	`$subDevice = new Motion(`
`97`	`98`	`[`
`98`		`- 'sid' => $response->sid,`
	`99`	`+ 'sid' => $response->sid,`
`99`	`100`	`'model' => $response->model,`
`100`	`101`	`]`
`101`	`102`	`);`
`@@ -104,39 +105,39 @@ public function handleMessage($response)`
`104`	`105`	`case 'weather.v1':`
`105`	`106`	`$subDevice = new Sensor(`
`106`	`107`	`[`
`107`		`- 'sid' => $response->sid,`
	`108`	`+ 'sid' => $response->sid,`
`108`	`109`	`'model' => $response->model,`
`109`	`110`	`]`
`110`	`111`	`);`
`111`	`112`	`break;`
`112`	`113`	`case 'sensor_wleak.aq1':`
`113`	`114`	`$subDevice = new Leak(`
`114`	`115`	`[`
`115`		`- 'sid' => $response->sid,`
	`116`	`+ 'sid' => $response->sid,`
`116`	`117`	`'model' => $response->model,`
`117`	`118`	`]`
`118`	`119`	`);`
`119`	`120`	`break;`
`120`	`121`	`case 'cube':`
`121`	`122`	`$subDevice = new Cube(`
`122`	`123`	`[`
`123`		`- 'sid' => $response->sid,`
	`124`	`+ 'sid' => $response->sid,`
`124`	`125`	`'model' => $response->model,`
`125`	`126`	`]`
`126`	`127`	`);`
`127`	`128`	`break;`
`128`	`129`	`case 'smoke':`
`129`	`130`	`$subDevice = new Smoke(`
`130`	`131`	`[`
`131`		`- 'sid' => $response->sid,`
	`132`	`+ 'sid' => $response->sid,`
`132`	`133`	`'model' => $response->model,`
`133`	`134`	`]`
`134`	`135`	`);`
`135`	`136`	`break;`
`136`	`137`	`default:`
`137`	`138`	`$subDevice = new Class(`
`138`	`139`	`[`
`139`		`- 'sid' => $response->sid,`
	`140`	`+ 'sid' => $response->sid,`
`140`	`141`	`'model' => $response->model,`
`141`	`142`	`]`
`142`	`143`	`) extends Subdevice`
`@@ -151,9 +152,9 @@ public function __construct(array $attributes = [])`
`151`	`152`
`152`	`153`	`if (isset($subDevice)) {`
`153`	`154`	`$subDevice->handleState($state);`
`154`		`- $subDevices = $this->subDevices;`
	`155`	`+ $subDevices = $this->subDevices;`
`155`	`156`	`$subDevices[$response->sid] = $subDevice;`
`156`		`- $this->subDevices = $subDevices;`
	`157`	`+ $this->subDevices = $subDevices;`
`157`	`158`	`$this->emit('subdevice', [$subDevice]);`
`158`	`159`	`}`
`159`	`160`	`}`
`@@ -196,7 +197,7 @@ protected function handleState($state)`
`196`	`197`
`197`	`198`	`if (strlen($hexValue) >= 7) {`
`198`	`199`	`$this->brightness = strrev(substr(strrev($hexValue), 6));`
`199`		`- $this->rgb = strrev(substr(strrev($hexValue), 0, 6));`
	`200`	`+ $this->rgb = strrev(substr(strrev($hexValue), 0, 6));`
`200`	`201`	`$this->emit('lightState', ['rgb' => $this->rgb, 'brightness' => $this->brightness]);`
`201`	`202`	`}`
`202`	`203`	`}`