1. 修改按月查询的数据返回

2. 修复一点击即视的死锁问题

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,
     )
-    })
 
 }
 
 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{

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()