bugfix

houxiao

2017-03-31 e813367bf6300da58cb5347d61d8b3ec7cf6cf38

bugfix

git-svn-id: http://192.168.1.226/svn/proxy@285 454eff88-639b-444f-9e54-f578c98de674

 ProxyConsole/config.mediaalarm17.json

New file
@@ -0,0 +1,638 @@
{
    "hcsdk" : {
        "serverIP" : "172.16.19.99",
        "serverport" : 8000,
        "username" : "admin",
        "passwd" : "a1234567"
    },

    "equipments" : [
	
        {
            "id" : 1,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.151",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 3,
                "lAlarmOutPort" : 0
            }
        },
		
        {
            "id" : 2,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.151",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 4,
                "lAlarmOutPort" : 0
            }
        },
	
	
        {
            "id" : 3,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.152",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 5,
                "lAlarmOutPort" : 0
            }
        },
		
        {
            "id" : 4,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.152",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 6,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 5,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.153",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 26,
                "lAlarmOutPort" : 0
            }
        },
		
        {
            "id" : 6,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.153",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 8,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 7,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.154",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 9,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 8,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.154",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 10,
                "lAlarmOutPort" : 0
            }
        },

        {
            "id" : 9,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.155",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 11,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 10,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.155",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 12,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 11,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.156",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 13,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 12,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.156",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 7,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 13,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.157",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 14,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 14,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.157",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 15,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 15,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.158",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 16,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 16,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.158",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 17,
                "lAlarmOutPort" : 0
            }
        },

	
        {
            "id" : 17,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.150",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 1,
                "lAlarmOutPort" : 0
            }
        },
        {
            "id" : 18,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.150",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 2,
                "lAlarmOutPort" : 0
            }
        },
	
	

        {
            "id" : 19,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.159",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 18,
                "lAlarmOutPort" : 0
            }
        },
        {
            "id" : 20,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.159",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 19,
                "lAlarmOutPort" : 0
            }
        },
	
        {
            "id" : 21,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.160",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 20,
                "lAlarmOutPort" : 0
            }
        },
        {
            "id" : 22,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.160",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : 21,
                "lAlarmOutPort" : 0
            }
        },
	
	
        {
            "id" : 23,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.161",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 0,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : [22,25],
                "lAlarmOutPort" : 0
            }
        },
        {
            "id" : 24,
            "type" : 6,
            "type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
            "ip" : "172.16.19.161",
            "port" : "80",
            "user" : "supervisor",
            "pass" : "supervisor",
			
            "serverIP" : "172.16.19.99",
            "serverport" : "8000",
            "reboot" : 0,
			
            "user_config" : {
                "ip" : "127.0.0.1",
                "port" : 8000,
                "username" : "admin",
                "passwd" : "admin12345",
                "channel" : 1,
                "byWallNo" : 1,
                "dwSubWinNo" : 1,
                "dwWinNo" : [23,24],
                "lAlarmOutPort" : 0
            }
        }
		
	
    ]
}

 ProxyConsole/proxyconsole-hc.cpp

@@ -54,6 +54,7 @@
    ET_HCNET_DECODER_POPWIN, // 3
    ET_HCNET_DECODER_LOGO, // 4
    ET_HCNET_DECODER_ALARMOUT, // 5
    ET_HCNET_DECODER_LOGO_ALARMOUT, // 6
    ET_HCNET_DECODER__LAST,
    ET__LAST
};
@@ -300,7 +301,7 @@
    printf("hcnetsdk_ExceptionCallBack: %d\n", int(dwType));
}

int hcnetsdk_alarm_alarmout(LONG lUserID, const HCNetCameraConfig& camConfig)
int hcnetsdk_alarm_alarmout(LONG lUserID, const HCNetCameraConfig& camConfig, bool isDisalarm)
{
    //报警时间段
    NET_DVR_SCHEDTIME net_dvr_schedtime = {0};
@@ -321,17 +322,28 @@
    }
        
    //开启警报
    if(NET_DVR_SetAlarmOut(lUserID,camConfig.lAlarmOutPort,1) == FALSE){
        printf("NET_DVR_SetAlarmOut failed, err: %d\n", NET_DVR_GetLastError());
    }
    //if(NET_DVR_SetAlarmOut(lUserID,camConfig.lAlarmOutPort,1) == FALSE){
    //    printf("NET_DVR_SetAlarmOut failed, err: %d\n", NET_DVR_GetLastError());
    //}
    last_alarmout = time(NULL);
    
    sleep(3);
    //sleep(2);
    
    if (time(NULL) - last_alarmout >= 3)
    if (isDisalarm)
    {
        //解除警报
        NET_DVR_SetAlarmOut(lUserID,camConfig.lAlarmOutPort,0);
        //if (time(NULL) - last_alarmout >= 2)
        //{
            //解除警报
            NET_DVR_SetAlarmOut(lUserID,camConfig.lAlarmOutPort,0);
        //}
    }
    else
    {
        //开启警报
        if(NET_DVR_SetAlarmOut(lUserID,camConfig.lAlarmOutPort,1) == FALSE){
            printf("NET_DVR_SetAlarmOut failed, err: %d\n", NET_DVR_GetLastError());
        }
        last_alarmout = time(NULL);
    }
}

@@ -597,6 +609,67 @@
    //net_dvr_win_logo_cfg.byEnable = 0;
    //NET_DVR_SetDVRConfig(lUserID,NET_DVR_SET_WIN_LOGO_CFG,dwDecChanNum,&net_dvr_win_logo_cfg,net_dvr_win_logo_cfg.dwSize);
}


int hcnetsdk_alarm_logo_alarmout(LONG lUserID, const HCNetCameraConfig& _camConfig, const std::string& ip, int channel, bool disalarm)
{
    HCNetCameraConfig camConfig(_camConfig);
    //if (camConfig.channel != channel)
    //{
    //    camConfig.channel = -1;
    //    sockinfo* equipConfig = hcnetsdk_find_equip(ip, channel);
    //    if (equipConfig != NULL)
    //        camConfig = *(HCNetCameraConfig*)(equipConfig->user_config);
    //}
	
    printf("hcnetsdk_alarm_logo, channel=%d, matchc=%d\n", channel, camConfig.channel);
	
    if (camConfig.channel < 0)
        return -1;
	
    //窗口配置信息
    NET_DVR_WIN_LOGO_CFG net_dvr_win_logo_cfg;
    net_dvr_win_logo_cfg.dwLogoNo = 1;
    net_dvr_win_logo_cfg.byEnable = (disalarm ? 0 : 1);//0:hidden,1:visible
    net_dvr_win_logo_cfg.byRes1[3] =0;
    net_dvr_win_logo_cfg.dwCoordinateX = 5;
    net_dvr_win_logo_cfg.dwCoordinateY =5;
    net_dvr_win_logo_cfg.byFlash = 1;
    net_dvr_win_logo_cfg.byTranslucent = 0;
    net_dvr_win_logo_cfg.byRes2[34] = 0;

    net_dvr_win_logo_cfg.dwSize = sizeof(net_dvr_win_logo_cfg);
    //设置窗口输出logo
    int byWallNo=1,dwSubWinNo=2,dwWinNo=1;
	
    for (int i= 0; i < camConfig.dwWinNo.size(); i++)
    {
        DWORD dwDecChanNum=(camConfig.byWallNo << 24) | (camConfig.dwSubWinNo << 16) | camConfig.dwWinNo[i];
        if(!NET_DVR_SetDVRConfig(lUserID,NET_DVR_SET_WIN_LOGO_CFG,dwDecChanNum,&net_dvr_win_logo_cfg,net_dvr_win_logo_cfg.dwSize))
        {
            printf("NET_DVR_SetDVRConfig2 error, err: %d\n", NET_DVR_GetLastError());
            //return -1;
        }
        else
        {
            printf("NET_DVR_SetDVRConfig2 done.\n");
            //return 0;
        }
    }
	
    //if (!disalarm)
    //{
        //int hcnetsdk_alarm_alarmout(LONG lUserID, const HCNetCameraConfig& camConfig)
        hcnetsdk_alarm_alarmout(lUserID, camConfig, disalarm);
    //}
	
    return 0;
	
    //sleep(3);
    //net_dvr_win_logo_cfg.byEnable = 0;
    //NET_DVR_SetDVRConfig(lUserID,NET_DVR_SET_WIN_LOGO_CFG,dwDecChanNum,&net_dvr_win_logo_cfg,net_dvr_win_logo_cfg.dwSize);
}


int main(int argc,char **argv)
{
@@ -868,9 +941,11 @@
                {
                    std::cout << "......alarm begin k=" << k << std::endl;
                    if (equipConfig.m_type == ET_HCNET_DECODER_ALARMOUT && !isDisalarm)
                        hcnetsdk_alarm_alarmout(lUserData, *camConfig);
                        hcnetsdk_alarm_alarmout(lUserData, *camConfig, isDisalarm);
                    else if (equipConfig.m_type == ET_HCNET_DECODER_LOGO)
                        hcnetsdk_alarm_logo(lUserData, *camConfig, ip, channel, isDisalarm);
                    else if (equipConfig.m_type == ET_HCNET_DECODER_LOGO_ALARMOUT)
                        hcnetsdk_alarm_logo_alarmout(lUserData, *camConfig, ip, channel, isDisalarm);
                    std::cout << "......alarm end k=" << k << std::endl;
                }
                else