Z991239-3624 #comment 优化开始和停止远程双录接口返回值

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -310,7 +310,6 @@ void SalesRecordServiceSession::Handle_SaveVideo(SpReqAnsContext<SalesRecorderSe
 
 void SalesRecordServiceSession::Handle_StopRecord(SpReqAnsContext<SalesRecorderSerVice_StopRecord_Req, SalesRecorderSerVice_StopRecord_Ans>::Pointer ctx)
 {
-	Dbg("Stop Record name is %s.", (LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleStopRecord((LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
 	ctx->Answer(ErrorCode);
 }
@@ -1060,7 +1059,7 @@ ErrorCodeEnum CSalesRecorderEntity::StopRecord()
 		m_bStarted = FALSE;
 	}
 	else{
-		eCode = Error_NotImpl;
+		eCode = Error_InvalidState;
 	}
 
 	return eCode;

Module/mod_counterconnector/ConnectorFSM.h

@@ -599,6 +599,9 @@ private:
 				}
 			}
 		}
+
+		close(sockfd);
+
 		return error;
 #endif
 	}

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -2362,7 +2362,7 @@ void UIServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<UIService_StartR
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "录音录像设备正在启动，请稍后重试！");
 		}
 		else if (camstate[0] == 'E'){
-			ctx->Ans.ErrorCode = 0x30B81003;
+			ctx->Ans.ErrorCode = Error_DevNotAvailable;
 			ctx->Ans.ErrorMsg = CSimpleStringA2W("摄像头故障，请联系分行技术部！");
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_START_REMOTERECORD_FAILED, "env 摄像头故障，启动远程双录失败");
 		}

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -1432,7 +1432,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::StartNotice(int nCfgInx, int nWndX, int nWn
 			}
 		}
 		else {
-			Error = Error_NotExist;
+			Error = Error_InvalidState;
 			char strmsg[MAX_PATH] = { 0 };
 			_snprintf(strmsg, MAX_PATH, "play notice failed for %s not exist!", strNoticeFileName.GetData());
 			LogWarn(Severity_Middle, Error_Debug, LOG_EVT_NOTICE_FILE_NOT_EXIST, strmsg);

Module/mod_sipphone/mod_sipphone.cpp

@@ -1280,6 +1280,7 @@ ErrorCodeEnum CSIPEntity::GetLocalIP()
 			}
 		}
 	}
+	close(sockfd);
 	return error;
 #endif // RVC_OS_WIN
 }