移除Golang的内容

1. 修改按月查询的数据返回
2. 修复一点击即视的死锁问题
2025-01-08 09:40:54 +08:00 · 2024-11-14 09:44:00 +08:00 · 2024-10-31 15:29:13 +08:00 · 2024-10-31 15:22:07 +08:00 · 2024-10-28 13:57:25 +08:00 · 2024-10-28 13:24:18 +08:00
17 changed files with 595 additions and 633 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+/.idea
+/.git
+/cmake-build-debug-visual-studio
+/V6.1.9.45_build20220902_ArmLinux64_ZH_20240802154010_lib.zip
+/V6.1.9.48_build20230410_linux64_20240829112751_lib.zip
+/V6.1.9.48_build20230410_win64_20240829112623_lib.zip
+/build
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
-/.idea
-/cmake-build-debug-visual-studio
-*.lib
-*.dll
-*.so
-*.a
-*.zip
+/.idea
+/.cache
+/.fleet
+/cmake-build-debug-visual-studio
+/cmake-build-release-visual-studio
+/cmake-build-debug
+*.lib
+*.dll
+*.so
+*.a
+*.zip
+/build
+/arm64_linux_lib
+/arm64_windows_lib
+/amd64_linux_lib
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,27 @@
-cmake_minimum_required(VERSION 3.29)
-project(HikNetSDKPkg)
+cmake_minimum_required(VERSION 3.15)

+project(HikNetSDKPkg CXX)
 set(CMAKE_CXX_STANDARD 11)
