From 4ca3791590a7bf50222aa5f80e53edf04739108a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 22 十月 2024 17:20:23 +0800
Subject: [PATCH] fix 1400 post floor farmat
---
nvcs/osd.go | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/nvcs/osd.go b/nvcs/osd.go
index 5608cf6..1046498 100644
--- a/nvcs/osd.go
+++ b/nvcs/osd.go
@@ -2,9 +2,8 @@
import (
"encoding/xml"
+ "fmt"
"io/ioutil"
-
- "gat1400Exchange/pkg/logger"
dac "github.com/xinsnake/go-http-digest-auth-client"
)
@@ -18,9 +17,9 @@
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"`
@@ -42,29 +41,32 @@
return ioutil.ReadAll(resp.Body)
}
-func addFloorToOSD(osdText string) {
+func addFloorToOSD(osdText string) error {
overlay7Url := cameraWebAddr + hikISAPIOverlay7SetUrl
// 鑾峰彇宸︿笅瑙掔涓�涓瓧绗︾殑浣嶇疆
if overlayText.DisplayText == "" {
rsp, err := hikISAPIRequest(cameraWebUser, cameraWebPassword, "GET", overlay7Url, "")
if err != nil {
- logger.Warn("Get osd info failure")
- return
+ return fmt.Errorf("get osd info. %s", err.Error())
}
err = xml.Unmarshal(rsp, &overlayText)
if err != nil {
- logger.Warn("%s", err.Error())
- return
+ return fmt.Errorf("xml unmarshal. %s", err.Error())
}
+ }
+
+ if overlayText.DisplayText == osdText {
+ return nil
}
overlayText.DisplayText = osdText
body, _ := xml.Marshal(overlayText)
_, err := hikISAPIRequest(cameraWebUser, cameraWebPassword, "PUT", overlay7Url, string(body))
if err != nil {
- logger.Warn("Camera osd set failure!!")
- return
+ return fmt.Errorf("set osd. %s", err.Error())
}
+
+ return nil
}
--
Gitblit v1.8.0