From 15dc6df83a839f5913997e4e2a252a0714dc2978 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 13 六月 2024 11:39:33 +0800
Subject: [PATCH] osd 添加上下行
---
service/osd.go | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/service/osd.go b/service/osd.go
index e5f5728..3961ca3 100644
--- a/service/osd.go
+++ b/service/osd.go
@@ -16,6 +16,8 @@
CameraWebPassword = "a1234567"
)
+var overlayText TextOverlay
+
type TextOverlay struct {
Id int64 `xml:"id"`
Enabled bool `xml:"enabled"`
@@ -28,22 +30,25 @@
func AddFloorToOSD(osdText string) {
overlay7Url := CameraWebAddr + HikISAPIOverlaySetUrl
- rsp, err := ISAPIRequest(CameraWebUser, CameraWebPassword, "GET", overlay7Url, "")
- if err != nil {
- logger.Warn("Get osd info failure")
- return
- }
- var overlayText TextOverlay
- err = xml.Unmarshal(rsp, &overlayText)
- if err != nil {
- logger.Warn("%s", err.Error())
- return
+ // 鑾峰彇宸︿笅瑙掔涓�涓瓧绗︾殑浣嶇疆
+ if overlayText.DisplayText == "" {
+ rsp, err := ISAPIRequest(CameraWebUser, CameraWebPassword, "GET", overlay7Url, "")
+ if err != nil {
+ logger.Warn("Get osd info failure")
+ return
+ }
+
+ err = xml.Unmarshal(rsp, &overlayText)
+ if err != nil {
+ logger.Warn("%s", err.Error())
+ return
+ }
}
overlayText.DisplayText = osdText
body, _ := xml.Marshal(overlayText)
- _, err = ISAPIRequest(CameraWebUser, CameraWebPassword, "PUT", overlay7Url, string(body))
+ _, err := ISAPIRequest(CameraWebUser, CameraWebPassword, "PUT", overlay7Url, string(body))
if err != nil {
logger.Warn("Camera osd set failure!!")
return
--
Gitblit v1.8.0