-include_directories("./src/include/Hik/amd64")
-add_compile_definitions(Export)
+
+set(OS ${CMAKE_HOST_SYSTEM_NAME})
+set(Arch ${CMAKE_HOST_SYSTEM_PROCESSOR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
+
+message(STATUS "Target Operating System: ${OS}")
+message(STATUS "Target Architecture: ${Arch}")
+
+if(OS STREQUAL "Windows")
+    set(CMAKE_DEBUG_POSTFIX "_win_amd64_d")
+    set(CMAKE_RELEASE_POSTFIX "_win_amd64")
+elseif (Arch STREQUAL "x86_64" OR Arch STREQUAL "amd64")
+    set(CMAKE_DEBUG_POSTFIX "_linux_amd64_d")
+    set(CMAKE_RELEASE_POSTFIX "_linux_amd64")
+elseif (Arch STREQUAL "aarch64" OR Arch STREQUAL "arm64")
+    set(CMAKE_DEBUG_POSTFIX "_linux_arm64_d")
+    set(CMAKE_RELEASE_POSTFIX "_linux_arm64")
+endif ()

 add_library(HikNetSDKPkg SHARED
        library.cpp
@@ -13,8 +31,34 @@ add_library(HikNetSDKPkg SHARED
        src/FormatTrans.cpp
 )

+target_compile_definitions(HikNetSDKPkg PRIVATE Export)

-target_link_directories(HikNetSDKPkg PUBLIC ./HCNetSDKamd64/lib)
-target_link_libraries(HikNetSDKPkg "HCNetSDK.lib")
-target_link_libraries(HikNetSDKPkg "HCCore.lib")
-target_link_libraries(HikNetSDKPkg "GdiPlus.lib")
+if(Arch STREQUAL "x86_64" OR OS STREQUAL "Windows")
+    target_include_directories(HikNetSDKPkg PRIVATE "./src/include/Hik/amd64")
+elseif (Arch STREQUAL "aarch64")
+    target_include_directories(HikNetSDKPkg PRIVATE "./src/include/Hik/arm64")
+endif ()
+
+if(OS STREQUAL "Windows")
+    target_link_directories(HikNetSDKPkg PRIVATE "./arm64_windows_lib")
+    target_link_libraries(HikNetSDKPkg PRIVATE "HCNetSDK.lib")
+    target_link_libraries(HikNetSDKPkg PRIVATE "HCCore.lib")
+    target_link_libraries(HikNetSDKPkg PRIVATE "GdiPlus.lib")
+elseif (Arch STREQUAL "x86_64" OR Arch STREQUAL "amd64")
+    target_link_directories(HikNetSDKPkg PRIVATE "./amd64_linux_lib")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libHCCore.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libhcnetsdk.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libhpr.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libz.so")
+elseif (Arch STREQUAL "aarch64")
+    target_link_directories(HikNetSDKPkg PRIVATE "./arm64_linux_lib")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libAudioRender.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libcrypto.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libHCCore.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libhcnetsdk.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libhpr.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libPlayCtrl.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libssl.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libSuperRender.so")
+    target_link_libraries(HikNetSDKPkg PRIVATE "libz.so")
+endif ()
--- a/22
+++ b/22
@@ -0,0 +1,22 @@
+FROM r-2.top/alpine:3.19 AS deps
+
+WORKDIR /usr
+
+RUN apk add gcc g++ cmake make acl
+
+FROM r-2.top/alpine:3.19 AS build
+
+WORKDIR /hikbuild
+
+COPY --from=deps /usr /usr
+COPY --from=deps /lib /lib
+COPY . /hikbuild
+
+RUN cmake . -D Arch=${TARGETARCH} -D CMAKE_BUILD_TYPE=RELEASE && make
+
+FROM r-2.top/alpine:3.19 AS export
+
+WORKDIR /home
+COPY --from=build /hikbuild/build /home
+
+#docker buildx build --platform linux/amd64,linux/arm64 --output type=local,dest=/hikbuild/ .
--- a/Hikvision.go
+++ b/Hikvision.go
@@ -1,107 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/ebitengine/purego"
-	"runtime"
-	"unsafe"
-)
-
-var libc uintptr
-
-var (
-	DVR_Init func() bool
-
-	newHIKBallCamera func() unsafe.Pointer
-	initBallCamera   func(core unsafe.Pointer, ip string, port string, username string, password string, BallMachineType string) bool
-	ptzTo            func(core unsafe.Pointer, Action int, P float32, T float32, Z float32) bool
-	ptzGet           func(unsafe.Pointer, unsafe.Pointer, unsafe.Pointer, unsafe.Pointer) bool
-	stopBus          func(unsafe.Pointer, int) bool
-	startBus         func(unsafe.Pointer, int, int) bool
-
-	newHIKNvr                func() unsafe.Pointer
-	initNvr                  func(unsafe.Pointer, string, string, string, string, int) bool
-	checkTimeRegionWithMonth func(core unsafe.Pointer, year int, month int) string
-	checkTimeRegionWithDay   func(core unsafe.Pointer, year int, month int, day int) string
-)
-
-func init() {
-	var err error
-	libc, err = openLibrary(getSystemLibrary())
-	if err != nil {
-		panic(err)
-	}
-
-	purego.RegisterLibFunc(&DVR_Init, libc, "DVR_Init")
-
-	purego.RegisterLibFunc(&newHIKBallCamera, libc, "NewHIKBallCamera")
-	purego.RegisterLibFunc(&initBallCamera, libc, "InitBallCamera")
-	purego.RegisterLibFunc(&ptzTo, libc, "PtzGotoPut")
-	purego.RegisterLibFunc(&ptzGet, libc, "PtzGet")
-	purego.RegisterLibFunc(&stopBus, libc, "StopBus")
-	purego.RegisterLibFunc(&startBus, libc, "StartBus")
-
-	purego.RegisterLibFunc(&newHIKNvr, libc, "NewHIKNvr")
-	purego.RegisterLibFunc(&initNvr, libc, "InitNvr")
-	purego.RegisterLibFunc(&checkTimeRegionWithMonth, libc, "CheckTimeRegionWithMonth")
-	purego.RegisterLibFunc(&checkTimeRegionWithDay, libc, "CheckTimeRegionWithDay")
-
-}
-
-func getSystemLibrary() string {
-	switch runtime.GOOS {
-	case "linux":
-		return "libc.so.6"
-	case "windows":
-		return "Hikvision_Network_SDK_Packaging_Library.dll"
-	default:
-		panic(fmt.Errorf("GOOS=%s is not supported", runtime.GOOS))
-	}
-}
-
-type HIKBallCamera struct {
-	core unsafe.Pointer
-}
-
-func NewHIKBallCamera() *HIKBallCamera {
-	return &HIKBallCamera{
-		core: newHIKBallCamera(),
-	}
-}
-
-func (h *HIKBallCamera) Login(ip string, port string, username string, password string, BallMachineType string) bool {
-	return initBallCamera(h.core, ip, port, username, password, BallMachineType)
-}
-func (h *HIKBallCamera) PtzTo(Action int, P, T, Z float32) bool {
-	return ptzTo(h.core, Action, P, T, Z)
-}
-func (h *HIKBallCamera) PTZGet(P, T, Z *float32) bool {
-	return ptzGet(h.core, unsafe.Pointer(P), unsafe.Pointer(T), unsafe.Pointer(Z))
-}
-func (h *HIKBallCamera) StopBus(Direction int) bool {
-	return stopBus(h.core, Direction)
-}
-func (h *HIKBallCamera) StartBus(Direction, Speed int) bool {
-	return startBus(h.core, Direction, Speed)
-}
-
-type HIKNvr struct {
-	core unsafe.Pointer
-}
-
-func NewHIKNvr() *HIKNvr {
-	return &HIKNvr{
-		core: newHIKNvr(),
-	}
-}
-
-func (h *HIKNvr) Login(ip string, port string, username string, password string, nvrType int) bool {
-	return initNvr(h.core, ip, port, username, password, nvrType)
-}
-
-func (h *HIKNvr) CheckTimeRegionWithMonth(year int, month int) string {
-	return checkTimeRegionWithMonth(h.core, year, month)
-}
-func (h *HIKNvr) CheckTimeRegionWithDay(year int, month int, day int) string {
-	return checkTimeRegionWithDay(h.core, year, month, day)
-}
--- a/README.md
+++ b/README.md
@@ -0,0 +1,28 @@
+## 已验证系统环境
+
+|   架构    |     系统      |使用docker |
+|:-------:|:-----------:|:-------:|
+| aarch64 | alpine:3.19 |   🐳    |
+| x86_64  | alpine:3.19 |   🐳    |
+| x86_64  | windows 10  |         |
+
+## 编译流程
+### 1. 下载库
+在仓库的发行版中 将 HikNetSDK 标签下的不同架构的 lib 放在源码根目录中
+```shell
+D:.
+│  V6.1.9.45_build20220902_ArmLinux64_ZH_20240802154010_lib.zip
+│  V6.1.9.48_build20230410_linux64_20240829112751_lib.zip
+│  V6.1.9.48_build20230410_win64_20240829112623_lib.zip
+```
+### 2.1 编译 Linux 部分
+将下载的zip压缩文件 `ArmLinux64` 和 `linux64` 在源码目录解压,然后重命名
+```shell
+V6.1.9.45···ArmLinux64···.zip   --解压后重命名为--> arm64_linux_lib
+V6.1.9.48···linux64···.zip    --解压后重命名为--> amd64_linux_lib
+```
+### 2.2 编译 Windows 部分
+将下载的zip压缩文件 `win64` 在源码目录解压,然后重命名
+```shell
+V6.1.9.45···win64···.zip   --解压后重命名为--> arm64_windows_lib
+```
--- a/go.mod
+++ b/go.mod
@@ -1,5 +0,0 @@
-module Hik_GoC
-
-go 1.23.1
-
-require github.com/ebitengine/purego v0.8.0
--- a/go.sum
+++ b/go.sum
@@ -1,2 +0,0 @@
-github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
-github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
--- a/include/library.h
+++ b/include/library.h
@@ -1,13 +1,18 @@
 #ifndef HIKVISION_NETWORK_SDK_PACKAGING_LIBRARY_LIBRARY_H
 #define HIKVISION_NETWORK_SDK_PACKAGING_LIBRARY_LIBRARY_H

-#ifdef Export
-#define Omnimatrix __declspec(dllexport)
+#ifdef _WIN32
+    #ifdef Export
+        #define Omnimatrix __declspec(dllexport)
+    #else
+        #define Omnimatrix __declspec(dllimport)
+    #endif
 #else
-#define Omnimatrix __declspec(dllimport)
+    #define Omnimatrix
 #endif


+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -24,6 +29,7 @@ extern "C" {
    Omnimatrix bool InitNvr(void* PtrHIKNvr,char* ip, char* port, char* username, char* password, int channel);
    Omnimatrix char* CheckTimeRegionWithMonth(void* PtrHIKNvr,int year,int month);
    Omnimatrix char* CheckTimeRegionWithDay(void* PtrHIKNvr,int year,int month,int day);
+    Omnimatrix int NvrUTCDiff(void* PtrHIKNvr);

 #ifdef __cplusplus
 }
--- a/library.cpp
+++ b/library.cpp
@@ -3,50 +3,50 @@
 #include "src/HIKNvr.h"
 #include <cstring>

-bool DVR_Init(){
+bool DVR_Init() {
    return HK_DVR_Init();
 }

-void* NewHIKBallCamera() {
+void *NewHIKBallCamera() {
    return new HIKBallCamera();
 }

-bool InitBallCamera(void* PtrHIKBallCamera,const char* ip, const char* port,const char* username,const char* password,const char* BallMachineType){
-    auto* HIKBallCameraObj = (HIKBallCamera*)PtrHIKBallCamera;
-    return HIKBallCameraObj->InitBallCamera(ip,port,username,password,BallMachineType);
+bool InitBallCamera(void *PtrHIKBallCamera, const char *ip, const char *port, const char *username, const char *password, const char *BallMachineType) {
+    auto *HIKBallCameraObj = (HIKBallCamera *)PtrHIKBallCamera;
+    return HIKBallCameraObj->InitBallCamera(ip, port, username, password, BallMachineType);
 }

-bool PtzGotoPut(void* PtrHIKBallCamera,int Action, float P, float T, float Z){
-    auto* HIKBallCameraObj = (HIKBallCamera*)PtrHIKBallCamera;
-    return HIKBallCameraObj->PtzGotoPut(Action,P,T,Z);
+bool PtzGotoPut(void *PtrHIKBallCamera, int Action, float P, float T, float Z) {
+    auto *HIKBallCameraObj = (HIKBallCamera *)PtrHIKBallCamera;
+    return HIKBallCameraObj->PtzGotoPut(Action, P, T, Z);
 }

-bool PtzGet(void* PtrHIKBallCamera,void *P, void *T, void *Z){
-    auto* HIKBallCameraObj = (HIKBallCamera*)PtrHIKBallCamera;
-    return HIKBallCameraObj->PtzGet((float*)P,(float*)T,(float*)Z);
+bool PtzGet(void *PtrHIKBallCamera, void *P, void *T, void *Z) {
+    auto *HIKBallCameraObj = (HIKBallCamera *)PtrHIKBallCamera;
+    return HIKBallCameraObj->PtzGet((float *)P, (float *)T, (float *)Z);
 }

-bool StopBus(void* PtrHIKBallCamera,int direction){
-    auto* HIKBallCameraObj = (HIKBallCamera*)PtrHIKBallCamera;
+bool StopBus(void *PtrHIKBallCamera, int direction) {
+    auto *HIKBallCameraObj = (HIKBallCamera *)PtrHIKBallCamera;
    return HIKBallCameraObj->StopBus(direction);
 }

-bool StartBus(void* PtrHIKBallCamera,int direction,int speed){
-    auto* HIKBallCameraObj = (HIKBallCamera*)PtrHIKBallCamera;
-    return HIKBallCameraObj->StartBus(direction,speed);
+bool StartBus(void *PtrHIKBallCamera, int direction, int speed) {
+    auto *HIKBallCameraObj = (HIKBallCamera *)PtrHIKBallCamera;
+    return HIKBallCameraObj->StartBus(direction, speed);
 }

-void* NewHIKNvr(){
+void *NewHIKNvr() {
    return new HIKNvr();
 }

-bool InitNvr(void* PtrHIKNvr,char* ip, char* port, char* username, char* password, int channel){
-    auto* HIKNvrObj = (HIKNvr*)PtrHIKNvr;
-    return HIKNvrObj->InitNvr(ip,port,username,password,channel);
+bool InitNvr(void *PtrHIKNvr, char *ip, char *port, char *username, char *password, int channel) {
+    auto *HIKNvrObj = (HIKNvr *)PtrHIKNvr;
+    return HIKNvrObj->InitNvr(ip, port, username, password, channel);
 }

-char* CheckTimeRegionWithMonth(void* PtrHIKNvr,int year,int month){
-    auto* HIKNvrObj = (HIKNvr*)PtrHIKNvr;
+char *CheckTimeRegionWithMonth(void *PtrHIKNvr, int year, int month) {
+    auto *HIKNvrObj = (HIKNvr *)PtrHIKNvr;

    DateTime select_time;
    select_time.year() = year;
@@ -58,17 +58,18 @@ char* CheckTimeRegionWithMonth(void* PtrHIKNvr,int year,int month){
    std::vector<int> available_date_vec;
    nRet = HIKNvrObj->CheckTimeRegionWithMonth(select_time, available_date_vec);

-    if (nRet == 0)
-    {
+    if (nRet == 0) {
        res = HIKNvrObj->TimeToJson(select_time, &available_date_vec).dump();
+    }else{
+        res = "";
    }
-    char* cString = new char[res.size() + 1];
-    strcpy_s(cString, res.size()+1,res.c_str());
+    char *cString = new char[res.size() + 1];
+    std::strcpy(cString, res.c_str());
    return cString;
 }

-char* CheckTimeRegionWithDay(void* PtrHIKNvr,int year,int month,int day){
-    auto* HIKNvrObj = (HIKNvr*)PtrHIKNvr;
+char *CheckTimeRegionWithDay(void *PtrHIKNvr, int year, int month, int day) {
+    auto *HIKNvrObj = (HIKNvr *)PtrHIKNvr;
    DateTime select_time;
    select_time.year() = year;
    select_time.month() = month;
@@ -76,11 +77,17 @@ char* CheckTimeRegionWithDay(void* PtrHIKNvr,int year,int month,int day){
    std::string res;
    std::vector<TimeRecord> available_time_vec;
    int nRet = HIKNvrObj->CheckTimeRegionWithDay(select_time, available_time_vec);
-    if (nRet == 0)
-    {
-         res = HIKNvrObj->TimeToJsonInDay(select_time, &available_time_vec).dump();
+    if (nRet == 0) {
+        res = HIKNvrObj->TimeToJsonInDay(select_time, &available_time_vec).dump();
+    }else{
+        res = "";
    }
-    char* cString = new char[res.size() + 1];
-    strcpy_s(cString, res.size()+1,res.c_str());
+    char *cString = new char[res.size() + 1];
+    std::strcpy(cString, res.c_str());
    return cString;
+}
+
+int NvrUTCDiff(void *PtrHIKNvr) {
+    auto *HIKNvrObj = (HIKNvr *)PtrHIKNvr;
+    return HIKNvrObj->GetNvrUTCDiff();
 }
--- a/main.go
+++ b/main.go
@@ -1,25 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	SdkInitState := DVR_Init()
-	println(SdkInitState)
-	//BallCamera := NewHIKBallCamera()
-	//res := BallCamera.Login("192.168.211.49", "8000", "admin", "Max123456", "BuKongQiu")
-	//if !res {
-	//	fmt.Println("Login Failed")
-	//	//return
-	//}
-	//var P, T, Z float32
-	//println(BallCamera.PTZGet(&P, &T, &Z))
-	Nvr := NewHIKNvr()
-	res := Nvr.Login("192.168.211.124", "8000", "admin", "guanyaokeji8520", 1)
-	if !res {
-		fmt.Println("Login Failed")
-		return
-	}
-	fmt.Println(Nvr.CheckTimeRegionWithMonth(2024, 10))
-	fmt.Println(Nvr.CheckTimeRegionWithDay(2024, 10, 8))
-
-}
--- a/openLibary_unix.go
+++ b/openLibary_unix.go
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2023 The Ebitengine Authors
-
-//go:build darwin || freebsd || linux
-
-package main
-
-import "github.com/ebitengine/purego"
-
-func openLibrary(name string) (uintptr, error) {
-	return purego.Dlopen(name, purego.RTLD_NOW|purego.RTLD_GLOBAL)
-}
--- a/openLibrary_windows.go
+++ b/openLibrary_windows.go
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2023 The Ebitengine Authors
-
-package main
-
-import "syscall"
-
-func openLibrary(name string) (uintptr, error) {
-	// Use [syscall.LoadLibrary] here to avoid external dependencies (#270).
-	// For actual use cases, [golang.org/x/sys/windows.NewLazySystemDLL] is recommended.
-	handle, err := syscall.LoadLibrary(name)
-	return uintptr(handle), err
-}
--- a/src/HIKBallCamera.cpp
+++ b/src/HIKBallCamera.cpp
@@ -1,377 +1,381 @@
-#include "HIKBallCamera.h"
-#include "FormatTrans.h"
-#include <vector>
-#include <sstream>
-
-HIKBallCamera::HIKBallCamera(){
-
-};
-
-struct PTZ{
-    float P;
-    float T;
-    float Z;
-};
-
-PTZ PTZDATA;
-
-std::vector<std::string> velocity = {"0a","14","1e","28","32","3c","ff"};
-
-bool HIKBallCamera::InitBallCamera(std::string ip, std::string port, std::string username, std::string password, std::string BallMachineType)
-{
-    int res = Login(ip, port, username, password);
-    if (res != 0){
-        std::cout << "Incorrect Login" << std::endl;
-        return false;
-    }
-
-    m_Channel = DeviceInfo.byStartChan;
-    this->BallMachineType = BallMachineType;
-
-    //建立透明通道
-    NET_DVR_SERIALSTART_V40 struSerialParam = { 0 };
-    struSerialParam.dwSize = sizeof(struSerialParam);
-    struSerialParam.dwSerialType = 2;//1:232串口；2:485串口
-    struSerialParam.bySerialNum = 1;//串口编号（设备支持多个RS232串口时有效）
-    lTranHandle = NET_DVR_SerialStart_V40(LoginID, &struSerialParam, sizeof(struSerialParam), g_fSerialDataCallBack, NULL);//设置回调函数获取透传数据
-    if (lTranHandle < 0)
-    {
-        printf("NET_DVR_SerialStart error, %d\n", NET_DVR_GetLastError());
-        NET_DVR_Logout(LoginID);
-        NET_DVR_Cleanup();
-        return false;
-    }
-
-    return true;
-}
-
-//回调透传数据函数的外部实现
-void CALLBACK HIKBallCamera::g_fSerialDataCallBack(LONG lSerialHandle,	LONG lChannel, char *pRecvDataBuffer, DWORD dwBufSize, void *pUser)
-{
-    std::string type = charToHex(pRecvDataBuffer[3]);
-    if (type=="59"){
-        PTZDATA.P = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
-    }else if (type == "5B"){
-        PTZDATA.T = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
-    }else if (type == "5D"){
-        PTZDATA.Z = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
-    }
-}
-
-bool HIKBallCamera::PtzControl(int command, int stop, int speed)
-{
-    bool Ret = false;
-    //use HIK SDK to control the ball camera
-    Ret = NET_DVR_PTZControlWithSpeed_Other(LoginID,m_Channel, command, stop, speed);
-
-    //get the error code
-    if(!Ret)
-    {
-        std::cout << "PTZ control failed! Error code: " << NET_DVR_GetLastError() << std::endl;
-        return false;
-    }
-    return true;
-}
-
-bool HIKBallCamera::PtzControlLeft(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 04 "+velocity[speed - 1]+" 00";
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(PAN_LEFT, state, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlRight(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 02 "+velocity[speed - 1]+" 00";
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(PAN_RIGHT, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlUp(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 08 00 "+velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(TILT_UP, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlDown(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 10 00 "+velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(TILT_DOWN, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlZoomIn(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        SerialSend(PrepareHexString("ff 01 00 20 00 00 21"));
-        return true;
-    }else{
-        return PtzControl(ZOOM_IN, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlZoomOut(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        SerialSend(PrepareHexString("ff 01 00 40 00 00 41"));
-        return true;
-    }else{
-        return PtzControl(ZOOM_OUT, 0, speed);
-    }
-}
-
-
-bool HIKBallCamera::PtzControlFocusAdd(int speed,int state){
-    if (BallMachineType=="BuKongQiu") {
-        std::cout << "ff 01 01 00 00 00 02" << std::endl;
-        SerialSend(PrepareHexString("ff 01 01 00 00 00 02"));
-        return true;
-    }else{
-        return PtzControl(ZOOM_OUT, 1, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlFocusSub(int speed,int state){
-    if (BallMachineType=="BuKongQiu") {
-        std::cout << "ff 01 00 80 00 00 81" << std::endl;
-        SerialSend(PrepareHexString("ff 01 00 80 00 00 81"));
-        return true;
-    }else{
-        return PtzControl(ZOOM_OUT, 1, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlStop(){
-    SerialSend(PrepareHexString("ff 01 00 00 00 00 01"));
-    return true;
-}
-
-
-bool HIKBallCamera::PtzControlUpLeft(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 0c "+velocity[speed - 1]+" " + velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(UP_LEFT, state, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlUpRight(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 0a "+velocity[speed - 1]+" " + velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(UP_RIGHT, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlDownLeft(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 14 "+velocity[speed - 1]+" " + velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(DOWN_LEFT, 0, speed);
-    }
-}
-
-bool HIKBallCamera::PtzControlDownRight(int speed,int state)
-{
-    if (BallMachineType=="BuKongQiu") {
-        std::string buf = "ff 01 00 12 "+velocity[speed - 1]+" " + velocity[speed - 1];
-        buf = buf +" "+ verify(buf);
-        SerialSend(PrepareHexString(buf));
-        return true;
-    }else{
-        return PtzControl(DOWN_RIGHT, 0, speed);
-    }
-}
-
-std::string addSpacesEveryTwoWords(const std::string& hex) {
-    std::ostringstream result;
-
-    int len = hex.length();
-    // 如果十六进制字符串的长度是奇数，则在前面添加一个 0
-    std::string paddedHex = (len % 2 == 1) ? "0" + hex : hex;
-    // 遍历字符串，每两个字符分割一次
-    for (size_t i = 0; i < paddedHex.length(); i += 2) {
-        if (i != 0) {
-            result << " ";
-        }
-        result << paddedHex.substr(i, 2);
-    }
-    return result.str();
-}
-std::string padding(const std::string& hex){
-    if (hex.length()==2){
-        return "00 "+hex;
-    } else{
-        return hex;
-    }
-}
-
-
-// PTZ 跳转到指定位置
-bool HIKBallCamera::PtzGotoPut(int Action, float P, float T, float Z)
-{
-    if (BallMachineType=="BuKongQiu"){
-        std::string pHex = decimalToHexadecimal(P * 100);
-        pHex = padding(addSpacesEveryTwoWords(pHex));
-        std::string tHex = decimalToHexadecimal(T * 100);
-        tHex = padding(addSpacesEveryTwoWords(tHex));
-        std::string zHex = decimalToHexadecimal(Z * 100);
-        zHex = padding(addSpacesEveryTwoWords(zHex));
-        std::string pBuf = "ff 01 00 4b "+ pHex;
-        std::string tBuf = "ff 01 00 4d "+ tHex;
-        std::string zBuf = "ff 01 00 4f "+ zHex;
-        pBuf = pBuf+" "+verify(pBuf);
-        tBuf = tBuf+" "+verify(tBuf);
-        zBuf = zBuf+" "+verify(zBuf);
-        switch (Action) {
-            case 1:
-                SerialSend(PrepareHexString(pBuf)); // 设置 P
-                SerialSend(PrepareHexString(tBuf)); // 设置 T
-                SerialSend(PrepareHexString(zBuf)); // 设置 Z
-                break;
-            case 2:
-                SerialSend(PrepareHexString(pBuf)); // 设置 P
-                break;
-            case 3:
-                SerialSend(PrepareHexString(tBuf)); // 设置 T
-                break;
-            case 4:
-                SerialSend(PrepareHexString(zBuf)); // 设置 Z
-                break;
-            case 5:
-                SerialSend(PrepareHexString(pBuf)); // 设置 P
-                SerialSend(PrepareHexString(tBuf)); // 设置 T
-                break;
-            default:
-                break;
-        }
-        return true;
-    }else{
-        NET_DVR_PTZPOS ptzPosCurrent;
-        ptzPosCurrent.wPanPos = DEC2HEX(P);
-        ptzPosCurrent.wTiltPos = DEC2HEX(T);
-        ptzPosCurrent.wAction = 5;
-
-        bool b = NET_DVR_SetDVRConfig(LoginID, NET_DVR_SET_PTZPOS, m_Channel, &ptzPosCurrent, sizeof(NET_DVR_PTZPOS));
-        return b;
-    }
-}
-bool HIKBallCamera::SerialSend(const std::string& hex){
-    char m_DataBuf[50];
-    int m_DataLen;
-    int len = hex.length();
-    m_DataLen = len<1024 ? len : 1024;
-    memcpy(m_DataBuf,hex.c_str(),m_DataLen);
-    return NET_DVR_SerialSend(lTranHandle,1, m_DataBuf, m_DataLen);
-}
-
-bool HIKBallCamera::PtzGet(float* posP, float* posT, float* posZ) {
-    if (BallMachineType=="BuKongQiu"){
-        SerialSend(PrepareHexString("ff 01 00 51 00 00 52"));
-        SerialSend(PrepareHexString("ff 01 00 53 00 00 54"));
-        SerialSend(PrepareHexString("ff 01 00 55 00 00 56"));
-        SLEEP(1);
-        *posP = PTZDATA.P;
-        *posT = PTZDATA.T;
-        *posZ = PTZDATA.Z;
-        return true;
-    }else{
-        NET_DVR_PTZPOS ptzPosCurrent;
-        DWORD dwtmp;
-        bool b = NET_DVR_GetDVRConfig(LoginID, NET_DVR_GET_PTZPOS, m_Channel, &ptzPosCurrent, sizeof(NET_DVR_PTZPOS),&dwtmp);
-        float P = HEX2DEC(ptzPosCurrent.wPanPos);
-        float T = HEX2DEC(ptzPosCurrent.wTiltPos);
-        float Z = HEX2DEC(ptzPosCurrent.wZoomPos);
-        posP = &P;
-        posT = &T;
-        posZ = &Z;
-        return b;
-    }
-}
-
-bool HIKBallCamera::CmdSwitch(int direction,int speed,int state){
-    bool Res = false;
-    switch (direction) {
-        case PTZ_LEFT:
-            Res = PtzControlLeft(speed,state);
-            break;
-        case PTZ_RIGHT:
-            Res = PtzControlRight(speed,state);
-            break;
-        case PTZ_UP:
-            Res = PtzControlUp(speed,state);
-            break;
-        case PTZ_DOWN:
-            Res = PtzControlDown(speed,state);
-            break;
-        case PTZ_UP_LEFT:
-            Res = PtzControlUpLeft(speed,state);
-            break;
-        case PTZ_UP_RIGHT:
-            Res = PtzControlUpRight(speed,state);
-            break;
-        case PTZ_DOWN_LEFT:
-            Res = PtzControlDownLeft(speed,state);
-            break;
-        case PTZ_DOWN_RIGHT:
-            Res = PtzControlDownRight(speed,state);
-            break;
-        case PTZ_ZOOM_IN:
-            Res = PtzControlZoomIn(speed,state);
-            break;
-        case PTZ_ZOOM_OUT:
-            Res = PtzControlZoomOut(speed,state);
-            break;
-        case PTZ_Focus_Far:
-            Res = PtzControlFocusSub(speed,state);
-            break;
-        case PTZ_Focus_Near:
-            Res = PtzControlFocusAdd(speed,state);
-            break;
-    }
-    return Res;
-}
-
-bool HIKBallCamera::StopBus(int direction) {
-    if (BallMachineType=="BuKongQiu"){
-        return PtzControlStop();
-    }
-    return CmdSwitch(direction,0,1);
-}
-
-bool HIKBallCamera::StartBus(int direction, int speed) {
-    return CmdSwitch(direction,speed,0);
-}
+#include "HIKBallCamera.h"
+
+#include <cstring>
+
+#include "FormatTrans.h"
+#include <vector>
+#include <sstream>
+
+HIKBallCamera::HIKBallCamera(){
+
+};
+
+struct PTZ{
+    float P;
+    float T;
+    float Z;
+};
+
+PTZ PTZDATA;
+
+std::vector<std::string> velocity = {"0a","14","1e","28","32","3c","ff"};
+
+bool HIKBallCamera::InitBallCamera(std::string ip, std::string port, std::string username, std::string password, std::string BallMachineType)
+{
+    int res = Login(ip, port, username, password);
+    if (res != 0){
+        std::cout << "Incorrect Login error code:" << res << std::endl;
+        return false;
+    }
+
+    m_Channel = DeviceInfo.byStartChan;
+    this->BallMachineType = BallMachineType;
+
+    if (BallMachineType == "BuKongQiu"){
+        NET_DVR_SERIALSTART_V40 struSerialParam = { 0 };
+        struSerialParam.dwSize = sizeof(struSerialParam);
+        struSerialParam.dwSerialType = 2;//1:232串口；2:485串口
+        struSerialParam.bySerialNum = 1;//串口编号（设备支持多个RS232串口时有效）
+        lTranHandle = NET_DVR_SerialStart_V40(LoginID, &struSerialParam, sizeof(struSerialParam), g_fSerialDataCallBack, NULL);//设置回调函数获取透传数据
+        if (lTranHandle < 0)
+        {
+            printf("NET_DVR_SerialStart error, %d\n", NET_DVR_GetLastError());
+            NET_DVR_Logout(LoginID);
+            NET_DVR_Cleanup();
+            return false;
+        }
+    }
+    return true;
+}
+
+//回调透传数据函数的外部实现
+void CALLBACK HIKBallCamera::g_fSerialDataCallBack(LONG lSerialHandle,	LONG lChannel, char *pRecvDataBuffer, DWORD dwBufSize, void *pUser)
+{
+    std::string type = charToHex(pRecvDataBuffer[3]);
+    if (type=="59"){
+        PTZDATA.P = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
+    }else if (type == "5B"){
+        PTZDATA.T = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
+    }else if (type == "5D"){
+        PTZDATA.Z = float(hexadecimalToDecimal(charToHex(pRecvDataBuffer[4])+charToHex(pRecvDataBuffer[5])))/100.0;
+    }
+}
+
+bool HIKBallCamera::PtzControl(int command, int stop, int speed)
+{
+    bool Ret = false;
+    //use HIK SDK to control the ball camera
+    Ret = NET_DVR_PTZControlWithSpeed_Other(LoginID,m_Channel, command, stop, speed);
+
+    //get the error code
+    if(!Ret)
+    {
+        std::cout << "PTZ control failed! Error code: " << NET_DVR_GetLastError() << std::endl;
+        return false;
+    }
+    return true;
+}
+
+bool HIKBallCamera::PtzControlLeft(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 04 "+velocity[speed - 1]+" 00";
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(PAN_LEFT, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlRight(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 02 "+velocity[speed - 1]+" 00";
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(PAN_RIGHT, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlUp(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 08 00 "+velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(TILT_UP, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlDown(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 10 00 "+velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(TILT_DOWN, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlZoomIn(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        SerialSend(PrepareHexString("ff 01 00 20 00 00 21"));
+        return true;
+    }else{
+        return PtzControl(ZOOM_IN, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlZoomOut(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        SerialSend(PrepareHexString("ff 01 00 40 00 00 41"));
+        return true;
+    }else{
+        return PtzControl(ZOOM_OUT, state, speed);
+    }
+}
+
+
+bool HIKBallCamera::PtzControlFocusAdd(int speed,int state){
+    if (BallMachineType=="BuKongQiu") {
+        std::cout << "ff 01 01 00 00 00 02" << std::endl;
+        SerialSend(PrepareHexString("ff 01 01 00 00 00 02"));
+        return true;
+    }else{
+        return PtzControl(FOCUS_FAR, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlFocusSub(int speed,int state){
+    if (BallMachineType=="BuKongQiu") {
+        std::cout << "ff 01 00 80 00 00 81" << std::endl;
+        SerialSend(PrepareHexString("ff 01 00 80 00 00 81"));
+        return true;
+    }else{
+        return PtzControl(FOCUS_NEAR, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlStop(){
+    SerialSend(PrepareHexString("ff 01 00 00 00 00 01"));
+    return true;
+}
+
+
+bool HIKBallCamera::PtzControlUpLeft(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 0c "+velocity[speed - 1]+" " + velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(UP_LEFT, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlUpRight(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 0a "+velocity[speed - 1]+" " + velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(UP_RIGHT, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlDownLeft(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 14 "+velocity[speed - 1]+" " + velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(DOWN_LEFT, state, speed);
+    }
+}
+
+bool HIKBallCamera::PtzControlDownRight(int speed,int state)
+{
+    if (BallMachineType=="BuKongQiu") {
+        std::string buf = "ff 01 00 12 "+velocity[speed - 1]+" " + velocity[speed - 1];
+        buf = buf +" "+ verify(buf);
+        SerialSend(PrepareHexString(buf));
+        return true;
+    }else{
+        return PtzControl(DOWN_RIGHT, state, speed);
+    }
+}
+
+std::string addSpacesEveryTwoWords(const std::string& hex) {
+    std::ostringstream result;
+
+    int len = hex.length();
+    // 如果十六进制字符串的长度是奇数，则在前面添加一个 0
+    std::string paddedHex = (len % 2 == 1) ? "0" + hex : hex;
+    // 遍历字符串，每两个字符分割一次
+    for (size_t i = 0; i < paddedHex.length(); i += 2) {
+        if (i != 0) {
+            result << " ";
+        }
+        result << paddedHex.substr(i, 2);
+    }
+    return result.str();
+}
+std::string padding(const std::string& hex){
+    if (hex.length()==2){
+        return "00 "+hex;
+    } else{
+        return hex;
+    }
+}
+
+
+// PTZ 跳转到指定位置
+bool HIKBallCamera::PtzGotoPut(int Action, float P, float T, float Z)
+{
+    if (BallMachineType=="BuKongQiu"){
+        std::string pHex = decimalToHexadecimal(P * 100);
+        pHex = padding(addSpacesEveryTwoWords(pHex));
+        std::string tHex = decimalToHexadecimal(T * 100);
+        tHex = padding(addSpacesEveryTwoWords(tHex));
+        std::string zHex = decimalToHexadecimal(Z * 100);
+        zHex = padding(addSpacesEveryTwoWords(zHex));
+        std::string pBuf = "ff 01 00 4b "+ pHex;
+        std::string tBuf = "ff 01 00 4d "+ tHex;
+        std::string zBuf = "ff 01 00 4f "+ zHex;
+        pBuf = pBuf+" "+verify(pBuf);
+        tBuf = tBuf+" "+verify(tBuf);
+        zBuf = zBuf+" "+verify(zBuf);
+        switch (Action) {
+            case 1:
+                SerialSend(PrepareHexString(pBuf)); // 设置 P
+                SerialSend(PrepareHexString(tBuf)); // 设置 T
+                SerialSend(PrepareHexString(zBuf)); // 设置 Z
+                break;
+            case 2:
+                SerialSend(PrepareHexString(pBuf)); // 设置 P
+                break;
+            case 3:
+                SerialSend(PrepareHexString(tBuf)); // 设置 T
+                break;
+            case 4:
+                SerialSend(PrepareHexString(zBuf)); // 设置 Z
+                break;
+            case 5:
+                SerialSend(PrepareHexString(pBuf)); // 设置 P
+                SerialSend(PrepareHexString(tBuf)); // 设置 T
+                break;
+            default:
+                break;
+        }
+        return true;
+    }else{
+        NET_DVR_PTZPOS ptzPosCurrent;
+        ptzPosCurrent.wPanPos = DEC2HEX(P);
+        ptzPosCurrent.wTiltPos = DEC2HEX(T);
+        ptzPosCurrent.wZoomPos = DEC2HEX(Z);
+        ptzPosCurrent.wAction = Action;
+
+        bool b = NET_DVR_SetDVRConfig(LoginID, NET_DVR_SET_PTZPOS, m_Channel, &ptzPosCurrent, sizeof(NET_DVR_PTZPOS));
+        return b;
+    }
+}
+bool HIKBallCamera::SerialSend(const std::string& hex){
+    char m_DataBuf[50];
+    int m_DataLen;
+    int len = hex.length();
+    m_DataLen = len<1024 ? len : 1024;
+    memcpy(m_DataBuf,hex.c_str(),m_DataLen);
+    return NET_DVR_SerialSend(lTranHandle,1, m_DataBuf, m_DataLen);
+}
+
+bool HIKBallCamera::PtzGet(float* posP, float* posT, float* posZ) {
+    if (BallMachineType=="BuKongQiu"){
+        SerialSend(PrepareHexString("ff 01 00 51 00 00 52"));
+        SerialSend(PrepareHexString("ff 01 00 53 00 00 54"));
+        SerialSend(PrepareHexString("ff 01 00 55 00 00 56"));
+        SLEEP(1);
+        *posP = PTZDATA.P;
+        *posT = PTZDATA.T;
+        *posZ = PTZDATA.Z;
+        return true;
+    }else{
+        NET_DVR_PTZPOS ptzPosCurrent;
+        DWORD dwtmp;
+        bool b = NET_DVR_GetDVRConfig(LoginID, NET_DVR_GET_PTZPOS, m_Channel, &ptzPosCurrent, sizeof(NET_DVR_PTZPOS),&dwtmp);
+        float P = HEX2DEC(ptzPosCurrent.wPanPos);
+        float T = HEX2DEC(ptzPosCurrent.wTiltPos);
+        float Z = HEX2DEC(ptzPosCurrent.wZoomPos);
+        *posP = P;
+        *posT = T;
+        *posZ = Z;
+        return b;
+    }
+}
+
+bool HIKBallCamera::CmdSwitch(int direction,int speed,int state){
+    bool Res = false;
+    switch (direction) {
+        case PTZ_LEFT:
+            Res = PtzControlLeft(speed,state);
+            break;
+        case PTZ_RIGHT:
+            Res = PtzControlRight(speed,state);
+            break;
+        case PTZ_UP:
+            Res = PtzControlUp(speed,state);
+            break;
+        case PTZ_DOWN:
+            Res = PtzControlDown(speed,state);
+            break;
+        case PTZ_UP_LEFT:
+            Res = PtzControlUpLeft(speed,state);
+            break;
+        case PTZ_UP_RIGHT:
+            Res = PtzControlUpRight(speed,state);
+            break;
+        case PTZ_DOWN_LEFT:
+            Res = PtzControlDownLeft(speed,state);
+            break;
+        case PTZ_DOWN_RIGHT:
+            Res = PtzControlDownRight(speed,state);
+            break;
+        case PTZ_ZOOM_IN:
+            Res = PtzControlZoomIn(speed,state);
+            break;
+        case PTZ_ZOOM_OUT:
+            Res = PtzControlZoomOut(speed,state);
+            break;
+        case PTZ_Focus_Far:
+            Res = PtzControlFocusSub(speed,state);
+            break;
+        case PTZ_Focus_Near:
+            Res = PtzControlFocusAdd(speed,state);
+            break;
+    }
+    return Res;
+}
+
+bool HIKBallCamera::StopBus(int direction) {
+    if (BallMachineType=="BuKongQiu"){
+        return PtzControlStop();
+    }
+    return CmdSwitch(direction,0,1);
+}
+
+bool HIKBallCamera::StartBus(int direction, int speed) {
+    return CmdSwitch(direction,speed,0);
+}
--- a/src/HIKBase.cpp
+++ b/src/HIKBase.cpp
@@ -1,37 +1,36 @@
-#include "HIKBase.h"
-#include <memory>
-#include <cstring>
-#include <chrono>
-
-HIKBase::HIKBase()
-{
-    memset(&DeviceInfo, 0, sizeof(DeviceInfo));
-}
-
-
-HIKBase::~HIKBase() = default;
-
-int HIKBase::Login(std::string ip, std::string port, std::string username, std::string password)
-{
-    Ip = ip;
-    Port = port;
-    Username = username;
-    Password = password;
-
-    LoginID = NET_DVR_Login_V30((char *)Ip.c_str(), atoi(Port.c_str()), (char *)Username.c_str(), (char *)Password.c_str(), &DeviceInfo);
-    std::cout << LoginID <<std::endl;
-    return LoginID;
-}
-
-void HIKBase::Logout()
-{
-    if (LoginID >= 0)
-    {
-        NET_DVR_Logout(LoginID);
-        LoginID = -1;
-    }
-}
-
-bool HK_DVR_Init(){
-    return NET_DVR_Init();
+#include "HIKBase.h"
+#include <memory>
+#include <cstring>
+#include <chrono>
+
+HIKBase::HIKBase()
+{
+    memset(&DeviceInfo, 0, sizeof(DeviceInfo));
+}
+
+
+HIKBase::~HIKBase() = default;
+
+int HIKBase::Login(std::string ip, std::string port, std::string username, std::string password)
+{
+    Ip = ip;
+    Port = port;
+    Username = username;
+    Password = password;
+
+    LoginID = NET_DVR_Login_V30((char *)Ip.c_str(), atoi(Port.c_str()), (char *)Username.c_str(), (char *)Password.c_str(), &DeviceInfo);
+    return NET_DVR_GetLastError();
+}
+
+void HIKBase::Logout()
+{
+    if (LoginID >= 0)
+    {
+        NET_DVR_Logout(LoginID);
+        LoginID = -1;
+    }
+}
+
+bool HK_DVR_Init(){
+    return NET_DVR_Init();
 }
--- a/src/HIKNvr.cpp
+++ b/src/HIKNvr.cpp
@@ -27,15 +27,16 @@ bool HIKNvr::InitNvr(std::string ip, std::string port, std::string username, std
    return false;
 }

-bool HIKNvr::GetNvrUTCDiff(){
+int HIKNvr::GetNvrUTCDiff(){
    NET_DVR_NETAPPCFG struNAC = {0};
    DWORD ZoneSize = 0;
-    NET_DVR_GetDVRConfig(LoginID, NET_DVR_GET_NETAPPCFG, 0, &struNAC, sizeof(NET_DVR_NETAPPCFG), &ZoneSize);
+    if (NET_DVR_GetDVRConfig(LoginID, NET_DVR_GET_NETAPPCFG, 0, &struNAC, sizeof(NET_DVR_NETAPPCFG), &ZoneSize)){
+        return 5000;
+    };
    int nDiffHour = struNAC.struNtpClientParam.cTimeDifferenceH;
    int nDiffMin = struNAC.struNtpClientParam.cTimeDifferenceM;
-
    nDiffTotalMin = (nDiffHour < 0 ? -1 : 1) * (abs(nDiffHour) * 60 + nDiffMin);
-    return true;
+    return (nDiffHour < 0 ? -1 : 1) * (abs(nDiffHour) * 60 + nDiffMin);
 }

 /**
--- a/src/HIKNvr.h
+++ b/src/HIKNvr.h
@@ -42,7 +42,7 @@ public:
    //though input SelectTime get the time region
    bool GetTimeRegion(DateTime select_time,int value ,DateTime &time_start,DateTime &time_end);

-    bool GetNvrUTCDiff();
+    int GetNvrUTCDiff();
    int nDiffTotalMin;

 public:
Author	SHA1	Message	Date
kunmeng	d563b72610	移除Golang的内容	2025-01-08 09:40:54 +08:00
王帅锟	41d8da2401	1. 修改按月查询的数据返回 2. 修复一点击即视的死锁问题	2024-11-14 09:44:00 +08:00
王帅锟	763376a95c	1. 返回合适的错误标识	2024-10-31 15:29:13 +08:00
王帅锟	8afb72cab6	1. 海康设备状态加入到结构体中	2024-10-31 15:22:07 +08:00
王帅锟	3e7ead4a2f	补充上次提交	2024-10-28 13:57:25 +08:00
王帅锟	10f587962f	添加获取海康NVR时区的API	2024-10-28 13:24:18 +08:00
王帅锟	3fd2fc4062	1. 修改 Docker Hub 使用内部镜像源 2. 修改 Arm 加载动态链接库链接路径前面的空格	2024-10-24 13:55:17 +08:00
王帅锟	002d24e2b0	1. 添加获取 Nvr 与 UTC 之间的插曲接口 2. 修复球机聚焦接口存在的错误 3. 修复 PTZ 跳转到指定位置 Action 参数标准海康接口下无效的问题,以及无法设置Z值 4. 移除 GetBallCameraByName 5. 添加 PointPair 配置文件结构	2024-10-22 15:20:51 +08:00
王帅锟	bd6cff81ec	1. 添加球机的一点即视和逆运算接口 2. 添加 Nvr 和球机的配置结构体和一些基本结构体类型 3. 修改 Nvr 和球机的 Login 方法 4. 修复球机部分 MOVE 操作无法停止 5. 修复 HikBase Login 返回值错误	2024-10-12 12:43:38 +08:00
王帅锟	a52e1a27fc	1. 修复 Go 不同架构下 getSystemLibrary 获取的 dll 名	2024-10-10 16:30:40 +08:00
王帅锟	4fa9ce6131	1. 修复包名为 HikNetSDK	2024-10-10 15:17:04 +08:00
王帅锟	c36505d530	Merge remote-tracking branch 'origin/master'	2024-10-10 15:15:49 +08:00
王帅锟	167dd8be77	1. 修复 go.mod module 为 gitea.com/kunmeng/HikNetSDKPkg 2. 删除 main.go	2024-10-10 15:15:37 +08:00
王帅锟	77a3e37a0e	1. 修复 go 包名为 gitea.com/kunmeng/HikNetSDKPkg 2. 删除 main.go	2024-10-10 15:10:08 +08:00
王帅锟	1c13ef429c	1. 增加 Readme.md 2. 修复 CMakeLists.txt 实现多系统多架构构建 3. 添加 Dockerfile 使用 docker 在多系统多架构下进行编译 4. 修复 library.h 和 .cpp 调整 windows 和 linux 库的差异导致的无法编译通过	2024-10-10 14:11:40 +08:00