Z991239-890 #comment 1.引用框架v1.0.3，2.修复CMAKe编译的宏结束符

CMakeLists.txt

@@ -141,7 +141,7 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
-conan_cmake_run(REQUIRES RvcFramework/1.0.2-dev1@LR04.02_FrameworkLib/testing
+conan_cmake_run(REQUIRES RvcFramework/1.0.3-dev1@LR04.02_FrameworkLib/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 
@@ -240,7 +240,15 @@ if(MSVC)
 	STRING(REGEX REPLACE "^([A-Z]*.)([/\\].*)" "\\1" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
 	set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}\\")
 else(MSVC)
-		set(OUTPUT_CUR_DISK_PATH "/opt/")
+		STRING(REGEX MATCH "^/home/([A-Za-z0-9_]*)/" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
+		STRING(LENGTH ${CURRENT_DISK} disk_length)
+		if(${disk_length})
+			set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
+		else()
+			set(CURRENT_DISK "/opt/")
+		endif()
+		set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
+		message(STATUS "OUTPUT_CUR_DISK_PATH: ${OUTPUT_CUR_DISK_PATH}")
 endif(MSVC)
 set(OUTPUT_VERSION_DIR_PATH "${OUTPUT_CUR_DISK_PATH}run\\version")
 set(OUTPUT_CUR_VERSION_PATH "${OUTPUT_VERSION_DIR_PATH}\\${RVC_VERSION}")

DevAdapter/CMakeLists.txt

@@ -99,8 +99,8 @@ endif(NOT MSVC)
 
 set(VENDOR_LOG_LIB_NAME log4vendor)
 if(MSVC AND NOT RVC_INTEGRATE_BUILD)
-set(VENDOR_LOG_LIB_NAME log4vendord)
-endif(MSVC)
+    set(VENDOR_LOG_LIB_NAME log4vendord)
+endif(MSVC AND NOT RVC_INTEGRATE_BUILD)
 
 if(RVC_INTEGRATE_BUILD)
     add_subdirectory(self)

Module/CMakeLists.txt

@@ -4,7 +4,7 @@ macro(define_module _module_name)
 	set(MODULE_NAME "mod_${_module_name}")
     set(ENTITY_NAME "${_module_name}")
 	string(TOUPPER "${MODULE_NAME}" MODULE_PREFIX)
-endmacro(define_moudle)
+endmacro(define_module)
 
 if(RVC_DEBUG_MODE)
     set(RVCCOMM_LIB RVCCommD)

addin/cfg/shell.ini.in

@@ -104,7 +104,6 @@ Number=1
 1=TestDeamon TestMode=ON Level=3 Entity=BlackSheep -D
 
 [SysEvent]
-;HelloState=HelloService,"0"
 ;CallState=CounterConnector,"O"
 ;BackInitiative=InitiativeTransfer,"O"
 ;CustomerBeing=CustomerAware,"S"
@@ -112,7 +111,7 @@ Number=1
 ;VideoWindowInitializeParam=IEBrowser,"hwnd1_remote:(1728,140,1024,768),hwnd2_local(2830,800,320,240)"
 ;LockScreen=TimePolicy,"N"
 ;ActiveTrackingCamera=FaceTracking,"E"
-EntryPermit=AccessAuthorization,"I"
+;EntryPermit=AccessAuthorization,"I"
 ;TerminalStage=HealthManager,"A"
 ;IEUrl=HealthManager,"http://99.8.42.90/RVC.Web/default.aspx http://99.8.42.90/RVC.Web/default2.aspx"
 ;RunState=HealthManager,"O"
@@ -144,9 +143,9 @@ EntryPermit=AccessAuthorization,"I"
 ;UpdateState=UpgradeManager,"0"
 ;WKSyncSuccTime=AccessAuthorization,""
 ;WKSyncFailCount=AccessAuthorization,"0"
-FWBVendor=CardSwiper,""
-FWBDevSN=CardSwiper,""
-FWBVersion=CardSwiper,""
+;FWBVendor=CardSwiper,""
+;FWBDevSN=CardSwiper,""
+;FWBVersion=CardSwiper,""
 ;NetState=MobileDial,"N"