From aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 12:03:33 +0800
Subject: [PATCH] add ruleSo
---
controllers/camera.go | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index c660dca..56a2ad4 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -45,6 +45,9 @@
ResolutionHeight int `json:"resolution_height"`//鍒嗚鲸鐜囬珮
Sensors []SensorVo `json:"sensors"` //浼犳劅鍣ㄥ垪琛�
+
+ VoiceEnable bool `json:"voiceEnable"`
+ VoiceId string `json:"voiceId"`
}
type Resolution struct {
@@ -54,14 +57,13 @@
type SensorVo struct {
Id string `json:"id"`
- Type int `json:"type"`
+ Type string `json:"type"`
Ip string `json:"ip"`
Port int `json:"port"`
Username string `json:"username"`
Password string `json:"password"`
Threshold int `json:"threshold"`
Enable bool `json:"enable"`
- DevId string `json:"devId"`
}
// @Summary 娣诲姞鎽勫儚鏈�
@@ -113,6 +115,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
+ logger.Debug("camera sensors:", cam.Sensors)
paramBody := util.Struct2Map(cam)
if api.CameraUpdate(paramBody) {
util.ResponseFormat(c, code.Success, cam)
@@ -162,12 +165,22 @@
//2019-11-02鏂板闇�姹傦紝鏄剧ず姣忎釜鎽勫儚鏈虹殑澶勭悊鏈嶅姟鍣ㄤ俊鎭�,褰掑睘鐨勮妭鐐规湇鍔″櫒鍚嶇О
m := util.Struct2Map(camera)
m["runServerName"] = ""
+ m["resolution_width"] = camera.ResolutionWidth
+ m["resolution_height"] = camera.ResolutionHeight
//鎽勫儚鏈哄垎杈ㄧ巼
- dResolution := Resolution{
+ dRe0 := Resolution{
Width: 0,
Height: 0,
}
- m["resolutions"] = []Resolution{ dResolution }
+ dRe1 := Resolution{
+ Width: 1920,
+ Height: 1080,
+ }
+ dRe2 := Resolution{
+ Width: 2688,
+ Height: 1520,
+ }
+ m["resolutions"] = []Resolution{ dRe0, dRe1, dRe2 }
if camera.RunServerId !="" {
localConf, e := cache.GetServerInfo()
if e ==nil {
--
Gitblit v1.8.0