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

!37439 修复日志异常打印的问题

Browse Source 
Merge pull request !37439 from 贺晨韬/hct_fix_log
This commit is contained in:
openharmony_ci 2024-07-11 04:07:29 +00:00 committed by Gitee
commit 9802ca5d67
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adapter/ohos/osal/system_properties.cpp
View File

@ -328,6 +328,11 @@ bool IsAcePerformanceMonitorEnabled()
return system::GetParameter("const.logsystem.versiontype", "commercial") == "beta" ||
system::GetBoolParameter("persist.ace.performance.monitor.enabled", false);
}
bool IsAceCommercialLogEnable()
{
return system::GetParameter("const.logsystem.versiontype", "commercial") == "commercial";
}
} // namespace
float ReadDragStartDampingRatio()
@ -420,6 +425,7 @@ bool SystemProperties::gridCacheEnabled_ = IsGridCacheEnabled();
std::pair<float, float> SystemProperties::brightUpPercent_ = GetPercent();
bool SystemProperties::sideBarContainerBlurEnable_ = IsSideBarContainerBlurEnable();
bool SystemProperties::acePerformanceMonitorEnable_ = IsAcePerformanceMonitorEnabled();
bool SystemProperties::aceCommercialLogEnable_ = IsAceCommercialLogEnable();
bool SystemProperties::faultInjectEnabled_ = IsFaultInjectEnabled();
bool SystemProperties::opincEnabled_ = IsOpIncEnabled();
float SystemProperties::dragStartDampingRatio_ = ReadDragStartDampingRatio();

1
adapter/preview/osal/system_properties.cpp
View File

@ -97,6 +97,7 @@ bool SystemProperties::navigationBlurEnabled_ = true;
bool SystemProperties::gridCacheEnabled_ = false;
bool SystemProperties::sideBarContainerBlurEnable_ = false;
bool SystemProperties::acePerformanceMonitorEnable_ = false;
bool SystemProperties::aceCommercialLogEnable_ = false;
std::pair<float, float> SystemProperties::brightUpPercent_ = {};
bool SystemProperties::faultInjectEnabled_ = false;
bool SystemProperties::imageFrameworkEnable_ = false;

6
frameworks/base/utils/system_properties.h
View File

@ -530,6 +530,11 @@ public:
return acePerformanceMonitorEnable_;
}
static bool GetAceCommercialLogEnabled()
{
return aceCommercialLogEnable_;
}
static std::string GetAtomicServiceBundleName();
static std::pair<float, float> GetDarkModeBrightnessPercent()
@ -604,6 +609,7 @@ private:
static bool sideBarContainerBlurEnable_;
static bool stateManagerEnable_;
static bool acePerformanceMonitorEnable_;
static bool aceCommercialLogEnable_;
static bool faultInjectEnabled_;
static bool imageFrameworkEnable_;
static std::pair<float, float> brightUpPercent_;

16
frameworks/core/pipeline_ng/pipeline_context.cpp
View File

@ -1975,11 +1975,17 @@ void PipelineContext::OnTouchEvent(const TouchEvent& point, const RefPtr<FrameNo
if (scalePoint.type != TouchType::MOVE && scalePoint.type != TouchType::PULL_MOVE &&
scalePoint.type != TouchType::HOVER_MOVE) {
eventManager_->GetEventTreeRecord().AddTouchPoint(scalePoint);
TAG_LOGI(AceLogTag::ACE_INPUTKEYFLOW,
"InputTracking id:%{public}d, fingerId:%{public}d, x=%{public}f y=%{public}f type=%{public}d, "
"inject=%{public}d",
scalePoint.touchEventId, scalePoint.id, scalePoint.x, scalePoint.y, (int)scalePoint.type,
scalePoint.isInjected);
if (SystemProperties::GetAceCommercialLogEnabled()) {
TAG_LOGI(AceLogTag::ACE_INPUTKEYFLOW,
"InputTracking id:%{public}d, fingerId:%{public}d, type=%{public}d, inject=%{public}d",
scalePoint.touchEventId, scalePoint.id, (int)scalePoint.type, scalePoint.isInjected);
} else {
TAG_LOGI(AceLogTag::ACE_INPUTKEYFLOW,
"InputTracking id:%{public}d, fingerId:%{public}d, x=%{public}.3f, y=%{public}.3f type=%{public}d, "
"inject=%{public}d",
scalePoint.touchEventId, scalePoint.id, scalePoint.x, scalePoint.y, (int)scalePoint.type,
scalePoint.isInjected);
}
}
if (scalePoint.type == TouchType::MOVE) {

1
test/mock/base/mock_system_properties.cpp
View File

@ -63,6 +63,7 @@ bool SystemProperties::gridCacheEnabled_ = true;
bool SystemProperties::sideBarContainerBlurEnable_ = false;
bool SystemProperties::stateManagerEnable_ = false;
bool SystemProperties::acePerformanceMonitorEnable_ = false;
bool SystemProperties::aceCommercialLogEnable_ = false;
bool SystemProperties::debugBoundaryEnabled_ = false;
bool SystemProperties::developerModeOn_ = false;
bool SystemProperties::faultInjectEnabled_ = false;