Browse Source

#IQBX #comment mod_countercontext 编译通过

80374374 1 year ago
parent
commit
da7669b613

+ 0 - 1
Module/mod_accessauth/CMakeLists.txt

@@ -36,7 +36,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${MODULE_BASE_DIR}/mod_tokenmgr
 	${MODULE_BASE_DIR}/mod_pinpad
-	${MODULE_BASE_DIR}/mod_MaintainWatcher
 	${OTHER_LIB_BASE_DIR}/libpublicFun
 )
 

+ 1 - 0
Module/mod_countercontext/CMakeLists.txt

@@ -13,6 +13,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
+	${MODULE_BASE_DIR}/mod_assistantchannel
 )
 
 # 添加实体需要依赖的其他共享库(包括系统库)

+ 7 - 6
Module/mod_countercontext/mod_countercontext.cpp

@@ -7,10 +7,10 @@
 #include "CounterContext_msg_g.h"
 using namespace CounterContext;
 
-#include "mod_assistantchannel/AssistantChannel_client_g.h"
+#include "AssistantChannel_client_g.h"
 using namespace AssistantChannel;
-#include "mod_assistantchannel/chan_protocol.h"
-#include "../include/EventCode.h"
+#include "chan_protocol.h"
+#include "EventCode.h"
 
 
 class CCounterContextEntity;
@@ -106,6 +106,9 @@ public:
 			SpBuffer buf;
 			buf.OpenRead(buffer, size);
 
+#if defined(RVC_OS_WIN)
+			evt.Serialize(buf);
+#else
 			CSimpleString16Bit name16;
 			buf& name16;
 			evt.name = CSimpleString16Bit2A(name16);
@@ -129,11 +132,9 @@ public:
 			CSimpleString16Bit level16;
 			buf& level16;
 			evt.level = CSimpleString16Bit2A(level16);
+#endif //RVC_OS_WIN
 
-			//evt.Serialize(buf);
 			SpSendBroadcast(GetFunction(), SP_MSG_OF(CounterBasicInfo), SP_MSG_SIG_OF(CounterBasicInfo), evt);
-			//Dbg("SpSendBroadcast CounterBasicInfo and callid = %s, name = %s, workNumber = %s, level = %s, skillCode = %s, skillDesc = %s.", evt.callid.GetData(), evt.name.GetData(), evt.workNumber.GetData(), evt.level.GetData(), evt.skillCode.GetData(), evt.skillDesc.GetData());
-
 		} else {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("unknown sub_type %d from agent!", sub_type);
 		}