Z991239-890 #comment BootManger启动实体启动报错处理

.gitignore

@@ -194,4 +194,4 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-CMakeSettings.json
+#CMakeSettings.json

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -152,9 +152,11 @@ void CHealthManagerFSM::s1_on_entry()
 					it->second.eResult = LOADING_TIMEOUT;
 				else
 					it->second.eResult = LOADING_FAILED;
+
 				if (_strnicmp(it->first,"WatchDog",strlen("WatchDog")) == 0 
 					&& it->second.eResult == LOADING_SUCCEED)
 					bWatchDog = true;
+
 				if (errCode != Error_Succeed)
 					return;
 				else
@@ -436,7 +438,7 @@ void CHealthManagerFSM::s3_on_entry()
 	map<CSimpleStringA,EntityLoadInfo>::iterator it;
 	CSmartPointer<IEntityFunction> pFunc = GetEntityBase()->GetFunction();
 	CSmartPointer<IEntityFunctionPrivilege> pFuncPrivilege = pFunc.ConvertCase<IEntityFunctionPrivilege>();
-	//start entity
+	//start entity	
 	
 	
 	ErrorCodeEnum errCode;

addin/cfg/BootManager.ini

@@ -1,389 +1,11 @@
-[CoreBoot.RVC.Stand2S]
-WatchDog=0
-Ups=2
-SafeLock=0
-DeviceControl=0
-CardReadAdapter=0
-CustMngrAuth=0
-
 [CoreBoot.RVC.PAD]
-MobileDial=0
-DeviceControl=0
-PortableScanner=0
-CardIssuer=0
-CardReadAdapter=0
-CustMngrAuth=0
-
-[CoreBoot.RVC.IL]
-DeviceControl=0
-CardIssuer=0
-CardReadAdapter=0
-
-[CoreBoot.RPM.Stand1S]
-CardReadAdapter=0
-
-[CoreBoot.RVC.CardStore]
-CardIssuer=0
-CardReadAdapter=0
-
-[CoreBoot.RVC.Wall]
-WatchDog=0
-Ups=2
-SafeLock=0
-CardReadAdapter=0
-
-[CoreBoot.RVC.Desk2S]
-Alarm=1
-CardReadAdapter=0
-DeviceControl=0
-PortableScanner=0
-CardIssuer=0
-FreeRDPWrap=2
-
-[CoreBoot.RVC.Desk1S]
-Alarm=1
-CardReadAdapter=0
-DeviceControl=0
-PortableScanner=0
-CardIssuer=0
-
-[SafeLoad.RVC.Stand2S]
-Initializer=2
-CenterSetting=2
-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
-InteractiveControl=2
-CounterContext=2
-ScreenShot=2
-SnapShot=2
-CustomerAware=2
-AgentInterpreter=2
-InteractiveLog=2
-Upload=0
-MediaController=0
-Recorder=0
-SalesRecorder=0
-LivenessDetection=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-AccessAuthorization=2
-PinPad=2
-HSPScanner=0
-BranchDevice=0
-MaintainWatcher=0
-RemoteController=0
-ResourceWatcher=0
-CameraConfigManage=0
+PinPad=0
 
 [SafeLoad.RVC.PAD]
