From b0d515ef1714001ad586c6663fe6889e3eba19a0 Mon Sep 17 00:00:00 2001
From: fish <gcslyp@gmail.com>
Date: Mon, 24 Jun 2019 09:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B5=8B=E8=AF=95=E5=86=85?=
=?UTF-8?q?=E5=AE=B9=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tcpserver.go | 83 ++++++++++++++++++++++++++--------------------------
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/tcpserver.go b/tcpserver.go
index a840953..c111802 100644
--- a/tcpserver.go
+++ b/tcpserver.go
@@ -116,6 +116,11 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
//尿布台数据，地址1位 数据2位
dataType := data[i+1]
+
+ if dataType!=1 && dataType!=2 && dataType!=3 && dataType!=4{
+ continue;
+ }
+
values := make([]byte,0)
@@ -152,31 +157,29 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
continue
}
values = data[i+2:i+end]
-
- log.Println("pm25data1",data[i+15])
- log.Println("pm25data2",data[i+16])
+ // log.Println("pm25data1",data[i+15])
+ // log.Println("pm25data2",data[i+16])
// nh3data := uint32(data[i+7])*256+uint32(data[i+8])
- pm25data := uint32(data[i+15])*256+uint32(data[i+16])
- log.Println("nh3data",data[i+7])
- log.Println("pm25data",pm25data)
-
+ // pm25data := uint32(data[i+15])*256+uint32(data[i+16])
+ // log.Println("nh3data",data[i+7])
+ // log.Println("pm25data",pm25data)
//8E 3C 00 00 47 46
- var close []byte = []byte{0x8E,0x3C,0x00,0x00,0x43,0x46}
- var open []byte = []byte{0x8E,0x3C,0x00,0x00,0x4F,0x46}
- var writedata []byte =[]byte{}
+ // var close []byte = []byte{0x8E,0x3C,0x00,0x00,0x43,0x46}
+ // var open []byte = []byte{0x8E,0x3C,0x00,0x00,0x4F,0x46}
+ // var writedata []byte =[]byte{}
//i+7 氨气
//i+14 tvoc 甲醛
- if pm25data>100 || data[i+7]>=3 || data[i+14]>=2 {
- writedata = open
- }else{
- writedata = close
- }
- v, err := connTest.Write(writedata)
- log.Println("send.msg.conn.RemoteAddr:",connTest.RemoteAddr(),writedata)
- log.Println("send.msg.conn.v",v)
- if err != nil {
- log.Println("write msg error!", err)
- }
+ // if pm25data>100 || data[i+7]>=3 || data[i+14]>=2 {
+ // writedata = open
+ // }else{
+ // writedata = close
+ // }
+ // v, err := connTest.Write(writedata)
+ // log.Println("send.msg.conn.RemoteAddr:",connTest.RemoteAddr(),writedata)
+ // log.Println("send.msg.conn.v",v)
+ // if err != nil {
+ // log.Println("write msg error!", err)
+ // }
}else if dataType ==3{
continueCount = 2
end = 3
@@ -190,26 +193,24 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
values := data[i+2]
//28 3C 00 00 47 46
- var green []byte = []byte{0x28,0x3C,0x00,0x00,0x47,0x46}
- var red []byte = []byte{0x28,0x3C,0x00,0x00,0x52,0x46}
-
- var yellow []byte = []byte{0x28,0x3C,0x00,0x00,0x59,0x46}
- var writedata []byte =[]byte{}
- writedata = green
- if values == 2{
- writedata = red
- }else if values == 1{
- writedata = green
- }else if values == 4{
- writedata = yellow
- }
- log.Println("send.msg.conn.RemoteAddr|writedata",connTest.RemoteAddr(),writedata)
- v, err := connTest.Write(writedata)
-
- log.Println("send.msg.conn.v",v)
- if err != nil {
- log.Println("write msg error!", err)
- }
+ // var green []byte = []byte{0x28,0x3C,0x00,0x00,0x47,0x46}
+ // var red []byte = []byte{0x28,0x3C,0x00,0x00,0x52,0x46}
+ // var yellow []byte = []byte{0x28,0x3C,0x00,0x00,0x59,0x46}
+ // var writedata []byte =[]byte{}
+ // writedata = green
+ // if values == 2{
+ // writedata = red
+ // }else if values == 1{
+ // writedata = green
+ // }else if values == 4{
+ // writedata = yellow
+ // }
+ // log.Println("send.msg.conn.RemoteAddr|writedata",connTest.RemoteAddr(),writedata)
+ // v, err := connTest.Write(writedata)
+ // log.Println("send.msg.conn.v",v)
+ // if err != nil {
+ // log.Println("write msg error!", err)
+ // }
}
log.Println("yunhorndeug.push.data.tcp:",buffer.String(),addrs,dataType,values)