Эх сурвалжийг харах

#IQRV #comment 框架不调用app_update_terminal_state,由实体接管

80374374 9 сар өмнө
parent
commit
5bf98138de

+ 1 - 0
Framework/spbase/sp_var.c

@@ -125,6 +125,7 @@ int sp_var_client_set(sp_var_client_t *client, const char *key, const char *str,
 	if (!sp_var_can_write(client, key, &sysevent)) {
 
 		if (sysevent == NULL) {
+			DbgWithLinkForC(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM, "%s sysevent is not exist %s!", __FUNCTION__, key);
 			return Error_NotExist;
 		}
 		else {

+ 2 - 2
Framework/spshell/app.cpp

@@ -148,7 +148,7 @@ static unsigned int __stdcall __startlist_proc(void *param)
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("======================================================");
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("!!!!!! 部分实体启动失败,请检查dbg\\spshell日志排除故障 !!!!!!");
 		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("======================================================");
-		app_update_terminal_state(FrameworkState_Breakdown);
+		//app_update_terminal_state(FrameworkState_Breakdown);
 		
 		// 启动失败
 		app_upload_last_log();
@@ -607,7 +607,7 @@ int app_init(const sp_cfg_start_args_t* args, std::function<void(const char* msg
 
 #endif // RVC_OS_WIN && WITH_DEBUG
     
-	app_update_terminal_state(flag != 0 ? FrameworkState_NotConfig : FrameworkState_Booting);
+	//app_update_terminal_state(flag != 0 ? FrameworkState_NotConfig : FrameworkState_Booting);
 
 
 	auto shellEnv = sp_mod_mgr_find_entity_by_idx(sp_get_env()->mod_mgr, 0);

+ 1 - 0
Framework/spshell/app.h

@@ -66,6 +66,7 @@ int app_init(const sp_cfg_start_args_t* args, std::function<void(const char* msg
 int app_term();
 int app_run();
 void app_stop(int from_id);
+/** 暂时不适用,由实体去控制,否则会出现因配置SYSEVENT未拉下来导致值不统一的问题  [Gifur@2025314]*/
 int app_update_terminal_state(int state);
 
 void app_clear();

+ 1 - 3
Module/mod_chromium/mod_chromium.cpp

@@ -533,9 +533,7 @@ namespace Chromium {
 
 #if defined(RVC_OS_LINUX)
         Error = GetFunction()->SubscribeLog(m_uuidAllFault, this, Log_Notify, Severity_High, Error_IgnoreAll, -2, NULL, false);
-        if (Error_Succeed == Error) {
-            this->GetFunction()->GetPrivilegeFunction()->RefreshFrameworkState(FrameworkState_NotDisturb);
-        } else {
+        if (Error_Succeed != Error) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("subscribe log for notify failed! %s", SpStrError(Error));
         }
 #endif //RVC_OS_LINUX