Z991239-968 #comment feat: UOS下编译，调整shell和healthmanager配置文件

DevAdapter/CMakeLists.txt

@@ -112,7 +112,7 @@ endif(RVC_INTEGRATE_BUILD)
 
 message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}.")
 
-#add_subdirectory(cmbsz)
+add_subdirectory(cmbsz)
 
 if(RVC_INTEGRATE_BUILD)
     list(REMOVE_DUPLICATES RVC_VENDOR_DEP_LIB_DIRS)

Module/CMakeLists.txt

@@ -143,8 +143,23 @@ endif(BUILD_MOUDLE_TEST)
 set(MODULE_CONAN_DEP_LIBS)
 
 # 遍历实体
-rvc_add_all_cmake_subdirectory()
-
+# rvc_add_all_cmake_subdirectory()
+add_subdirectory(mod_deviceswitch)
+add_subdirectory(mod_CardReadAdapter)
+add_subdirectory(mod_cardissuer)
+add_subdirectory(mod_pinpad)
+add_subdirectory(mod_IDCertificate)
+add_subdirectory(mod_CustMngrAuth)
+add_subdirectory(mod_FingerPrint)
+add_subdirectory(mod_customeraware)
+add_subdirectory(mod_interactivecontrol)
+add_subdirectory(mod_upload)
+add_subdirectory(mod_download)
+add_subdirectory(mod_CenterSetting)
+add_subdirectory(mod_evtconverter)
+add_subdirectory(mod_watchdog)
+add_subdirectory(mod_interactivelog)
+add_subdirectory(mod_healthmanager)
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 

Module/mod_evtconverter/CMakeLists.txt

@@ -9,6 +9,10 @@ set(${MODULE_PREFIX}_SRCS
 set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
+conan_cmake_run(REQUIRES scew/1.1.7@LR04.02_ThirdParty/stable
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_SCEW}
 	${CONAN_INCLUDE_DIRS_EXPAT}
@@ -25,4 +29,10 @@ target_link_directories(${MODULE_NAME} PRIVATE
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_ALL_LIBS} scew expat)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
+
+if(MSVC)
+	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+endif(MSVC)

Other/CMakeLists.txt

@@ -2,5 +2,6 @@ if(SIMULATE_ON)
 	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
 endif(SIMULATE_ON)
 
+add_subdirectory(libimageproc)
 
-rvc_add_all_cmake_subdirectory()
+# rvc_add_all_cmake_subdirectory()

addin/cfg/HealthManager.ini

@@ -1,11 +1,11 @@
 [CoreBoot.RVC.Stand2S]
-UpLog=0
+;UpLog=0
 ;SystemCustomization=2
 ;MobileDial=0
-WatchDog=0
-Ups=2
-SafeLock=0
-DeviceControl=0
+;WatchDog=0
+;Ups=2
+;SafeLock=0
+;DeviceControl=0
 CardReadAdapter=0
 CustMngrAuth=0
 
@@ -65,49 +65,48 @@ PortableScanner=0
 CardIssuer=0
 
 [SafeLoad.RVC.Stand2S]
-Initializer=2
+;Initializer=2
 CenterSetting=2
-SystemCustomization=2
-SelfChecker=2
-HeartBeat=2
-Alarm=1
+;SystemCustomization=2
+;SelfChecker=2
+;HeartBeat=2
+;Alarm=1
 DeviceSwitch=2
 EventConverter=2
-FaceTracking=0
-AssistantChannel=2
-LocalMediaPlay=0
-SIPPhone=2
-InteractionContext=2
-CounterConnector=2
-HandWritingInput=2
-InitiativeTransfer=2
+;FaceTracking=0
+;AssistantChannel=2
+;LocalMediaPlay=0
+;SIPPhone=2
+;InteractionContext=2
+;CounterConnector=2
+;HandWritingInput=2
+;InitiativeTransfer=2
 InteractiveControl=2
-CounterContext=2
-ScreenShot=2
-SnapShot=2
-CustomerAware=2
-AgentInterpreter=2
+;CounterContext=2
+;ScreenShot=2
+;SnapShot=2
+;CustomerAware=2
+;AgentInterpreter=2
 InteractiveLog=2
 Upload=0
