fix bug

api/application/controllers/Lampcontrol.php

@@ -489,7 +489,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'0300004646';
 
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 // $cmd .= crc16(pack('H*',$sendData));
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
@@ -662,11 +662,11 @@ class Lampcontrol extends Base_Controller {
             
         }elseif ($lampData['lampprotocoltype'] == 1) {
             $sendData = '0103000a0002e409';
-            $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (!empty($res) && strtolower(crc16(pack('H*',mb_substr($res['msg'], 0,-4)))) == strtolower(mb_substr($res['msg'], -4))) {
                 $sysInfoStr = $res['msg'];
                 $sendData = '010300fd003115ee';
-                $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
                 if (!empty($res) && strtolower(crc16(pack('H*',mb_substr($res['msg'], 0,-4)))) == strtolower(mb_substr($res['msg'], -4))) {
                     $data = array();
                     $msg = $res['msg'];
@@ -878,7 +878,7 @@ class Lampcontrol extends Base_Controller {
 
         $sendData .= crc16(pack('H*',$sendData));
 
-        $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+        $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
         if (empty($res)) {
             $data = ['code'=>'0016','status'=>2,'msg'=>$this->response['0016'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
             exit(send_websocket($clientid,$data));
@@ -977,7 +977,7 @@ class Lampcontrol extends Base_Controller {
             if ($res['protocoltype'] == 4) {
                 $sendData = '000101A501';;
                 $sendData .= bitSubStr(base_convert(intval($time/5), 10, 16));
-                lampMqttCmd('/WE/WriteIn/'.$res['address'],'/WE/WriteOut/'.$res['address'],pack('H*', $sendData),0);
+                lampMqttCmd('/lamp/WriteIn/'.$res['address'],'/lamp/WriteOut/'.$res['address'],pack('H*', $sendData),0);
                 return;
             }
             if (isset($res['protocoltype']) && $res['protocoltype'] != 0) {
@@ -1125,7 +1125,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.$sendData;
             
             if ($lampProData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampProData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampProData['address'].'"}';
@@ -1406,7 +1406,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampProData['protocoltype'] == 4 && $lampProData['lampprotocoltype'] == 1) {
             $sendData = '0103e08d0027a23b';
             
-            $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 return array('result'=>1,'msg'=>'0016');
             }else{
@@ -1456,7 +1456,7 @@ class Lampcontrol extends Base_Controller {
                     $len = doubBitSubStr(base_convert(intval(mb_strlen($sendData)/4), 10, 16)).bitSubStr(base_convert(intval(mb_strlen($sendData)/2), 10, 16));
                     $sendData = '0110e08d'.$len.$sendData;
                     $sendData .= crc16(pack('H*',$sendData));
-                    $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                    $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
                     if (empty($res)) {
                         return array('result'=>1,'msg'=>'0016');
                     }else{
@@ -1839,7 +1839,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.$sendData;
             
             if ($lampProData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampProData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampProData['address'].'"}';
@@ -2046,7 +2046,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampProData['protocoltype'] == 4 && $lampProData['lampprotocoltype'] == 1) {
             $sendData = '0103e0020020d212';
             
-            $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 return array('result'=>1,'msg'=>'0016');
             }else{
@@ -2139,7 +2139,7 @@ class Lampcontrol extends Base_Controller {
                     $len = doubBitSubStr(base_convert(intval(mb_strlen($sendData)/4), 10, 16)).bitSubStr(base_convert(intval(mb_strlen($sendData)/2), 10, 16));
                     $sendData = '0110e002'.$len.$sendData;
                     $sendData .= crc16(pack('H*',$sendData));
-                    $res = lampMqttCmd('/WE/TransIn/'.$lampProData['address'],'/WE/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                    $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
                     if (empty($res)) {
                         return array('result'=>1,'msg'=>'0016');
                     }else{
@@ -2535,7 +2535,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'0304001014';
             
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampData['address'].'"}';
@@ -2650,7 +2650,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampData['protocoltype'] == 4 && $lampData['lampprotocoltype'] == 1) {
             $sendData = '0103e08d0027a23b';
             
-            $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 exit(json_result('0016', $this->response['0016']));
             }else{
@@ -2922,7 +2922,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'030328204b';
             
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampData['address'].'"}';
@@ -3064,7 +3064,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampData['protocoltype'] == 4 && $lampData['lampprotocoltype'] == 1) {
             $sendData = '0103e0020020d212';
             
-            $res = lampMqttCmd('/WE/TransIn/'.$lampData['address'],'/WE/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 exit(json_result('0016', $this->response['0016']));
             }else{

api/application/controllers/Project.php

@@ -334,7 +334,7 @@ class Project extends Base_Controller {
                     $sendData = $address.$sendData;
                     
                     if ($value['protocoltype'] == 4) {
-                        $res = lampMqttCmd('/WE/TransIn/'.$value['address'],'/WE/TransOut/'.$value['address'],pack('H*','0001'.$sendData),0);
+                        $res = lampMqttCmd('/lamp/TransIn/'.$value['address'],'/lamp/TransOut/'.$value['address'],pack('H*','0001'.$sendData),0);
                     }else{
                         device_cmd($value['deviceid'],pack('H*',$sendData));
                     }
@@ -652,7 +652,7 @@ class Project extends Base_Controller {
             //         if ($v['protocoltype'] == 4) {
             //             $sendData = '000101A501';;
             //             $sendData .= bitSubStr(base_convert(intval($patrolData['patrolinterval']/5), 10, 16));
-            //             lampMqttCmd('/WE/WriteIn/'.$v['address'],'/WE/WriteOut/'.$v['address'],pack('H*', $sendData),0);
+            //             lampMqttCmd('/lamp/WriteIn/'.$v['address'],'/lamp/WriteOut/'.$v['address'],pack('H*', $sendData),0);
             //             continue;
             //         }
             //         if (isset($v['protocoltype']) && $v['protocoltype'] != 0) {
@@ -710,7 +710,7 @@ class Project extends Base_Controller {
         if ($res['protocoltype'] == 4) {
             $sendData = '000101A501';;
             $sendData .= bitSubStr(base_convert(intval($data['patrolinterval']/5), 10, 16));
-            lampMqttCmd('/WE/WriteIn/'.$res['address'],'/WE/WriteOut/'.$res['address'],pack('H*', $sendData),0);
+            lampMqttCmd('/lamp/WriteIn/'.$res['address'],'/lamp/WriteOut/'.$res['address'],pack('H*', $sendData),0);
         }
         if (isset($res['protocoltype']) && $res['protocoltype'] != 0) {
             $cmd = '{"cmd_type":"set_patrol_cmd","cmd_id":'.$id.',"broadcast":0}';
@@ -758,7 +758,7 @@ class Project extends Base_Controller {
             if ($res['protocoltype'] == 4) {
                 $sendData = '000101A501';;
                 $sendData .= bitSubStr(base_convert(intval($interval/5), 10, 16));
-                lampMqttCmd('/WE/WriteIn/'.$res['address'],'/WE/WriteOut/'.$res['address'],pack('H*', $sendData),0);
+                lampMqttCmd('/lamp/WriteIn/'.$res['address'],'/lamp/WriteOut/'.$res['address'],pack('H*', $sendData),0);
             }else{
                 if (isset($res['protocoltype']) && $res['protocoltype'] != 0) {
                     $cmd = '{"cmd_type":"set_patrol_cmd","cmd_id":'.$id.',"broadcast":0}';
@@ -816,7 +816,7 @@ class Project extends Base_Controller {
             $len = '0'.$len;
         }
         foreach ($lampList as $lampData) {
-            lampMqttCmd('/WE/UpgradeIn/'.$lampData['address'],'/WE/UpgradeOut/'.$lampData['address'],pack('H*','0001'.$len.'00'.$url),0);
+            lampMqttCmd('/lamp/UpgradeIn/'.$lampData['address'],'/lamp/UpgradeOut/'.$lampData['address'],pack('H*','0001'.$len.'00'.$url),0);
         }
 
         $cmd = '{"cmd_type":"app_upgrade_cmd","relateid":'.$projectid.',"senddata":"'.$url.'","cmd_id":"0"}';