From 41d8da2401d9b95d88051c82197b662b31e33868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85=E9=94=9F?= <811096647@qq.com>
Date: Thu, 14 Nov 2024 09:44:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=8C=89=E6=9C=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=202.=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=82=B9=E5=87=BB=E5=8D=B3?=
 =?UTF-8?q?=E8=A7=86=E7=9A=84=E6=AD=BB=E9=94=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HikBallCamera.go | 16 ++++++----------
 HikNvr.go        |  4 +++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/HikBallCamera.go b/HikBallCamera.go
index 538ba8f..141dd58 100644
--- a/HikBallCamera.go
+++ b/HikBallCamera.go
@@ -68,21 +68,17 @@ func (hikBC *HIKBallCamera) StopBus(Direction int) bool {
 
 func (hikBC *HIKBallCamera) OneClickToSeeInFullView(point Point) bool {
     TransPoint := hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.Matrix, point)
-    return hikBC.opt(func() bool {
-        return hikBC.PtzTo(5,
-            float32(hikBC.mapping(hikBC.BallCameraCfg.Matrix.PStart, hikBC.BallCameraCfg.Matrix.PMax, TransPoint.X, hikBC.BallCameraCfg.Matrix.PPositiveDirection, "inv")),
-            float32(hikBC.mapping(hikBC.BallCameraCfg.Matrix.TStart, hikBC.BallCameraCfg.Matrix.TMax, TransPoint.Y, hikBC.BallCameraCfg.Matrix.TPositiveDirection, "inv")),
-            0.0,
-        )
-    })
+    return hikBC.PtzTo(5,
+        float32(hikBC.mapping(hikBC.BallCameraCfg.Matrix.PStart, hikBC.BallCameraCfg.Matrix.PMax, TransPoint.X, hikBC.BallCameraCfg.Matrix.PPositiveDirection, "inv")),
+        float32(hikBC.mapping(hikBC.BallCameraCfg.Matrix.TStart, hikBC.BallCameraCfg.Matrix.TMax, TransPoint.Y, hikBC.BallCameraCfg.Matrix.TPositiveDirection, "inv")),
+        0.0,
+    )
 
 }
 
 func (hikBC *HIKBallCamera) PTZ2FullView() (Point, error) {
     var ptz PTZ
-    if !hikBC.opt(func() bool {
-        return hikBC.PTZGet(&ptz.P, &ptz.T, &ptz.Z)
-    }) {
+    if !hikBC.PTZGet(&ptz.P, &ptz.T, &ptz.Z) {
         return Point{}, fmt.Errorf("PTZ Get Error")
     }
     return hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.InvMatrix, Point{
diff --git a/HikNvr.go b/HikNvr.go
index 7e7e458..8a49009 100644
--- a/HikNvr.go
+++ b/HikNvr.go
@@ -44,7 +44,8 @@ func (h *HIKNvr) CheckTimeRegionWithMonth(year int, month int) string {
     h.mux.RLock()
     if h.State {
         h.mux.RUnlock()
-        if checkTimeRegionWithMonth(h.core, year, month) == "" {
+        data := checkTimeRegionWithMonth(h.core, year, month)
+        if data == "" {
             h.mux.Lock()
             h.State = false
             h.mux.Unlock()
@@ -52,6 +53,7 @@ func (h *HIKNvr) CheckTimeRegionWithMonth(year int, month int) string {
             h.mux.Lock()
             h.State = true
             h.mux.Unlock()
+            return data
         }
     } else {
         h.mux.RUnlock()