From 2c84a93c4faad5e09900fc71f045a181bdb313a6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 三月 2020 18:55:26 +0800
Subject: [PATCH] fix
---
controllers/camera.go | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index c660dca..ea2b91b 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -54,14 +54,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 娣诲姞鎽勫儚鏈�
@@ -163,11 +162,19 @@
m := util.Struct2Map(camera)
m["runServerName"] = ""
//鎽勫儚鏈哄垎杈ㄧ巼
- 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