Browse Source

#IQRV #comment [GUIConsole] CFG依赖文件去除

gifur 2 years ago
parent
commit
cc881da2c2

+ 2 - 34
Module/mod_guiconsole/guitask.cpp

@@ -431,41 +431,9 @@ ErrorCodeEnum GUITask::GetEntity(const char *entity_name, EntityEntry &e)
 
 ErrorCodeEnum GUITask::GetCustomizeStartMenuList(CAutoArray<StartMenuEntry> &StartItems)
 {
-	CSmartPointer<IEntityFunction> spFunc = m_pEntity->GetFunction();
-	CSmartPointer<IConfigInfo> spConfig;
-	LOG_ASSERT(spFunc != NULL);
 	int cnt = 0;
-	ErrorCodeEnum Error = spFunc->OpenConfig(Config_Software, spConfig);
-	if (Error != Error_Succeed)
-		return Error;
-	Error = spConfig->ReadConfigValueInt("StartMenu", "Number", cnt);
-	if (Error != Error_Succeed)
-		return Error;
-	StartItems.Init(cnt);
-	for (int i = 0; i < cnt; ++i) {
-		char tmp[128];
-		CSimpleStringA strValue;
-		_itoa(i+1, tmp, 10);
-		Error = spConfig->ReadConfigValue("StartMenu", tmp, strValue);
-		const char *p = strValue;
-		if (Error != Error_Succeed || p == NULL || strValue.GetLength() == 0)
-			break;
-		int kk = 0;
-		while (*p && *p != ' ') {
-			tmp[kk++] = *p;
-			p++;
-		}
-		tmp[kk] = 0;
-		StartItems[i].strEntity = tmp;
-		while (*p && *p == ' ')
-			p++;
-		if (*p) {
-			StartItems[i].strCmdLine = p;
-		} else {
-			StartItems[i].strCmdLine = "";
-		}
-	}
-	return Error;
+	StartItems.Clear();
+	return Error_Deprecated;
 }
 
 void GUITask::OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp)

+ 3 - 18
Module/mod_guiconsole/mainfrm.cpp

@@ -1332,25 +1332,10 @@ void CSysInitView::CleanListView()
 
 void CSysInitView::CheckSystemInit()
 {
-	auto pFunc = m_pGUITask->GetEntity()->GetFunction();
-	CSmartPointer<IConfigInfo> spConfig;
-	auto rc = pFunc->OpenConfig(Config_Software, spConfig);
-	if (rc != Error_Succeed)
-		return;
-
 	int checkSysInit = 0; 
-	rc = spConfig->ReadConfigValueInt("StartMenu", "CheckSysInit", checkSysInit);
-	if (rc != Error_Succeed)
-		return;
-
-	CSystemStaticInfo stStaticinfo;
-	pFunc->GetSystemStaticInfo(stStaticinfo);
-// 	if (stricmp(stStaticinfo.strMachineType,"RVC.PAD")==0)
-// 	{
-// 			RVCInit_VoiceConfigDefault();		//设置初始声音增强
-// 	}
-	if (1 == checkSysInit)
-		CloseHandle((HANDLE)_beginthreadex(NULL, 0, (unsigned int(__stdcall *)(void *))SysInitCheck, this, 0, NULL));
+	if (1 == checkSysInit) {
+        CloseHandle((HANDLE)_beginthreadex(NULL, 0, (unsigned int(__stdcall*)(void*))SysInitCheck, this, 0, NULL));
+	}
 }
 
 void CSysInitView::modifyCheckStatus(DWORD status)

+ 1 - 2
Module/mod_guiconsole/mod_guiconsole.cpp

@@ -22,7 +22,7 @@ void CGUIConsoleEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPoin
 		
     bool toInitializeSysLog(true);
     CSmartPointer<IConfigInfo> pConfig;
-    if (GetFunction()->OpenConfig(Config_Software, pConfig) == Error_Succeed) {
+    if (GetFunction()->OpenConfig(Config_CenterSetting, pConfig) == Error_Succeed) {
         CSimpleStringA strValue(true);
         pConfig->ReadConfigValue("Common", "SwitchLogService", strValue);
         if (strValue.Compare("OFF") == 0) {
@@ -30,7 +30,6 @@ void CGUIConsoleEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs,CSmartPoin
             DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Do not initialize SysLog!!!!");
         }
     }
-
     if (toInitializeSysLog) {
         InitializeBeidou();
 	} else {

+ 0 - 8
addin/cfg/GUIConsole.ini

@@ -1,8 +0,0 @@
-[Main]
-Server=127.0.0.1 1036
-Server_Backup=
-
-[StartMenu]
-Number=1
-1=IEBrowser http://99.6.136.67/RVC.Web/default.aspx http://99.6.136.67/RVC.Web/default2.aspx
-CheckSysInit=0