-MediaController=0
-Recorder=0
-SalesRecorder=0
-LivenessDetection=0
+;MediaController=0
+;Recorder=0
+;SalesRecorder=0
+;LivenessDetection=0
 Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-;CenterSetting=2
-AccessAuthorization=2
+;TokenKeeper=2
+;UpgradeRun=2
+;UpgradeManager=2
+;AccessAuthorization=2
 PinPad=2
-HSPScanner=0
-BranchDevice=0
-MaintainWatcher=0
-RemoteController=0
-ResourceWatcher=0
-CameraConfigManage=0
-SalesAudioTrans=0
-Chromium=0
+;HSPScanner=0
+;BranchDevice=0
+;MaintainWatcher=0
+;RemoteController=0
+;ResourceWatcher=0
+;CameraConfigManage=0
+;SalesAudioTrans=0
+;Chromium=0
 
 [SafeLoad.RVC.PAD]
 ScannerSet=0
@@ -385,12 +384,12 @@ SalesAudioTrans=0
 ;PinPad=2
 CardIssuer=2
 IDCertificate=2
-Gpio=2
-ScannerSet=0
-ContactlessCard=0
-print=0
-ThermalPrint=0
-PrintSeal=0
+;Gpio=2
+;ScannerSet=0
+;ContactlessCard=0
+;print=0
+;ThermalPrint=0
+;PrintSeal=0
 FingerPrint=0
 
 [Operating.RVC.PAD]

addin/cfg/shell.ini.in

@@ -9,28 +9,28 @@ SoftwareVersion=@RVC_FRAMEWORK_VERSION@
 
 CenterSetting=0,@LIB_PREFIX@mod_CenterSetting@LIB_SUFFIX@,0x101
 CustMngrAuth=0,@LIB_PREFIX@mod_CustMngrAuth@LIB_SUFFIX@,0x102
-;EventConverter=0,@LIB_PREFIX@mod_evtconverter@LIB_SUFFIX@,0x103
-Upload=0,@LIB_PREFIX@mod_Upload@LIB_SUFFIX@,0x104
-;Download=0,@LIB_PREFIX@mod_download@LIB_SUFFIX@,0x105
-;InteractiveLog=0,@LIB_PREFIX@mod_interactivelog@LIB_SUFFIX@,0x106
+EventConverter=0,@LIB_PREFIX@mod_evtconverter@LIB_SUFFIX@,0x103
+Upload=0,@LIB_PREFIX@mod_upload@LIB_SUFFIX@,0x104
+Download=0,@LIB_PREFIX@mod_download@LIB_SUFFIX@,0x105
+InteractiveLog=0,@LIB_PREFIX@mod_interactivelog@LIB_SUFFIX@,0x106
 ;Alarm=0,@LIB_PREFIX@mod_alarm@LIB_SUFFIX@,0x107
 ;WinIO=0,@LIB_PREFIX@mod_winio@LIB_SUFFIX@,0x109
-TokenKeeper=0,@LIB_PREFIX@mod_TokenMgr@LIB_SUFFIX@,0x10A
+;TokenKeeper=0,@LIB_PREFIX@mod_TokenMgr@LIB_SUFFIX@,0x10A
 ;SystemCustomization=0,@LIB_PREFIX@mod_systemcustomization@LIB_SUFFIX@,0x10B
 ;FreeRDPWrap=0,@LIB_PREFIX@mod_FreeRdpWrap@LIB_SUFFIX@,0x10C
-BootManager=1,@LIB_PREFIX@mod_BootManager@LIB_SUFFIX@,0x10D
+;BootManager=1,@LIB_PREFIX@mod_BootManager@LIB_SUFFIX@,0x10D
 ;HolderContext=0,@LIB_PREFIX@mod_HolderContext@LIB_SUFFIX@,0x315
 
 IDCertificate=0,@LIB_PREFIX@mod_IDCertificate@LIB_SUFFIX@,0x201
