Z991239-5077 #comment 优化音量调节接口

Module/mod_interactivecontrol/InteractiveControl.xml

@@ -422,7 +422,7 @@
 			</req>
 		</twoway>
 		<!--»ñÈ¡ºô½Ð״̬-->
-		<twoway name="GetCallStatse" overlap="true">
+		<twoway name="GetCallState" overlap="true">
 			<req>
 			</req>
 			<res>

Module/mod_interactivecontrol/InteractiveControl_client_g.h

@@ -2269,7 +2269,7 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum GetCallStatse(UIService_GetCallStatse_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum GetCallState(UIService_GetCallState_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
@@ -2279,14 +2279,14 @@ public:
 			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
 			m_context = m_context.upgradeLink();
 		}
-		auto ret = pFunc->AsyncRequest(UIService_Method_GetCallStatse, UIService_MethodSignature_GetCallStatse, Buf, spAsyncWait, m_context, dwTimeout);
+		auto ret = pFunc->AsyncRequest(UIService_Method_GetCallState, UIService_MethodSignature_GetCallState, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
 	}
-	ErrorCodeEnum GetCallStatse(UIService_GetCallStatse_Req &Req, UIService_GetCallStatse_Ans &Ans, DWORD dwTimeout)
+	ErrorCodeEnum GetCallState(UIService_GetCallState_Req &Req, UIService_GetCallState_Ans &Ans, DWORD dwTimeout)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetCallStatse(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetCallState(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
@@ -2294,10 +2294,10 @@ public:
 		}
 		return Error;
 	}
-	ErrorCodeEnum GetCallStatse(UIService_GetCallStatse_Req &Req, UIService_GetCallStatse_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	ErrorCodeEnum GetCallState(UIService_GetCallState_Req &Req, UIService_GetCallState_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetCallStatse(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetCallState(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
@@ -2305,10 +2305,10 @@ public:
 		}
 		return Error;
 	}
-	ErrorCodeEnum GetCallStatse(UIService_GetCallStatse_Req &Req, UIService_GetCallStatse_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	ErrorCodeEnum GetCallState(UIService_GetCallState_Req &Req, UIService_GetCallState_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetCallStatse(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetCallState(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			CSimpleString str;

Module/mod_interactivecontrol/InteractiveControl_def_g.h

@@ -74,7 +74,7 @@ namespace InteractiveControl {
 #define UIService_Method_GetRecordMode 52
 #define UIService_Method_StartTransactionRecord 53
 #define UIService_Method_StopTransactionRecord 54
-#define UIService_Method_GetCallStatse 55
+#define UIService_Method_GetCallState 55
 #define UIService_Method_HangupCall 56
 #define UIService_Method_GetTransactionRecordState 57
 #define UIService_Method_GetHandfreeInVolume 58
@@ -137,7 +137,7 @@ namespace InteractiveControl {
 #define UIService_MethodSignature_GetRecordMode -1617187757
 #define UIService_MethodSignature_StartTransactionRecord 339746588
 #define UIService_MethodSignature_StopTransactionRecord 1197230846
-#define UIService_MethodSignature_GetCallStatse -1446312706
+#define UIService_MethodSignature_GetCallState -1446312706
 #define UIService_MethodSignature_HangupCall 478500367
 #define UIService_MethodSignature_GetTransactionRecordState -923839253
 #define UIService_MethodSignature_GetHandfreeInVolume -973146972
@@ -1223,7 +1223,7 @@ struct UIService_StopTransactionRecord_Ans
 
 };
 
-struct UIService_GetCallStatse_Req
+struct UIService_GetCallState_Req
 {
 
 	void Serialize(SpBuffer &Buf)
@@ -1232,7 +1232,7 @@ struct UIService_GetCallStatse_Req
 
 };
 
-struct UIService_GetCallStatse_Ans
+struct UIService_GetCallState_Ans
 {
 	int iState;
 

Module/mod_interactivecontrol/InteractiveControl_server_g.h

@@ -415,8 +415,8 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UIService_Method_GetCallStatse:
-			if (dwSignature == UIService_MethodSignature_GetCallStatse) {
+		case UIService_Method_GetCallState:
+			if (dwSignature == UIService_MethodSignature_GetCallState) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
@@ -750,8 +750,8 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UIService_Method_GetCallStatse:
-			if (dwSignature != UIService_MethodSignature_GetCallStatse) {
+		case UIService_Method_GetCallState:
+			if (dwSignature != UIService_MethodSignature_GetCallState) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
@@ -1067,7 +1067,7 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_GetCallStatse(SpReqAnsContext<UIService_GetCallStatse_Req, UIService_GetCallStatse_Ans>::Pointer ctx)
+	virtual void Handle_GetCallState(SpReqAnsContext<UIService_GetCallState_Req, UIService_GetCallState_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
@@ -1668,14 +1668,14 @@ public:
 						Handle_StopTransactionRecord(ctx);
 					}
 					break;
-				case UIService_Method_GetCallStatse:
+				case UIService_Method_GetCallState:
 					{
-						SpReqAnsContext<UIService_GetCallStatse_Req,UIService_GetCallStatse_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UIService_GetCallStatse_Req,UIService_GetCallStatse_Ans>(pTransactionContext));
+						SpReqAnsContext<UIService_GetCallState_Req,UIService_GetCallState_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<UIService_GetCallState_Req,UIService_GetCallState_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
 						EntityResource::setLink(ctx->link);
-						Handle_GetCallStatse(ctx);
+						Handle_GetCallState(ctx);
 					}
 					break;
 				case UIService_Method_HangupCall:

Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -2546,7 +2546,7 @@ void UIServiceSession::Handle_StopTransactionRecord(SpReqAnsContext<UIService_St
 }
 
 
-void UIServiceSession::Handle_GetCallStatse(SpReqAnsContext<UIService_GetCallStatse_Req, UIService_GetCallStatse_Ans>::Pointer ctx)
+void UIServiceSession::Handle_GetCallState(SpReqAnsContext<UIService_GetCallState_Req, UIService_GetCallState_Ans>::Pointer ctx)
 {
 	DbgToBeidou(ctx->link, __FUNCTION__)();
 

Module/mod_interactivecontrol/mod_interactivecontrol.h

@@ -414,7 +414,7 @@ public:
 
 	virtual void Handle_StopTransactionRecord(SpReqAnsContext<UIService_StopTransactionRecord_Req, UIService_StopTransactionRecord_Ans>::Pointer ctx);
 
-	virtual void Handle_GetCallStatse(SpReqAnsContext<UIService_GetCallStatse_Req, UIService_GetCallStatse_Ans>::Pointer ctx);
+	virtual void Handle_GetCallState(SpReqAnsContext<UIService_GetCallState_Req, UIService_GetCallState_Ans>::Pointer ctx);
 
 	virtual void Handle_HangupCall(SpOnewayCallContext<UIService_HangupCall_Info>::Pointer ctx);