update 同步cell参数延迟更改

dev_lsy
liusiyang 3 weeks ago
parent 0afe6c80a6
commit c1f4a2b451

@ -213,6 +213,7 @@ int ConfigInstance::Updata_Check(Json::Value json_value)
int ConfigInstance::SetStatus(int nConfigType) int ConfigInstance::SetStatus(int nConfigType)
{ {
std::lock_guard<std::mutex> lock(mutex_status);
for (int i = 0; i < MAX_USER_COUNT; i++) for (int i = 0; i < MAX_USER_COUNT; i++)
{ {
m_USER_ConfigUpdataStatusList[nConfigType][i] = true; m_USER_ConfigUpdataStatusList[nConfigType][i] = true;

@ -203,6 +203,7 @@ int ConfigManager::UpdateConfig()
if (!std::filesystem::exists(strConfigPath)) { if (!std::filesystem::exists(strConfigPath)) {
strConfigPath = m_strConfigRootPath + "/param.json"; strConfigPath = m_strConfigRootPath + "/param.json";
} }
printf("read param %s\n", strConfigPath.c_str());
std::shared_ptr<ConfigBase> temConfig = ConfigBase::GetInstance(); std::shared_ptr<ConfigBase> temConfig = ConfigBase::GetInstance();
re = LoadParamConfig(temConfig, strConfigPath); re = LoadParamConfig(temConfig, strConfigPath);
if (re != 0) if (re != 0)
@ -218,8 +219,13 @@ int ConfigManager::UpdateConfig()
printf("Error >>>> camear Name is empty \n"); printf("Error >>>> camear Name is empty \n");
continue; continue;
} }
auto it = Config_instances_.find(p.commonCheckConfig.baseConfig.strCamearName);
if (it != Config_instances_.end() && it->second) {
LoadParamConfig(it->second, strConfigPath);
} else {
Config_instances_[p.commonCheckConfig.baseConfig.strCamearName] = temConfig; Config_instances_[p.commonCheckConfig.baseConfig.strCamearName] = temConfig;
} }
}
// getchar(); // getchar();

Loading…
Cancel
Save