openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-02-25 23:28:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!37830 安全告警修改

Browse Source 
Merge pull request !37830 from 蒋码云/master
This commit is contained in:
openharmony_ci 2024-07-16 01:33:03 +00:00 committed by Gitee
commit b575e2da6c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks/bridge/declarative_frontend/jsview/js_view_abstract.cpp
View File

@ -399,7 +399,12 @@ void SetBgImgPosition(const DimensionUnit& typeX, const DimensionUnit& typeY, co
std::string GetReplaceContentStr(int pos, const std::string& type, JSRef<JSArray> params, int32_t containCount)
{
JSRef<JSVal> item = params->GetValueAt(pos + containCount);
auto index = pos + containCount;
if (index < 0) {
return std::string();
}
JSRef<JSVal> item = params->GetValueAt(static_cast<size_t>(index));
if (type == "d") {
if (item->IsNumber()) {
return std::to_string(item->ToNumber<int32_t>());

2
frameworks/core/components_ng/base/view_abstract.cpp
View File

@ -4491,7 +4491,7 @@ void ViewAbstract::SetJSFrameNodeOnVisibleAreaApproximateChange(FrameNode* frame
frameNode->CleanVisibleAreaUserCallback(true);
constexpr uint32_t minInterval = 100; // 100ms
if (interval < 0 || interval < minInterval) {
if (interval < 0 || static_cast<uint32_t>(interval) < minInterval) {
interval = minInterval;
}
VisibleCallbackInfo callback;