openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-23 15:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!15585 开机动画告警处理

Browse Source 
Merge pull request !15585 from ZhuGangQiang/master
This commit is contained in:
openharmony_ci 2024-09-29 11:32:43 +00:00 committed by Gitee
commit 5533ff4af1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frameworks/bootanimation/src/util.cpp
View File

@ -110,12 +110,12 @@ void ParseOldConfigFile(cJSON* data, std::vector<BootAnimationConfig>& configs)
} }
cJSON* rotateScreenJson = cJSON_GetObjectItem(data, "cust.bootanimation.rotate.screenid"); cJSON* rotateScreenJson = cJSON_GetObjectItem(data, "cust.bootanimation.rotate.screenid");
if (rotateScreenJson != nullptr && cJSON_IsString(rotateScreenJson)) { if (rotateScreenJson != nullptr && cJSON_IsString(rotateScreenJson)) {
config.rotateScreenId = std::stoi(rotateScreenJson->valuestring); config.rotateScreenId = std::atoi(rotateScreenJson->valuestring);
LOGI("cust rotateScreenId: %{public}d", config.rotateScreenId); LOGI("cust rotateScreenId: %{public}d", config.rotateScreenId);
} }
cJSON* rotateDegreeJson = cJSON_GetObjectItem(data, "cust.bootanimation.rotate.degree"); cJSON* rotateDegreeJson = cJSON_GetObjectItem(data, "cust.bootanimation.rotate.degree");
if (rotateDegreeJson != nullptr && cJSON_IsString(rotateDegreeJson)) { if (rotateDegreeJson != nullptr && cJSON_IsString(rotateDegreeJson)) {
config.rotateDegree = std::stoi(rotateDegreeJson->valuestring); config.rotateDegree = std::atoi(rotateDegreeJson->valuestring);
LOGI("cust rotateDegree: %{public}d", config.rotateDegree); LOGI("cust rotateDegree: %{public}d", config.rotateDegree);
} }
configs.emplace_back(config); configs.emplace_back(config);
@ -139,7 +139,7 @@ void ParseNewConfigFile(cJSON* data, bool& isMultiDisplay, std::vector<BootAnima
while (item != nullptr) { while (item != nullptr) {
cJSON* screenIdJson = cJSON_GetObjectItem(item, "cust.bootanimation.screen_id"); cJSON* screenIdJson = cJSON_GetObjectItem(item, "cust.bootanimation.screen_id");
if (screenIdJson != nullptr && cJSON_IsString(screenIdJson)) { if (screenIdJson != nullptr && cJSON_IsString(screenIdJson)) {
config.screenId = std::stoul(screenIdJson->valuestring); config.screenId = std::strtoul(screenIdJson->valuestring, nullptr, 0);
LOGI("screenId: " BPUBU64 "", config.screenId); LOGI("screenId: " BPUBU64 "", config.screenId);
} }
cJSON* custPicPath = cJSON_GetObjectItem(item, "cust.bootanimation.pics"); cJSON* custPicPath = cJSON_GetObjectItem(item, "cust.bootanimation.pics");
@ -159,7 +159,7 @@ void ParseNewConfigFile(cJSON* data, bool& isMultiDisplay, std::vector<BootAnima
} }
cJSON* rotateDegreeJson = cJSON_GetObjectItem(item, "cust.bootanimation.rotate_degree"); cJSON* rotateDegreeJson = cJSON_GetObjectItem(item, "cust.bootanimation.rotate_degree");
if (rotateDegreeJson != nullptr && cJSON_IsString(rotateDegreeJson)) { if (rotateDegreeJson != nullptr && cJSON_IsString(rotateDegreeJson)) {
config.rotateDegree = std::stoi(rotateDegreeJson->valuestring); config.rotateDegree = std::atoi(rotateDegreeJson->valuestring);
LOGI("cust rotateDegree: %{public}d", config.rotateDegree); LOGI("cust rotateDegree: %{public}d", config.rotateDegree);
} }
cJSON* extraVideoPath = cJSON_GetObjectItem(item, "cust.bootanimation.video_extensions"); cJSON* extraVideoPath = cJSON_GetObjectItem(item, "cust.bootanimation.video_extensions");
@ -187,7 +187,7 @@ void ParseBootDuration(cJSON* data, int32_t& duration)
{ {
cJSON* durationJson = cJSON_GetObjectItem(data, "cust.bootanimation.duration"); cJSON* durationJson = cJSON_GetObjectItem(data, "cust.bootanimation.duration");
if (durationJson != nullptr && cJSON_IsString(durationJson)) { if (durationJson != nullptr && cJSON_IsString(durationJson)) {
duration = std::stoi(durationJson->valuestring); duration = std::atoi(durationJson->valuestring);
LOGI("cust duration: %{public}d", duration); LOGI("cust duration: %{public}d", duration);
} }
} }