添加code常量

This commit is contained in:
fish 2019-03-28 15:03:57 +08:00
parent d82e284bb7
commit 612ed4b281
4 changed files with 25 additions and 10 deletions

14
golbalHelp.go Normal file
View File

@ -0,0 +1,14 @@
package main
const (
//云端数据交互code begin
//定时发送
CODE1001 = 1001
//人流量数据
CODE1004 = 1004
//数据变化时触发
CODE1005 = 1005
//评价
CODE1006 = 1006
//云端数据交互code end
)

View File

@ -117,6 +117,7 @@ func init() {
for a := 0; a < 8; a++ {
demoDevice.DATA["data"+strconv.Itoa(a+1)] = 0
}
demoDevice.ONLINE = true
log.Println("init demoDevice success:", demoDevice)

View File

@ -14,10 +14,10 @@ func main() {
go gw_router()
go serial_run()
c := cron.New()
send_data(1001)
send_data(CODE1001)
c.AddFunc("0, *, *, *, *, *", func() {
send_data(1001)
send_data(CODE1001)
})
c.AddFunc("*/10, *, *, *, *, *", func() {

View File

@ -62,7 +62,7 @@ func yunhorn_wireless(data_buf []byte) {
device.DATA = make(map[string]interface{})
device.DATA["data"] = data
send_data(1005, device)
send_data(CODE1005, device)
}
}
}
@ -150,7 +150,7 @@ func yunhorn_ys_l_v1(data_buf []byte) {
device.DATA = make(map[string]interface{})
device.DATA["data8"] = data_int[0]
device.Unlock()
DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
DEVICEDATAS.DATA[demoDevice.VERSION+"_1"].DATA["data8"] = data_int[0]
} else {
demoDevice.DATA["data"+strconv.Itoa(7)] = data_int[0]
var device Device
@ -161,14 +161,14 @@ func yunhorn_ys_l_v1(data_buf []byte) {
device.DATA = make(map[string]interface{})
device.DATA["data7"] = data_int[0]
device.Unlock()
DEVICEDATAS.DATA[demoDevice.VERSION+"_1"] = device
DEVICEDATAS.DATA[demoDevice.VERSION+"_1"].DATA["data7"] = data_int[0]
}
device.DATA = demoDevice.DATA
if conf.DEBUG {
log.Println(device)
}
send_data(1005, device)
send_data(CODE1005, device)
// var device2 Device
// device2.ID = "BDA9D650-5E4C-41A0-A78F-DA8A8D488E45"
@ -218,7 +218,7 @@ func yunhorn_kgl_l_v1(data_buf []byte) {
log.Println(device)
}
send_data(1005, device)
send_data(CODE1005, device)
}
// 采集并解析水表数据
@ -302,7 +302,7 @@ func yunhorn_xsy_l_v1(s *serial.Port, device_id string, command [][]byte, num st
DEVICEDATAS.Unlock()
if device.DATA["data"] != olddata.DATA["data"] {
send_data(1005, device)
send_data(CODE1005, device)
}
if conf.DEBUG {
log.Println(device)
@ -541,7 +541,7 @@ func yunhorn_kgl_c8_v1(s *serial.Port, device_id string, command [][]byte, num s
DEVICEDATAS.Unlock()
for i, k := range device.DATA {
if k != olddata.DATA[i] {
send_data(1005, device)
send_data(CODE1005, device)
break
}
}
@ -582,7 +582,7 @@ func yunhorn_kgl_c16_v1(s *serial.Port, device_id string, command [][]byte, num
DEVICEDATAS.Unlock()
for i, k := range device.DATA {
if k != olddata.DATA[i] {
send_data(1005, device)
send_data(CODE1005, device)
break
}
}