|
@@ -184,7 +184,7 @@ namespace Chromium {
|
|
|
|
|
|
|
|
GetFunction()->RegistSysVarEvent("EntryPermit", this);
|
|
GetFunction()->RegistSysVarEvent("EntryPermit", this);
|
|
|
|
|
|
|
|
- //generateBussinessLimitTimer();
|
|
|
|
|
|
|
+ generateBussinessLimitTimer();
|
|
|
|
|
|
|
|
// 按照单屏方式
|
|
// 按照单屏方式
|
|
|
pTransactionContext->SendAnswer(Error_Succeed);
|
|
pTransactionContext->SendAnswer(Error_Succeed);
|
|
@@ -205,21 +205,7 @@ namespace Chromium {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- /*
|
|
|
|
|
- else if (0 == CSimpleStringA("EntryPermit").Compare(pszKey, true))
|
|
|
|
|
- {
|
|
|
|
|
- if ((pszValue != NULL && (pszValue[0] == 'a' || pszValue[0] == 'A')) || (pszValue != NULL && (pszValue[0] == 'f' || pszValue[0] == 'F')))
|
|
|
|
|
- {
|
|
|
|
|
- auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::breakdown);
|
|
|
|
|
- Dbg("access failed, open page breakdown, %d", openRet.first);
|
|
|
|
|
- }
|
|
|
|
|
- else if (pszValue != NULL && (pszValue[0] == 'l' || pszValue[0] == 'L')) {
|
|
|
|
|
- CSystemRunInfo sysruninfo;
|
|
|
|
|
- GetFunction()->GetSystemRunInfo(sysruninfo);
|
|
|
|
|
- if (!(sysruninfo.dwBootOption & SystemBootOptionEnum::BootOption_Test))
|
|
|
|
|
- generateCefclientTimer();//非--test时,才会打开浏览器
|
|
|
|
|
- }
|
|
|
|
|
- }*/
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void CChromiumEntity::OnPreClose(EntityCloseCauseEnum eCloseCause, CSmartPointer<ITransactionContext> pTransactionContext)
|
|
void CChromiumEntity::OnPreClose(EntityCloseCauseEnum eCloseCause, CSmartPointer<ITransactionContext> pTransactionContext)
|
|
@@ -241,13 +227,13 @@ namespace Chromium {
|
|
|
Dbg("OnLog %x", dwUserCode);
|
|
Dbg("OnLog %x", dwUserCode);
|
|
|
switch (dwUserCode)
|
|
switch (dwUserCode)
|
|
|
{
|
|
{
|
|
|
- case LOG_EVT_BEGIN_CAMERA_CONFIG:
|
|
|
|
|
|
|
+ case LOG_EVT_BEGIN_CAMERA_CONFIG://no use
|
|
|
{
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::CameraConfig);
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::CameraConfig);
|
|
|
Dbg("show Screen Camera config, open page cameraconfig, %d", openRet.first);
|
|
Dbg("show Screen Camera config, open page cameraconfig, %d", openRet.first);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
- case LOG_EVT_END_CAMERA_CONFIG:
|
|
|
|
|
|
|
+ case LOG_EVT_END_CAMERA_CONFIG://no use
|
|
|
Dbg("end show Screen Camera config, close page cameraconfig");
|
|
Dbg("end show Screen Camera config, close page cameraconfig");
|
|
|
CModTools::get_mutable_instance().killChromiumByName((+PAGE_TYPE::CameraConfig)._to_string());
|
|
CModTools::get_mutable_instance().killChromiumByName((+PAGE_TYPE::CameraConfig)._to_string());
|
|
|
break;
|
|
break;
|
|
@@ -261,8 +247,8 @@ namespace Chromium {
|
|
|
generateCefclientTimer();//非--test时,才会打开浏览器
|
|
generateCefclientTimer();//非--test时,才会打开浏览器
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
- case ERR_ACCESSAUTH_FAILED:
|
|
|
|
|
- case ERR_ACCESSAUTH_TIMEOUT:
|
|
|
|
|
|
|
+ case EVENT_ACCESSAUTH_FAILED:
|
|
|
|
|
+ case EVENT_ACCESSAUTH_TIMEOUT:
|
|
|
{
|
|
{
|
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::breakdown);
|
|
auto openRet = CModTools::get_mutable_instance().StartChromiumBrowser(ERR_PAGE_REASON::breakdown);
|
|
|
Dbg("access failed, open page breakdown, %d", openRet.first);
|
|
Dbg("access failed, open page breakdown, %d", openRet.first);
|