-CardSwiper=0,@LIB_PREFIX@mod_CardSwiper@LIB_SUFFIX@,0x202
-;CardIssuer=0,@LIB_PREFIX@mod_CardIssuer@LIB_SUFFIX@,0x203
+;CardSwiper=0,@LIB_PREFIX@mod_CardSwiper@LIB_SUFFIX@,0x202
+CardIssuer=0,@LIB_PREFIX@mod_CardIssuer@LIB_SUFFIX@,0x203
 FingerPrint=0,@LIB_PREFIX@mod_FingerPrint@LIB_SUFFIX@,0x204
 ;Printer=0,@LIB_PREFIX@mod_printer@LIB_SUFFIX@,0x205
 PinPad=0,@LIB_PREFIX@mod_PinPad@LIB_SUFFIX@,0x206
 ;MediaController=0,@LIB_PREFIX@mod_mediacontroller@LIB_SUFFIX@,0x208
 ;Gpio=0,@LIB_PREFIX@mod_gpio@LIB_SUFFIX@,0x209
 WatchDog=0,@LIB_PREFIX@mod_WatchDog@LIB_SUFFIX@,0x20D
-Ups=0,@LIB_PREFIX@mod_Ups@LIB_SUFFIX@,0x20E
+;Ups=0,@LIB_PREFIX@mod_Ups@LIB_SUFFIX@,0x20E
 ;MaintainWatcher=0,@LIB_PREFIX@mod_MaintainWatcher@LIB_SUFFIX@,0x210
 ;Radar=0,@LIB_PREFIX@mod_radar@LIB_SUFFIX@,0x211
 ;MobileDial=0,@LIB_PREFIX@mod_MobileDial@LIB_SUFFIX@,0x212
@@ -38,11 +38,11 @@ Ups=0,@LIB_PREFIX@mod_Ups@LIB_SUFFIX@,0x20E
 ;DeviceControl=0,@LIB_PREFIX@mod_DeviceControl@LIB_SUFFIX@,0x214
 ;PrintSeal=0,@LIB_PREFIX@mod_printseal@LIB_SUFFIX@,0x215
 ;Print=0,@LIB_PREFIX@mod_print@LIB_SUFFIX@,0x216
-HSPScanner=0,@LIB_PREFIX@mod_HSPScanner@LIB_SUFFIX@,0x217
+;HSPScanner=0,@LIB_PREFIX@mod_HSPScanner@LIB_SUFFIX@,0x217
 ;ScannerSet=0,@LIB_PREFIX@mod_ScannerSet@LIB_SUFFIX@,0x218
 ;ThermalPrint=0,@LIB_PREFIX@mod_ThermalPrint@LIB_SUFFIX@,0x219
 ;SurveillanceRecorder=0,@LIB_PREFIX@mod_SurveillanceRecorder@LIB_SUFFIX@,0x21A
-;CardReadAdapter=0,@LIB_PREFIX@mod_CardReadAdapter@LIB_SUFFIX@,0x21B
+CardReadAdapter=0,@LIB_PREFIX@mod_CardReadAdapter@LIB_SUFFIX@,0x21B
 ;PortableScanner=0,@LIB_PREFIX@mod_PortableScanner@LIB_SUFFIX@,0x21C
 ;CameraConfigManage=0,@LIB_PREFIX@mod_CameraConfigManage@LIB_SUFFIX@,0x21D
 ;Sensors=0,@LIB_PREFIX@mod_sensors@LIB_SUFFIX@,0x21E
@@ -53,10 +53,10 @@ HSPScanner=0,@LIB_PREFIX@mod_HSPScanner@LIB_SUFFIX@,0x217
 ;CounterConnector=0,@LIB_PREFIX@mod_counterconnector@LIB_SUFFIX@,0x304
 ;InitiativeTransfer=0,@LIB_PREFIX@mod_initiativetransfer@LIB_SUFFIX@,0x305
 ;WarningLamp=1,@LIB_PREFIX@mod_warninglamp@LIB_SUFFIX@,0x307
