Commit 82d8a9b4 authored by 王琮's avatar 王琮

修改各模块逻辑问题

parent bd465063
......@@ -9,7 +9,6 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
/**
* NetSDK JNA接口封装
*/
......@@ -22347,17 +22346,17 @@ public interface NetSDKLib extends Library {
** 回调
***********************************************************************/
//JNA Callback方法定义,断线回调
public interface fDisConnect extends StdCallCallback {
public interface fDisConnect extends Callback {
public void invoke(LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser);
}
// 网络连接恢复回调函数原形
public interface fHaveReConnect extends StdCallCallback {
public interface fHaveReConnect extends Callback {
public void invoke(LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser);
}
// 消息回调函数原形(pBuf内存由SDK内部申请释放)
public interface fMessCallBack extends StdCallCallback{
public interface fMessCallBack extends Callback{
public boolean invoke(int lCommand, LLong lLoginID, Pointer pStuEvent, int dwBufLen, String strDeviceIP, NativeLong nDevicePort, Pointer dwUser);
}
......@@ -22366,12 +22365,12 @@ public interface NetSDKLib extends Library {
// bAlarmAckFlag : TRUE,该事件为可以进行确认的事件;FALSE,该事件无法进行确认
// nEventID 用于对 CLIENT_AlarmAck 接口的入参进行赋值,当 bAlarmAckFlag 为 TRUE 时,该数据有效
// pBuf内存由SDK内部申请释放
public interface fMessCallBackEx1 extends StdCallCallback{
public interface fMessCallBackEx1 extends Callback{
public boolean invoke(int lCommand, LLong lLoginID, Pointer pStuEvent, int dwBufLen, String strDeviceIP, NativeLong nDevicePort, int bAlarmAckFlag, NativeLong nEventID, Pointer dwUser);
}
// 订阅人脸回调函数
public interface fFaceFindState extends StdCallCallback {
public interface fFaceFindState extends Callback {
// pstStates 指向NET_CB_FACE_FIND_STATE的指针
public void invoke(LLong lLoginID, LLong lAttachHandle, Pointer pstStates, int nStateNum, Pointer dwUser);
}
......@@ -22379,59 +22378,59 @@ public interface NetSDKLib extends Library {
// 智能分析数据回调;nSequence表示上传的相同图片情况,为0时表示是第一次出现,为2表示最后一次出现或仅出现一次,为1表示此次之后还有
// int nState = *(int*) reserved 表示当前回调数据的状态, 为0表示当前数据为实时数据,为1表示当前回调数据是离线数据,为2时表示离线数据传送结束
// pAlarmInfo 对应智能事件信息, pBuffer 对应智能图片信息, dwBufSize 智能图片信息大小
public interface fAnalyzerDataCallBack extends StdCallCallback {
public interface fAnalyzerDataCallBack extends Callback {
public int invoke(LLong lAnalyzerHandle, int dwAlarmType, Pointer pAlarmInfo, Pointer pBuffer, int dwBufSize, Pointer dwUser, int nSequence, Pointer reserved);
}
// 抓图回调函数原形(pBuf内存由SDK内部申请释放)
// EncodeType 编码类型,10:表示jpeg图片 0:mpeg4 CmdSerial : 操作流水号,同步抓图的情况下用不上
public interface fSnapRev extends StdCallCallback{
public interface fSnapRev extends Callback{
public void invoke(LLong lLoginID, Pointer pBuf, int RevLen, int EncodeType, int CmdSerial, Pointer dwUser);
}
// 异步搜索设备回调(pDevNetInfo内存由SDK内部申请释放)
public interface fSearchDevicesCB extends StdCallCallback{
public interface fSearchDevicesCB extends Callback{
public void invoke(Pointer pDevNetInfo, Pointer pUserData);
}
// 按时间回放进度回调函数原形
public interface fTimeDownLoadPosCallBack extends StdCallCallback {
public interface fTimeDownLoadPosCallBack extends Callback {
public void invoke(LLong lPlayHandle, int dwTotalSize, int dwDownLoadSize, int index, NET_RECORDFILE_INFO.ByValue recordfileinfo, Pointer dwUser);
}
// 回放数据回调函数原形
public interface fDataCallBack extends StdCallCallback {
public interface fDataCallBack extends Callback {
public int invoke(LLong lRealHandle, int dwDataType, Pointer pBuffer, int dwBufSize, Pointer dwUser);
}
// 回放进度回调函数原形
public interface fDownLoadPosCallBack extends StdCallCallback {
public interface fDownLoadPosCallBack extends Callback {
public void invoke(LLong lPlayHandle, int dwTotalSize, int dwDownLoadSize, Pointer dwUser);
}
// 视频统计摘要信息回调函数原形,lAttachHandle 是 CLIENT_AttachVideoStatSummary 返回值
public interface fVideoStatSumCallBack extends StdCallCallback {
public interface fVideoStatSumCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_VIDEOSTAT_SUMMARY pBuf, int dwBufLen, Pointer dwUser);
}
// 用户自定义的数据回调 lTalkHandle是CLIENT_StartTalkEx的返回值
// byAudioFlag: 0表示是本地录音库采集的音频数据 , 1表示收到的设备发过来的音频数据
public interface pfAudioDataCallBack extends StdCallCallback {
public interface pfAudioDataCallBack extends Callback {
public void invoke(LLong lTalkHandle, Pointer pDataBuf, int dwBufSize, byte byAudioFlag, Pointer dwUser);
}
// lHandle是文件传输句柄 ,nTransType是文件传输类型,nState是文件传输状态,
public interface fTransFileCallBack extends StdCallCallback {
public interface fTransFileCallBack extends Callback {
public void invoke(LLong lHandle, int nTransType, int nState, int nSendSize, int nTotalSize, Pointer dwUser);
}
// GPS信息订阅回调--扩展
public interface fGPSRevEx extends StdCallCallback {
public interface fGPSRevEx extends Callback {
public void invoke(LLong lLoginID, GPS_Info.ByValue GpsInfo, ALARM_STATE_INFO.ByValue stAlarmInfo, Pointer dwUserData, Pointer reserved);
}
// GPS信息订阅回调--扩展2
public interface fGPSRevEx2 extends StdCallCallback {
public interface fGPSRevEx2 extends Callback {
public void invoke(LLong lLoginID, NET_GPS_LOCATION_INFO lpData, Pointer dwUserData, Pointer reserved);
}
......@@ -22440,48 +22439,48 @@ public interface NetSDKLib extends Library {
// pBuffer对应BYTE*
// param:当类型为0(原始数据)和2(YUV数据) 时为0。当回调的数据类型为1时param为一个tagVideoFrameParam结构体指针。
// param:当数据类型是3时,param也是一个tagCBPCMDataParam结构体指针
public interface fRealDataCallBackEx extends StdCallCallback {
public interface fRealDataCallBackEx extends Callback {
public void invoke(LLong lRealHandle, int dwDataType, Pointer pBuffer, int dwBufSize, int param, Pointer dwUser);
}
// 实时监视数据回调函数原形--扩展(pBuffer内存由SDK内部申请释放)
// 通过 dwDataType 过滤得到对应码流,具体码流类型请参考 EM_REALDATA_FLAG; 转码流时 dwDataType 值请参考 NET_DATA_CALL_BACK_VALUE 说明
// 当转码流时,param 为具体的转码信息(视频帧、音频帧等信息),对应结构体 NET_STREAMCONVERT_INFO
public interface fRealDataCallBackEx2 extends StdCallCallback{
public interface fRealDataCallBackEx2 extends Callback{
void invoke(LLong lRealHandle, int dwDataType, Pointer pBuffer, int dwBufSize, LLong param, Pointer dwUser);
}
// 视频监视断开回调函数, (param内存由SDK内部申请释放 )
// lOperateHandle监控句柄 dwEventType对应EM_REALPLAY_DISCONNECT_EVENT_TYPE param对应void*,事件参数
public interface fRealPlayDisConnect extends StdCallCallback {
public interface fRealPlayDisConnect extends Callback {
public void invoke(LLong lOperateHandle, int dwEventType, Pointer param, Pointer dwUser);
}
// 订阅过车记录数据回调函数原型 lAttachHandle为CLIENT_ParkingControlAttachRecord返回值
public interface fParkingControlRecordCallBack extends StdCallCallback {
public interface fParkingControlRecordCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, NET_CAR_PASS_ITEM pInfo, int nBufLen, Pointer dwUser);
}
// 订阅车位信息回调函数原型
public interface fParkInfoCallBack extends StdCallCallback {
public interface fParkInfoCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, NET_PARK_INFO_ITEM pInfo, int nBufLen, Pointer dwUser);
}
// 订阅监测点位信息回调函数原型
public interface fSCADAAttachInfoCallBack extends StdCallCallback {
public interface fSCADAAttachInfoCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, NET_SCADA_NOTIFY_POINT_INFO_LIST pInfo, int nBufLen, Pointer dwUser);
}
// 透明串口回调函数原形(pBuffer内存由SDK内部申请释放))
public interface fTransComCallBack extends StdCallCallback {
public interface fTransComCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lTransComChannel, Pointer pBuffer, int dwBufSize, Pointer dwUser);
}
//视频分析进度状态实时回调函数
public interface fVideoAnalyseState extends StdCallCallback {
public interface fVideoAnalyseState extends Callback {
public int invoke(LLong lAttachHandle, NET_VIDEOANALYSE_STATE pAnalyseStateInfos, Pointer dwUser, Pointer pReserved);
}
// 侦听服务器回调函数原形
public interface fServiceCallBack extends StdCallCallback {
public interface fServiceCallBack extends Callback {
public int invoke(LLong lHandle, String pIp, int wPort, int lCommand, Pointer pParam, int dwParamLen, Pointer dwUserData);
}
......@@ -22495,32 +22494,32 @@ public interface NetSDKLib extends Library {
}
//订阅Bus状态回调函数原型
public interface fBusStateCallBack extends StdCallCallback {
public interface fBusStateCallBack extends Callback {
public void invoke(LLong lAttachHandle, int lCommand, Pointer pBuf, int dwBufLen, Pointer dwUser);
}
// GPS温湿度信息订阅回调
public interface fGPSTempHumidityRev extends StdCallCallback {
public interface fGPSTempHumidityRev extends Callback {
public void invoke(LLong lLoginID, GPS_TEMP_HUMIDITY_INFO.ByValue GpsTHInfo, Pointer dwUserData);
}
// 向设备注册的回调函数原型
public interface fDeviceStateCallBack extends StdCallCallback {
public interface fDeviceStateCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_CB_ATTACH_DEVICE_STATE pstDeviceState, Pointer dwUser);
}
// 注册添加设备的回调函数原型
public interface fAddDeviceCallBack extends StdCallCallback {
public interface fAddDeviceCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_CB_ATTACH_ADD_DEVICE pstAddDevice, Pointer dwUser);
}
// 定义监测点报警信息回调函数原型
public interface fSCADAAlarmAttachInfoCallBack extends StdCallCallback {
public interface fSCADAAlarmAttachInfoCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_SCADA_NOTIFY_POINT_ALARM_INFO_LIST pInfo, int nBufLen, Pointer dwUser);
}
//视频诊断结果上报回调函数
public interface fRealVideoDiagnosis extends StdCallCallback {
public interface fRealVideoDiagnosis extends Callback {
public int invoke(LLong lDiagnosisHandle, NET_REAL_DIAGNOSIS_RESULT pDiagnosisInfo, Pointer pBuf, int nBufLen, Pointer dwUser);
}
......@@ -22531,29 +22530,29 @@ public interface NetSDKLib extends Library {
/// \param int nBufLen [OUT] 状态信息长度
/// \param LDWORD dwUser 用户数据
/// \return 无
public interface fRadiometryAttachCB extends StdCallCallback {
public interface fRadiometryAttachCB extends Callback {
public void invoke(LLong lAttachHandle, NET_RADIOMETRY_DATA pBuf, int nBufLen, Pointer dwUser);
}
// 刻录设备回调函数原形,lAttachHandle是CLIENT_AttachBurnState返回值, 每次1条,pBuf->dwSize == nBufLen
public interface fAttachBurnStateCB extends StdCallCallback {
public interface fAttachBurnStateCB extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, NET_CB_BURNSTATE pBuf, int nBufLen, Pointer dwUser);
}
// 刻录设备回调扩展函数原形
public interface fAttachBurnStateCBEx extends StdCallCallback {
public interface fAttachBurnStateCBEx extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, NET_OUT_BURN_GET_STATE pBuf, int nBufLen, Pointer dwUser);
}
//刻录设备回调函数,lUploadHandle是CLIENT_StartUploadFileBurned返回值
//typedef void (CALLBACK *fBurnFileCallBack) (LLONG lLoginID, LLONG lUploadHandle, int nTotalSize, int nSendSize, LDWORD dwUser);
public interface fBurnFileCallBack extends StdCallCallback {
public interface fBurnFileCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lUploadHandle, int nTotalSize, int nSendSize, Pointer dwUser);
}
// 升级回调
public interface fUpgradeCallBackEx extends StdCallCallback {
public interface fUpgradeCallBackEx extends Callback {
public void invoke(LLong lLoginID, LLong lUpgradechannel, int nTotalSize, int nSendSize, Pointer dwUserData);
}
......@@ -24106,7 +24105,7 @@ public interface NetSDKLib extends Library {
}
// 云下载回调函数
public interface fCloudDownload_Process_callback extends StdCallCallback {
public interface fCloudDownload_Process_callback extends Callback {
public void invoke(LLong lDownHandle, int emState, double dwDownloadSpeed, int dwProgressPercentage, Pointer dwUser);
}
......@@ -24211,7 +24210,7 @@ public interface NetSDKLib extends Library {
}
// 升级状态回调函数
public interface fUpgraderStateCallback extends StdCallCallback {
public interface fUpgraderStateCallback extends Callback {
public void invoke(LLong lLoginId, LLong lAttachHandle, NET_CLOUD_UPGRADER_STATE pBuf, int dwBufLen, Pointer pReserved, Pointer dwUser);
}
......@@ -26857,7 +26856,7 @@ public interface NetSDKLib extends Library {
}
// 无人机实时数据回调
public interface fUAVInfoCallBack extends StdCallCallback {
public interface fUAVInfoCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_UAVINFO pstuUAVInfo, int dwUAVInfoSize, Pointer dwUser);
}
......@@ -28810,7 +28809,7 @@ public interface NetSDKLib extends Library {
};
// 升级远程设备程序回调函数
public interface fRemoteUpgradeCallBack extends StdCallCallback{
public interface fRemoteUpgradeCallBack extends Callback{
public void invoke(LLong lLoginID, LLong lUpgradeID, int emState, int nParam1, int nParam2, Pointer dwUser);
}
......@@ -28824,7 +28823,7 @@ public interface NetSDKLib extends Library {
};
// 升级状态回调函数
public interface fRemoteUpgraderStateCallback extends StdCallCallback{
public interface fRemoteUpgraderStateCallback extends Callback{
public void invoke(LLong lLoginId, LLong lAttachHandle, NET_REMOTE_UPGRADER_NOTIFY_INFO pBuf, int dwBufLen, Pointer pReserved, Pointer dwUser);
}
......@@ -29292,7 +29291,7 @@ public interface NetSDKLib extends Library {
};
// 智能分析状态订阅函数原型, lAttachHandle 为 CLIENT_AttachAnalyseTaskState 函数的返回值
public interface fAnalyseTaskStateCallBack extends StdCallCallback{
public interface fAnalyseTaskStateCallBack extends Callback{
public int invoke(LLong lAttachHandle, Pointer pstAnalyseTaskStateInfo, Pointer dwUser);
};
......@@ -29477,7 +29476,7 @@ public interface NetSDKLib extends Library {
};
// 智能分析状态订阅函数原型, lAttachHandle 是 CLIENT_AttachAnalyseTaskResult接口的返回值,pstAnalyseTaskResult对应结构体NET_CB_ANALYSE_TASK_RESULT_INFO
public interface fAnalyseTaskResultCallBack extends StdCallCallback{
public interface fAnalyseTaskResultCallBack extends Callback{
public int invoke(LLong lAttachHandle, Pointer pstAnalyseTaskResult, Pointer pBuf, int dwBufSize, Pointer dwUser);
};
......@@ -29789,7 +29788,7 @@ public interface NetSDKLib extends Library {
this.dwSize = this.size();
}
}
public interface fVirtualChannelStatusCallBack extends StdCallCallback {
public interface fVirtualChannelStatusCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_CB_VIRTUALCHANNEL_STATUS_INFO pstVirChnStatusInfo, Pointer dwUser);}
// 虚拟转码通道状态信息
......@@ -29822,7 +29821,7 @@ public interface NetSDKLib extends Library {
public void CLIENT_SetSubconnCallBack(Callback cbSubDisConnect, Pointer dwUser);
// 动态子连接断开回调函数原形
public interface fSubDisConnect extends StdCallCallback{
public interface fSubDisConnect extends Callback{
public void invoke(int emInterfaceType, Boolean bOnline, LLong lOperateHandle, LLong lLoginID, Pointer dwUser);
}
// 接口类型,对应CLIENT_SetSubconnCallBack接口
......@@ -30340,7 +30339,7 @@ public interface NetSDKLib extends Library {
};
// 无人机任务状态回调
public interface fUAVMissionStateCallBack extends StdCallCallback {
public interface fUAVMissionStateCallBack extends Callback {
public void invoke(LLong lAttachHandle, NET_UAVMISSION_STATE pstuState, int dwStateInfoSize, Pointer dwUser);
}
......@@ -30469,7 +30468,7 @@ public interface NetSDKLib extends Library {
} ;
// 订阅抓图回调函数原形
public interface fAttachSnapRev extends StdCallCallback{
public interface fAttachSnapRev extends Callback{
public void invoke(LLong lAttachHandle, NET_CB_ATTACH_SNAP_INFO pstAttachCbInfo, Pointer dwUser);
};
......@@ -31735,7 +31734,7 @@ public interface NetSDKLib extends Library {
// 热度图灰度数据回调函数, lAttachHandle 为 CLIENT_AttachHeatMapGrayInfo 返回的结果(pstGrayInfo参考NET_CB_HEATMAP_GRAY_INFO)
public interface fHeatMapGrayCallBack extends StdCallCallback{
public interface fHeatMapGrayCallBack extends Callback{
public void invoke(LLong lAttachHandle, Pointer pstGrayInfo, Pointer dwUser);
}
// CLIENT_AttachHeatMapGrayInfo 接口输入参数
......@@ -32164,7 +32163,7 @@ public interface NetSDKLib extends Library {
};
// 异步搜索设备回调(pDevNetInfo内存由SDK内部申请释放, 参考DEVICE_NET_INFO_EX2)
public interface fSearchDevicesCBEx extends StdCallCallback {
public interface fSearchDevicesCBEx extends Callback {
public void invoke(LLong lSearchHandle, Pointer pDevNetInfo, Pointer pUserData);
}
......@@ -32430,7 +32429,7 @@ public interface NetSDKLib extends Library {
public boolean CLIENT_DownLoadMultiFile(LLong lLoginID, Pointer pstInParam, Pointer pstOutParam, int waittime);
//JNA Callback方法定义,断线回调
public interface fMultiFileDownLoadPosCB extends StdCallCallback {
public interface fMultiFileDownLoadPosCB extends Callback {
public void invoke(LLong lDownLoadHandle, int dwID, int dwFileTotalSize, int dwDownLoadSize, int nError, Pointer dwUser, Pointer pReserved);
}
......@@ -32446,7 +32445,7 @@ public interface NetSDKLib extends Library {
public boolean CLIENT_DetachCameraState(LLong lAttachHandle);
// CLIENT_AttachCameraState()回调函数原形, 每次1条,pBuf->NET_CB_CAMERASTATE dwSize == nBufLen
public interface fCameraStateCallBack extends StdCallCallback {
public interface fCameraStateCallBack extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, Pointer pBuf, int nBufLen, Pointer dwUser);
}
......@@ -32461,7 +32460,7 @@ public interface NetSDKLib extends Library {
public boolean CLIENT_GetDeviceAllInfo(LLong lLoginID, Pointer pstInParam, Pointer pstOutParam, int nWaitTime);
// 交通信号灯回调函数 lLoginID - 登录句柄 lAttchHandle - 订阅句柄
public interface fTrafficLightState extends StdCallCallback {
public interface fTrafficLightState extends Callback {
public void invoke(LLong lLoginID, LLong lAttachHandle, Pointer pBuf, long dwUser);
}
......@@ -32503,7 +32502,7 @@ public interface NetSDKLib extends Library {
* 雷达报警点信息回调函数指针
* @param pBuf {@link org.rcisoft.integration.video.lib.structure.NET_RADAR_NOTIFY_ALARMPOINTINFO}
*/
public interface fRadarAlarmPointInfoCallBack extends StdCallCallback {
public interface fRadarAlarmPointInfoCallBack extends Callback {
public void invoke (LLong lLoginId, LLong lAttachHandle, Pointer pBuf, int dwBufLen, Pointer pReserved, Pointer dwUser);
}
......@@ -32538,7 +32537,7 @@ public interface NetSDKLib extends Library {
* 订阅云台元数据接口回调函数原型
* pBuf 现阶段主要为 NET_PTZ_LOCATION_INFO 类型 {@link NET_PTZ_LOCATION_INFO}
*/
public interface fPTZStatusProcCallBack extends StdCallCallback {
public interface fPTZStatusProcCallBack extends Callback {
public void invoke (LLong lLoginId, LLong lAttachHandle, Pointer pBuf, int dwBufLen, long dwUser);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment