~chenshijun/c++.git

			@@ -107,7 +107,12 @@

			std::string loadFaceFeaData(std::string ip, unsigned int port, std::string content, PResponse &response);


			std::string getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content, PResponse &response);





			std::string getRecordVideoPath(std::string ip, unsigned int port, std::string content, PResponse &response);

			@@ -176,12 +181,35 @@
			unsigned char *serialNumber = NULL) const;

			bool createDevId(const int &dev_batch, const int &dev_sequence);

			std::string getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub);



			//std::string getVideoPathByTime(const std::string &strImageName, const std::string &camId, qint64 &sub);
			//std::string getVideoPathByTime2(const std::string &strImageName, const std::string &camId, qint64 &sub);
			std::vector<std::string> forEachFile(const std::string &dir_name);

			qint64 getVideoTime(/const std::string& videoPath/std::string &str_tmpTime);


			//根据PicDate进行相关的操作
			std::string getAlarmImageFromVideoFileByPicDate(const std::string& devId,const std::string& picDate,
			PResponse &response);

			std::string getAlarmImageFromVideoFileByImageKey(const std::string& devId,const std::string& imgKey,
			PResponse &response);

			std::string getRecordVideoPathNew(std::string ip, unsigned int port, std::string content, PResponse &response);

			std::string getAlarmImageFromVideoFile2(std::string ip, unsigned int port, std::string content, PResponse &response);

			std::string getVideoPathByPicDate(const std::string &time, const std::string &camId, qint64 &sub);
			//根据ImageKey获取视频的路径
			std::string getVideoPathByImgKey(const std::string &strImageName, const std::string &camId);

			//std::string getVideoPathByTimeByPicDate(const std::string &time, const std::string &camId, qint64 &sub);
			std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);

			std::string GetVideoByImgKey(const std::string strImageName,const std::string& strPath);

			};

			#endif