kunmeng/HikNetSDKPkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
2. 修复一点击即视的死锁问题
This commit is contained in:
王帅锟
2024-11-14 09:44:00 +08:00
parent 763376a95c
commit 41d8da2401
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
HikBallCamera.go
View File

@@ -68,21 +68,17 @@ func (hikBC *HIKBallCamera) StopBus(Direction int) bool {
func (hikBC *HIKBallCamera) OneClickToSeeInFullView(point Point) bool { func (hikBC *HIKBallCamera) OneClickToSeeInFullView(point Point) bool {
TransPoint := hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.Matrix, point) TransPoint := hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.Matrix, point)
return hikBC.opt(func() bool { return hikBC.PtzTo(5,
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.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")),
float32(hikBC.mapping(hikBC.BallCameraCfg.Matrix.TStart, hikBC.BallCameraCfg.Matrix.TMax, TransPoint.Y, hikBC.BallCameraCfg.Matrix.TPositiveDirection, "inv")), 0.0,
0.0, )
)
})
} }
func (hikBC *HIKBallCamera) PTZ2FullView() (Point, error) { func (hikBC *HIKBallCamera) PTZ2FullView() (Point, error) {
var ptz PTZ var ptz PTZ
if !hikBC.opt(func() bool { if !hikBC.PTZGet(&ptz.P, &ptz.T, &ptz.Z) {
return hikBC.PTZGet(&ptz.P, &ptz.T, &ptz.Z)
}) {
return Point{}, fmt.Errorf("PTZ Get Error") return Point{}, fmt.Errorf("PTZ Get Error")
} }
return hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.InvMatrix, Point{ return hikBC.WarpingPtByHomography(hikBC.BallCameraCfg.Matrix.InvMatrix, Point{

4
HikNvr.go
View File

@@ -44,7 +44,8 @@ func (h *HIKNvr) CheckTimeRegionWithMonth(year int, month int) string {
h.mux.RLock() h.mux.RLock()
if h.State { if h.State {
h.mux.RUnlock() h.mux.RUnlock()
if checkTimeRegionWithMonth(h.core, year, month) == "" { data := checkTimeRegionWithMonth(h.core, year, month)
if data == "" {
h.mux.Lock() h.mux.Lock()
h.State = false h.State = false
h.mux.Unlock() h.mux.Unlock()
@@ -52,6 +53,7 @@ func (h *HIKNvr) CheckTimeRegionWithMonth(year int, month int) string {
h.mux.Lock() h.mux.Lock()
h.State = true h.State = true
h.mux.Unlock() h.mux.Unlock()
return data
} }
} else { } else {
h.mux.RUnlock() h.mux.RUnlock()