Răsfoiți Sursa

#IQRV #comment [BugFix] 胡chen坐席通道乱码解决,更新框架版本1.0.7-dev3

gifur 4 ani în urmă
părinte
comite
484503c0f5

+ 1 - 1
CMakeLists.txt

@@ -152,7 +152,7 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
-conan_cmake_run(REQUIRES RvcFramework/1.0.7-dev2@LR04.02_FrameworkLib/testing
+conan_cmake_run(REQUIRES RvcFramework/1.0.7-dev3@LR04.02_FrameworkLib/testing
 	Audio/2020.1230.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 

+ 9 - 3
Module/mod_initiativetransfer/FlowControlFSM.cpp

@@ -185,7 +185,9 @@ unsigned int CFlowControlFSM::s1_on_event(FSMEvent* event)
 			Info.type = ACM_TYPE_FLW;
 			SpBuffer buf;
 			buf.OpenWrite();
-			buf & rafe->req_context;
+			CSimpleString16Bit reqContext = CSimpleStringW216Bit(rafe->req_context);
+			buf & reqContext;
+			Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(reqContext).GetData());
 			Info.data = buf.ToBlob();
 			Error = m_pClient->Send(Info);
 		} else 
@@ -262,7 +264,9 @@ unsigned int CFlowControlFSM::s3_on_event(FSMEvent* event)
 			Info.type = ACM_TYPE_FLW;
 			SpBuffer buf;
 			buf.OpenWrite();
-			buf & afe->ans_context;
+            CSimpleString16Bit ansContext = CSimpleStringW216Bit(afe->ans_context);
+            buf& ansContext;
+            Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(ansContext).GetData());
 			Info.data = buf.ToBlob();
 			Error = m_pClient->Send(Info);
 		} else {
@@ -300,7 +304,9 @@ unsigned int CFlowControlFSM::s5_on_event(FSMEvent* event)
 			Info.type = ACM_TYPE_FLW;
 			SpBuffer buf;
 			buf.OpenWrite();
-			buf & rafe->req_context;
+            CSimpleString16Bit reqContext = CSimpleStringW216Bit(rafe->req_context);
+            buf& reqContext;
+            Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(reqContext).GetData());
 			Info.data = buf.ToBlob();
 			Error = m_pClient->Send(Info);
 		} else {

+ 17 - 6
Module/mod_interactivecontrol/mod_interactivecontrol.cpp

@@ -751,8 +751,10 @@ public:
 				if (m_nSysCallType == 0)
 				{
 					SpBuffer buf;
-					buf.OpenWrite(32 + m_strMenuTree.GetLength()*2);
-					buf & m_strMenuTree;
+					buf.OpenWrite(32 + m_strMenuTree.GetLength() * 2);
+                    CSimpleString16Bit menuTree = CSimpleStringW216Bit(m_strMenuTree);
+                    buf& menuTree;
+                    Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuTree).GetData());
 					ChannelService_Send_Info Info;
 					Info.sub_type = ACM_IM_MENUTREE;
 					Info.type = ACM_TYPE_IM;
@@ -780,7 +782,9 @@ public:
 				{
 					SpBuffer buf;
 					buf.OpenWrite(32 + m_strMenuPath.GetLength()*2);
-					buf & m_strMenuPath;
+                    CSimpleString16Bit menuPath = CSimpleStringW216Bit(m_strMenuPath);
+                    buf& menuPath;
+                    Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(menuPath).GetData());
 					ChannelService_Send_Info Info;
 					Info.sub_type = ACM_IM_MENUPATH;
 					Info.type = ACM_TYPE_IM;
@@ -807,7 +811,9 @@ public:
 		{
 			SpBuffer buf;
 			buf.OpenWrite(32 + strText.GetLength()*2);
-			buf & strText;
+            CSimpleString16Bit convertData = CSimpleStringW216Bit(strText);
+            buf& convertData;
+            Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertData).GetData());
 			ChannelService_Send_Info Info;
 			Info.sub_type = ACM_IM_SHOWTEXT;
 			Info.type = ACM_TYPE_IM;
@@ -846,7 +852,10 @@ public:
 		{
 			SpBuffer buf;
 			buf.OpenWrite(32 + strContent.GetLength()*2);
-			buf & id & strContent;
+			buf& id;
+            CSimpleString16Bit convertedData = CSimpleStringW216Bit(strContent);
+            buf& convertedData;
+            Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
 			ChannelService_Send_Info Info;
 			Info.sub_type = ACM_IM_FRONTSYNC;
 			Info.type = ACM_TYPE_IM;
@@ -1008,7 +1017,9 @@ public:
 	{
 		SpBuffer buf;
 		buf.OpenWrite();
-		buf & packet;
+        CSimpleString16Bit convertedData = CSimpleStringW216Bit(packet);
+        buf& convertedData;
+        Dbg("%s After convert: %s", __FUNCTION__, CSimpleString16Bit2A(convertedData).GetData());
 		ChannelService_Send_Info Info;
 		Info.sub_type = ACM_SUBTYPE_ANS_FLOW;
 		Info.compress = true;