-ScannerSet=0
-Initializer=2
-MaintainWatcher=0
-CenterSetting=2
-SystemCustomization=2
-SelfChecker=2
-HeartBeat=2
-Alarm=1
-DeviceSwitch=2
-EventConverter=2
-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
-InteractiveLog=2
-Upload=0
-MediaController=0
-Recorder=0
-SalesRecorder=0
-LivenessDetection=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-AccessAuthorization=2
-PinPad=2
-BranchDevice=0
-RemoteController=0
-SurveillanceRecorder=0
-CameraConfigManage=0
-
-[SafeLoad.RVC.IL]
-Initializer=2
-MaintainWatcher=0
-CenterSetting=2
-SelfChecker=2
-HeartBeat=2
-Alarm=1
-DeviceSwitch=2
-EventConverter=2
-AssistantChannel=2
-Upload=0
-MediaController=0
-Recorder=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-AccessAuthorization=2
-PinPad=2
-;BranchDevice=0
-RemoteController=0
-;SurveillanceRecorder=0
-;HolderContext=2
-
-[SafeLoad.RPM.Stand1S]
-Initializer=2
-MaintainWatcher=0
-CenterSetting=2
-SystemCustomization=2
-SelfChecker=2
-HeartBeat=2
-Alarm=1
-DeviceSwitch=2
-EventConverter=2
-AssistantChannel=2
-LocalMediaPlay=0
-HandWritingInput=2
-InitiativeTransfer=0
-InteractiveControl=0
-CounterContext=0
-InteractionContext=2
-CustomerAware=2
-AgentInterpreter=2
-InteractiveLog=2
-Upload=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-AccessAuthorization=2
-RemoteController=0
-ResourceWatcher=0
-BranchDevice=0
-
-[SafeLoad.RVC.CardStore]
-MaintainWatcher=0
-CenterSetting=2
-SelfChecker=2
-HeartBeat=2
-Alarm=1
-DeviceSwitch=2
-EventConverter=2
-AssistantChannel=2
-LocalMediaPlay=0
-HandWritingInput=2
-InitiativeTransfer=0
-InteractiveControl=0
-CounterContext=0
-InteractionContext=2
-CustomerAware=2
-AgentInterpreter=2
-InteractiveLog=2
-Upload=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-AccessAuthorization=2
-RemoteController=0
-ResourceWatcher=0
-
-[SafeLoad.RVC.Wall]
-Initializer=2
-CenterSetting=0
-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
-InteractiveControl=2
-CounterContext=2
-ScreenShot=2
-SnapShot=2
-CustomerAware=2
-AgentInterpreter=2
-InteractiveLog=2
-Upload=0
-MediaController=0
-Recorder=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-;CenterSetting=2
-AccessAuthorization=2
-PinPad=2
-BranchDevice=0
-MaintainWatcher=0
-RemoteController=0
-ResourceWatcher=0
-
-[SafeLoad.RVC.Desk2S]
-Initializer=2
-ScannerSet=0
-CenterSetting=2
-SystemCustomization=2
-SelfChecker=2
-HeartBeat=2
-;Alarm=1
-DeviceSwitch=2
-EventConverter=2
-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
-InteractiveLog=2
-Upload=0
-MediaController=0
-Recorder=0
-SalesRecorder=0
-LivenessDetection=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-;CenterSetting=2
-AccessAuthorization=2
-PinPad=2
-;HSPScanner=0
-MaintainWatcher=0
-RemoteController=0
-ResourceWatcher=0
-Chromium=0
-SurveillanceRecorder=0
-CameraConfigManage=0
-
-[SafeLoad.RVC.Desk1S]
-Initializer=2
-ScannerSet=0
-CenterSetting=2
-SystemCustomization=2
-SelfChecker=2
-HeartBeat=2
-;Alarm=1
-DeviceSwitch=2
-EventConverter=2
-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
-InteractiveLog=2
-Upload=0
-MediaController=0
-Recorder=0
-SalesRecorder=0
-LivenessDetection=0
-Download=0
-TokenKeeper=2
-UpgradeRun=2
-UpgradeManager=2
-;CenterSetting=2
-AccessAuthorization=2
-PinPad=2
-;HSPScanner=0
-MaintainWatcher=0
-RemoteController=0
-ResourceWatcher=0
-Chromium=0
-SurveillanceRecorder=0
-CameraConfigManage=0
-
-[Operating.RVC.Stand2S]
-;PinPad=2
-CardIssuer=2
-IDCertificate=2
-Gpio=2
-ScannerSet=0
-ContactlessCard=0
-print=0
-ThermalPrint=0
-PrintSeal=0
-FingerPrint=0
-
-[Operating.RVC.PAD]
-CardSwiper=0
-IDCertificate=0
-ResourceWatcher=0
-print=0
-Sensors=0
-FingerPrint=0
-
-[Operating.RPM.Stand1S]
-CardSwiper=0
-IDCertificate=0
-PrintSeal=0
-
-[Operating.RVC.CardStore]
-IDCertificate=0
-
-[Operating.RVC.Wall]
 CardSwiper=2
-IDCertificate=2
-Gpio=2
-print=0
 
-[Operating.RVC.Desk2S]
-CardSwiper=0
-IDCertificate=0
-Gpio=2
-ContactlessCard=0
-FingerPrint=0
-
-[Operating.RVC.Desk1S]
-IDCertificate=0
-Gpio=0
-ContactlessCard=0
-FingerPrint=0
+[Operating.RVC.PAD]
+CenterSetting=1
 
 [IEBrowser.RVC.Stand2S]
 url=http://99.8.42.90/RVC.Web/default.aspx http://99.8.42.90/RVC.Web/default2.aspx

addin/cfg/shell.ini.in

@@ -20,7 +20,7 @@ CenterSetting=0,@LIB_PREFIX@mod_CenterSetting@LIB_SUFFIX@,0x101
 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=0,@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
 
 ;Ó²¼þ·þÎñ²ã