From 2fc94ba7b517125a7ed9771b48bb5d383021bc91 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 20 十月 2024 01:57:09 +0800
Subject: [PATCH] 优化楼层数据获取
---
nvcs/osd.go | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/service/osd.go b/nvcs/osd.go
similarity index 64%
rename from service/osd.go
rename to nvcs/osd.go
index 3961ca3..5608cf6 100644
--- a/service/osd.go
+++ b/nvcs/osd.go
@@ -1,24 +1,26 @@
-package service
+package nvcs
import (
"encoding/xml"
- "gat1400Exchange/pkg/logger"
- dac "github.com/xinsnake/go-http-digest-auth-client"
"io/ioutil"
+
+ "gat1400Exchange/pkg/logger"
+
+ dac "github.com/xinsnake/go-http-digest-auth-client"
)
// 璁剧疆鍏朵粬瀛楃鐨勭涓�涓�, 浣嶇疆鍥哄畾浣�7
// 鎽勫儚鏈轰俊鎭殏鏃跺浐瀹�, 閬垮厤娉勯湶
const (
- HikISAPIOverlaySetUrl = "/ISAPI/System/Video/inputs/channels/1/overlays/text/7"
- CameraWebAddr = "http://192.168.10.11:40080"
- CameraWebUser = "admin"
- CameraWebPassword = "a1234567"
+ hikISAPIOverlay7SetUrl = "/ISAPI/System/Video/inputs/channels/1/overlays/text/7"
+ cameraWebAddr = "http://192.168.10.11:40080"
+ cameraWebUser = "admin"
+ cameraWebPassword = "a1234567"
)
-var overlayText TextOverlay
+var overlayText textOverlay
-type TextOverlay struct {
+type textOverlay struct {
Id int64 `xml:"id"`
Enabled bool `xml:"enabled"`
PositionX int64 `xml:"positionX"`
@@ -28,12 +30,24 @@
IsPersistentText bool `xml:"isPersistentText"`
}
-func AddFloorToOSD(osdText string) {
- overlay7Url := CameraWebAddr + HikISAPIOverlaySetUrl
+func hikISAPIRequest(username, password, method, url, body string) ([]byte, error) {
+ dr := dac.NewRequest(username, password, method, url, body)
+ resp, err := dr.Execute()
+ if err != nil {
+ return nil, err
+ }
+
+ defer resp.Body.Close()
+
+ return ioutil.ReadAll(resp.Body)
+}
+
+func addFloorToOSD(osdText string) {
+ overlay7Url := cameraWebAddr + hikISAPIOverlay7SetUrl
// 鑾峰彇宸︿笅瑙掔涓�涓瓧绗︾殑浣嶇疆
if overlayText.DisplayText == "" {
- rsp, err := ISAPIRequest(CameraWebUser, CameraWebPassword, "GET", overlay7Url, "")
+ rsp, err := hikISAPIRequest(cameraWebUser, cameraWebPassword, "GET", overlay7Url, "")
if err != nil {
logger.Warn("Get osd info failure")
return
@@ -48,21 +62,9 @@
overlayText.DisplayText = osdText
body, _ := xml.Marshal(overlayText)
- _, err := ISAPIRequest(CameraWebUser, CameraWebPassword, "PUT", overlay7Url, string(body))
+ _, err := hikISAPIRequest(cameraWebUser, cameraWebPassword, "PUT", overlay7Url, string(body))
if err != nil {
logger.Warn("Camera osd set failure!!")
return
}
-}
-
-func ISAPIRequest(username, password, method, url, body string) ([]byte, error) {
- dr := dac.NewRequest(username, password, method, url, body)
- resp, err := dr.Execute()
- if err != nil {
- return nil, err
- }
-
- defer resp.Body.Close()
-
- return ioutil.ReadAll(resp.Body)
}
--
Gitblit v1.8.0