景龙 / gangjuren · 提交

转到一个项目

作者 王晓刚
提交 35ef5e587e2fe77497078ebc57053c3d8acb9292 2 个父辈 22ead3fd 47dc609d
1 个管道 的构建 通过 耗费 2 秒

合并分支 'wxg' 到 'master' 

Wxg



查看合并请求 !33
内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 20 行删除
... ... @@ -214,8 +214,8 @@
})();
</script>
<script>
// ws = new WebSocket("ws://127.0.0.1:9528/");
ws = new WebSocket("ws://gangjuren.w.brotop.cn:9528/");
ws = new WebSocket("ws://127.0.0.1:9528/");
// ws = new WebSocket("ws://gangjuren.w.brotop.cn:9528/");
ws.onopen = function() {
ws.send("X,5A5A5A5A0000,00,1,83bb,Y");
};
... ...
... ... @@ -111,22 +111,15 @@ class Events
$quantity = self::jinzhih_1($param[5], 16);//电池电量
$wendu = (self::jinzhih_1(substr($param[6], 0, 4),16)-self::jinzhih_1("0X07FF",16))/10;//温度
$shidu = (self::jinzhih_1(substr($param[6], 4, 8),16)-self::jinzhih_1("0X07FF",16))/10;//湿度
$papers = self::jinzhih_1($param[8], 16);//本次计数
$papers_count = self::jinzhih_1($param[9], 16);//累加计数
$times = self::jinzhih_1($param[10], 16);//计数次数
$sensor_status = $param[11];//传感器模组状态
$dianji_status = $param[12];//电机状态
$yejing_status = $param[13];//液晶状态
$wenshidu_status = $param[14];//湿度传感器状态
print_r($param);
//验证签名是否正确;
unset($param[0]);
unset($param[count($param)]);
unset($param[count($param)]);
print_r($param);
$str = ",".implode(',',$param).",";
echo self::crc16($str)."\n";
echo $crc16;
$papers = self::jinzhih_1($param[7], 16);//本次计数
$papers_count = self::jinzhih_1($param[8], 16);//累加计数
$times = self::jinzhih_1($param[9], 16);//计数次数
$sensor_status = $param[10];//传感器模组状态
$dianji_status = $param[11];//电机状态
$yejing_status = $param[12];//液晶状态
$wenshidu_status = $param[13];//湿度传感器状态
//验证签名是否正确
$str = ",".$param[1].",".$param[2].",".$param[3].",".$param[4].",".$param[5].",".$param[6].",".$param[7].",".$param[8].",".$param[9].",".$param[10].",".$param[11].",".$param[12].",".$param[13].",".$param[14].",";
if (self::crc16($str) != $crc16) {
echo "yanzhengshibai2";
return ;
... ... @@ -139,7 +132,7 @@ class Events
if($row['status'] != 'normal' || $row['end_time'] < time()){
$status = "B9";//禁用
}else {
$iunsert_param = [
$insert_param = [
'number' => $number,
'command_number' => $command_number,
'time' => $time,
... ... @@ -173,7 +166,7 @@ class Events
'dianji_status' => $dianji_status,
'yejing_status' => $yejing_status,
'wenshidu_status' => $wenshidu_status,
'socket_data' => json_encode($iunsert_param),
'socket_data' => json_encode($insert_param),
'createtime' => $createtime,
];
// $db->beginTrans();
... ...