-;CustomerAware=0,@LIB_PREFIX@mod_customeraware@LIB_SUFFIX@,0x308
+CustomerAware=0,@LIB_PREFIX@mod_customeraware@LIB_SUFFIX@,0x308
 ;InteractionContext=0,@LIB_PREFIX@mod_interactioncontext@LIB_SUFFIX@,0x309
 ;CounterContext=0,@LIB_PREFIX@mod_countercontext@LIB_SUFFIX@,0x30A
-;InteractiveControl=0,@LIB_PREFIX@mod_interactivecontrol@LIB_SUFFIX@,0x30B
+InteractiveControl=0,@LIB_PREFIX@mod_interactivecontrol@LIB_SUFFIX@,0x30B
 ;AssistantChannel=0,@LIB_PREFIX@mod_assistantchannel@LIB_SUFFIX@,0x30C
 ;HandWritingInput=0,@LIB_PREFIX@mod_inkrecognition@LIB_SUFFIX@,0x30F
 DeviceSwitch=0,@LIB_PREFIX@mod_DeviceSwitch@LIB_SUFFIX@,0x311
@@ -68,15 +68,15 @@ DeviceSwitch=0,@LIB_PREFIX@mod_DeviceSwitch@LIB_SUFFIX@,0x311
 ;IEBrowser=0,@LIB_PREFIX@mod_browser@LIB_SUFFIX@,0x401
 ;Chromium=0,@LIB_PREFIX@mod_chromium@LIB_SUFFIX@,0x402
 
-;HealthManager=1,@LIB_PREFIX@mod_healthmanager@LIB_SUFFIX@,0x501
+HealthManager=1,@LIB_PREFIX@mod_HealthManager@LIB_SUFFIX@,0x501
 AccessAuthorization=0,@LIB_PREFIX@mod_AccessAuth@LIB_SUFFIX@,0x502
-HeartBeat=1,@LIB_PREFIX@mod_HeartBeat@LIB_SUFFIX@,0x503
+;HeartBeat=1,@LIB_PREFIX@mod_HeartBeat@LIB_SUFFIX@,0x503
 ;RemoteController=1,@LIB_PREFIX@mod_RomoteController@LIB_SUFFIX@,0x504
 ;SelfChecker=1,@LIB_PREFIX@mod_selfchecker@LIB_SUFFIX@,0x505
 ;UpgradeManager=1,@LIB_PREFIX@mod_UpgradeMgr@LIB_SUFFIX@,0x506
 ;UpgradeRun=1,@LIB_PREFIX@mod_UpgradeRun@LIB_SUFFIX@,0x507
-GUIConsole=1,@LIB_PREFIX@mod_GUIConsole@LIB_SUFFIX@,0x508
-Initializer=0,@LIB_PREFIX@mod_Initializer@LIB_SUFFIX@,0x509
+;GUIConsole=1,@LIB_PREFIX@mod_GUIConsole@LIB_SUFFIX@,0x508
+;Initializer=0,@LIB_PREFIX@mod_Initializer@LIB_SUFFIX@,0x509
 ;ResourceWatcher=1,@LIB_PREFIX@mod_ResourceWatcher@LIB_SUFFIX@,0x50A
 
 ;BranchDevice=0,@LIB_PREFIX@mod_BranchDevice@LIB_SUFFIX@,0x601
@@ -84,9 +84,8 @@ Initializer=0,@LIB_PREFIX@mod_Initializer@LIB_SUFFIX@,0x509
 TestDeamon=1,@LIB_PREFIX@mod_validityVertifier@LIB_SUFFIX@,0xF00
 
 [Startup]
-Number=0
-1=PinPad
-2=CenterSetting
+Number=1
+1=HealthManager
 
 
 
@@ -95,7 +94,6 @@ Number=1
 1=TestDeamon TestMode=ON Level=3 Entity=BlackSheep -D
 
 [SysEvent]
-Hello=BootManager,"World"
 ;CallState=CounterConnector,"O"
 ;BackInitiative=InitiativeTransfer,"O"
 ;CustomerBeing=CustomerAware,"S"