注释测试内容以及添加类型判断

This commit is contained in:
fish 2019-06-24 09:41:25 +08:00
parent f341b7c42a
commit b0d515ef17
1 changed files with 42 additions and 41 deletions

View File

@ -116,6 +116,11 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
//尿布台数据地址1位 数据2位 //尿布台数据地址1位 数据2位
dataType := data[i+1] dataType := data[i+1]
if dataType!=1 && dataType!=2 && dataType!=3 && dataType!=4{
continue;
}
values := make([]byte,0) values := make([]byte,0)
@ -152,31 +157,29 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
continue continue
} }
values = data[i+2:i+end] values = data[i+2:i+end]
// log.Println("pm25data1",data[i+15])
log.Println("pm25data1",data[i+15]) // log.Println("pm25data2",data[i+16])
log.Println("pm25data2",data[i+16])
// nh3data := uint32(data[i+7])*256+uint32(data[i+8]) // nh3data := uint32(data[i+7])*256+uint32(data[i+8])
pm25data := uint32(data[i+15])*256+uint32(data[i+16]) // pm25data := uint32(data[i+15])*256+uint32(data[i+16])
log.Println("nh3data",data[i+7]) // log.Println("nh3data",data[i+7])
log.Println("pm25data",pm25data) // log.Println("pm25data",pm25data)
//8E 3C 00 00 47 46 //8E 3C 00 00 47 46
var close []byte = []byte{0x8E,0x3C,0x00,0x00,0x43,0x46} // var close []byte = []byte{0x8E,0x3C,0x00,0x00,0x43,0x46}
var open []byte = []byte{0x8E,0x3C,0x00,0x00,0x4F,0x46} // var open []byte = []byte{0x8E,0x3C,0x00,0x00,0x4F,0x46}
var writedata []byte =[]byte{} // var writedata []byte =[]byte{}
//i+7 氨气 //i+7 氨气
//i+14 tvoc 甲醛 //i+14 tvoc 甲醛
if pm25data>100 || data[i+7]>=3 || data[i+14]>=2 { // if pm25data>100 || data[i+7]>=3 || data[i+14]>=2 {
writedata = open // writedata = open
}else{ // }else{
writedata = close // writedata = close
} // }
v, err := connTest.Write(writedata) // v, err := connTest.Write(writedata)
log.Println("send.msg.conn.RemoteAddr:",connTest.RemoteAddr(),writedata) // log.Println("send.msg.conn.RemoteAddr:",connTest.RemoteAddr(),writedata)
log.Println("send.msg.conn.v",v) // log.Println("send.msg.conn.v",v)
if err != nil { // if err != nil {
log.Println("write msg error!", err) // log.Println("write msg error!", err)
} // }
}else if dataType ==3{ }else if dataType ==3{
continueCount = 2 continueCount = 2
end = 3 end = 3
@ -190,26 +193,24 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
values := data[i+2] values := data[i+2]
//28 3C 00 00 47 46 //28 3C 00 00 47 46
var green []byte = []byte{0x28,0x3C,0x00,0x00,0x47,0x46} // var green []byte = []byte{0x28,0x3C,0x00,0x00,0x47,0x46}
var red []byte = []byte{0x28,0x3C,0x00,0x00,0x52,0x46} // var red []byte = []byte{0x28,0x3C,0x00,0x00,0x52,0x46}
// var yellow []byte = []byte{0x28,0x3C,0x00,0x00,0x59,0x46}
var yellow []byte = []byte{0x28,0x3C,0x00,0x00,0x59,0x46} // var writedata []byte =[]byte{}
var writedata []byte =[]byte{} // writedata = green
writedata = green // if values == 2{
if values == 2{ // writedata = red
writedata = red // }else if values == 1{
}else if values == 1{ // writedata = green
writedata = green // }else if values == 4{
}else if values == 4{ // writedata = yellow
writedata = yellow // }
} // log.Println("send.msg.conn.RemoteAddr|writedata",connTest.RemoteAddr(),writedata)
log.Println("send.msg.conn.RemoteAddr|writedata",connTest.RemoteAddr(),writedata) // v, err := connTest.Write(writedata)
v, err := connTest.Write(writedata) // log.Println("send.msg.conn.v",v)
// if err != nil {
log.Println("send.msg.conn.v",v) // log.Println("write msg error!", err)
if err != nil { // }
log.Println("write msg error!", err)
}
} }
log.Println("yunhorndeug.push.data.tcp:",buffer.String(),addrs,dataType,values) log.Println("yunhorndeug.push.data.tcp:",buffer.String(),addrs,dataType,values)