Z991239-5647 #comment 优化录像实体

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -351,7 +351,7 @@ void SalesRecordServiceSession::Handle_CheckVideoDiskStatus( SpReqAnsContext<Sal
 {
 	DbgToBeidou(ctx->link, __FUNCTION__)();
 	int nFreeRatio = 0;
-	int bSufficient = CheckDiskStatus((LPCTSTR)ctx->Req.DriveLetter,m_pEntity->m_max_disk_percent,&nFreeRatio);
+	int bSufficient = CheckDiskStatus(ctx->Req.DriveLetter.GetData(), m_pEntity->GetMaxDiskPercent(), &nFreeRatio);
 	ctx->Ans.IsSufficient = bSufficient;
 	ctx->Ans.FreeRatio = nFreeRatio;
 	ctx->Answer(Error_Succeed);
@@ -1859,6 +1859,11 @@ ErrorCodeEnum CSalesRecorderEntity::SetRecordCamera(int iCamera)
 	return Error;
 }
 
+int CSalesRecorderEntity::GetMaxDiskPercent()
+{
+	return m_max_disk_percent;
+}
+
 ErrorCodeEnum CSalesRecorderEntity::GetEntityConfig()
 {
 	ErrorCodeEnum Error = Error_Succeed;

Module/mod_SalesRecorder/mod_SalesRecorder.h

@@ -34,30 +34,6 @@ namespace SalesRecorder {
 		char Reserved2[128];
 	} RecordSubTitle;
 
-	
-	class CSalesRecorderEntity;
-	
-	class SalesRecordServiceSession : public SalesRecorderSerVice_ServerSessionBase
-	{
-	public:
-		explicit SalesRecordServiceSession(CSalesRecorderEntity *pEntity) : m_pEntity(pEntity){}
-		virtual void Handle_GetOFLVideoRecords(SpReqAnsContext<SalesRecorderSerVice_GetOFLVideoRecords_Req, SalesRecorderSerVice_GetOFLVideoRecords_Ans>::Pointer ctx);
-		virtual void Handle_CheckVideoDiskStatus(SpReqAnsContext<SalesRecorderSerVice_CheckVideoDiskStatus_Req, SalesRecorderSerVice_CheckVideoDiskStatus_Ans>::Pointer ctx);
-		virtual void Handle_PlayVideo(SpReqAnsContext<SalesRecorderSerVice_PlayVideo_Req, SalesRecorderSerVice_PlayVideo_Ans>::Pointer ctx);
-		virtual void Handle_SaveVideo(SpReqAnsContext<SalesRecorderSerVice_SaveVideo_Req, SalesRecorderSerVice_SaveVideo_Ans>::Pointer ctx);
-		virtual void Handle_StopRecord(SpReqAnsContext<SalesRecorderSerVice_StopRecord_Req, SalesRecorderSerVice_StopRecord_Ans>::Pointer ctx);
-		virtual void Handle_SetAudioTransFlag(SpReqAnsContext<SalesRecorderSerVice_SetAudioTransFlag_Req, SalesRecorderSerVice_SetAudioTransFlag_Ans>::Pointer ctx);
-		virtual void Handle_StopShowVideo(SpReqAnsContext<SalesRecorderSerVice_StopShowVideo_Req, SalesRecorderSerVice_StopShowVideo_Ans>::Pointer ctx);
-		virtual void Handle_PlaySalesRecord(SpReqAnsContext<SalesRecorderSerVice_PlaySalesRecord_Req, SalesRecorderSerVice_PlaySalesRecord_Ans>::Pointer ctx);
-		virtual void Handle_StartRemoteRecord(SpReqAnsContext<SalesRecorderSerVice_StartRemoteRecord_Req, SalesRecorderSerVice_StartRemoteRecord_Ans>::Pointer ctx);
-		virtual void Handle_DeleteVideo(SpReqAnsContext<SalesRecorderSerVice_DeleteVideo_Req, SalesRecorderSerVice_DeleteVideo_Ans>::Pointer ctx);
-		virtual void Handle_AppendWatermark(SpReqAnsContext<SalesRecorderSerVice_AppendWatermark_Req, SalesRecorderSerVice_AppendWatermark_Ans>::Pointer ctx);
-		virtual void Handle_SetRecordCamera(SpReqAnsContext<SalesRecorderSerVice_SetRecordCamera_Req, SalesRecorderSerVice_SetRecordCamera_Ans>::Pointer ctx);
-
-	private:
-		CSalesRecorderEntity *m_pEntity;
-	};
-
 
 #ifdef RVC_OS_WIN
 	class CSalesRecorderEntity : public CEntityBase, public CHostApi, public ILogListener,public ISysVarListener, public ITimerListener
@@ -183,6 +159,8 @@ namespace SalesRecorder {
 
 		ErrorCodeEnum GetEntityConfig();
 
+		int GetMaxDiskPercent();
+
 	private:
 		DeviceTypeEnum m_eDeviceType;
 		int m_iActiveCamera;
@@ -228,7 +206,28 @@ namespace SalesRecorder {
 		eRvcBusinessStatus m_eBusinessStatus;
 		bool m_bEncFlag;
 		int m_iRemoteRecordType;
+	};
+
+
+	class SalesRecordServiceSession : public SalesRecorderSerVice_ServerSessionBase
+	{
+	public:
+		explicit SalesRecordServiceSession(CSalesRecorderEntity* pEntity) : m_pEntity(pEntity) {}
+		virtual void Handle_GetOFLVideoRecords(SpReqAnsContext<SalesRecorderSerVice_GetOFLVideoRecords_Req, SalesRecorderSerVice_GetOFLVideoRecords_Ans>::Pointer ctx);
+		virtual void Handle_CheckVideoDiskStatus(SpReqAnsContext<SalesRecorderSerVice_CheckVideoDiskStatus_Req, SalesRecorderSerVice_CheckVideoDiskStatus_Ans>::Pointer ctx);
+		virtual void Handle_PlayVideo(SpReqAnsContext<SalesRecorderSerVice_PlayVideo_Req, SalesRecorderSerVice_PlayVideo_Ans>::Pointer ctx);
+		virtual void Handle_SaveVideo(SpReqAnsContext<SalesRecorderSerVice_SaveVideo_Req, SalesRecorderSerVice_SaveVideo_Ans>::Pointer ctx);
+		virtual void Handle_StopRecord(SpReqAnsContext<SalesRecorderSerVice_StopRecord_Req, SalesRecorderSerVice_StopRecord_Ans>::Pointer ctx);
+		virtual void Handle_SetAudioTransFlag(SpReqAnsContext<SalesRecorderSerVice_SetAudioTransFlag_Req, SalesRecorderSerVice_SetAudioTransFlag_Ans>::Pointer ctx);
+		virtual void Handle_StopShowVideo(SpReqAnsContext<SalesRecorderSerVice_StopShowVideo_Req, SalesRecorderSerVice_StopShowVideo_Ans>::Pointer ctx);
+		virtual void Handle_PlaySalesRecord(SpReqAnsContext<SalesRecorderSerVice_PlaySalesRecord_Req, SalesRecorderSerVice_PlaySalesRecord_Ans>::Pointer ctx);
+		virtual void Handle_StartRemoteRecord(SpReqAnsContext<SalesRecorderSerVice_StartRemoteRecord_Req, SalesRecorderSerVice_StartRemoteRecord_Ans>::Pointer ctx);
+		virtual void Handle_DeleteVideo(SpReqAnsContext<SalesRecorderSerVice_DeleteVideo_Req, SalesRecorderSerVice_DeleteVideo_Ans>::Pointer ctx);
+		virtual void Handle_AppendWatermark(SpReqAnsContext<SalesRecorderSerVice_AppendWatermark_Req, SalesRecorderSerVice_AppendWatermark_Ans>::Pointer ctx);
+		virtual void Handle_SetRecordCamera(SpReqAnsContext<SalesRecorderSerVice_SetRecordCamera_Req, SalesRecorderSerVice_SetRecordCamera_Ans>::Pointer ctx);
 
-		friend class SalesRecordServiceSession;
+	private:
+		CSalesRecorderEntity* m_pEntity;
 	};
+
 }