openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-19 17:08:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1160 修改日志label

Browse Source 
Merge pull request !1160 from leafly2021/0415_master
This commit is contained in:
openharmony_ci
2022-07-11 08:27:00 +00:00
committed by Gitee
parent 75f192608e 9288e660a6
commit 306f6a83c9
12 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dm/src/screen.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
namespace OHOS::Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "Screen"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "Screen"};
}
class Screen::Impl : public RefBase {
public:
dm/src/screen_group.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
namespace OHOS::Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "ScreenGroup"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenGroup"};
}
class ScreenGroup::Impl : public RefBase {
public:
dm/test/systemtest/display_change_test.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ using namespace testing::ext;
namespace OHOS {
namespace Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "DisplayChangeTest"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayChangeTest"};
constexpr uint32_t MAX_TIME_WAITING_FOR_CALLBACK = 20;
constexpr uint32_t SLEEP_TIME_IN_US = 10000; // 10ms
constexpr uint32_t SPLIT_TEST_SLEEP_S = 2;
dm/test/unittest/display_change_unit_test.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ using namespace testing::ext;
namespace OHOS {
namespace Rosen {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "DisplayChangeUnitTest"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayChangeUnitTest"};
using Mocker = SingletonMocker<DisplayManagerAdapter, MockDisplayManagerAdapter>;
class DisplayChangeEventListener : public DisplayManager::IDisplayListener {
dmserver/src/abstract_display_controller.cpp
+2 -1
View File
@@ -466,7 +466,8 @@ void AbstractDisplayController::BindAloneScreenLocked(sptr<AbstractScreen> realA
} else {
WLOGI("bind display for new screen. screen:%{public}" PRIu64", display:%{public}" PRIu64"",
realAbsScreen->dmsId_, dummyDisplay_->GetId());
bool updateFlag = dummyDisplay_->GetHeight() == info->height_ && dummyDisplay_->GetWidth() == info->width_;
bool updateFlag = static_cast<uint32_t>(dummyDisplay_->GetHeight()) == info->height_
&& static_cast<uint32_t>(dummyDisplay_->GetWidth()) == info->width_;
dummyDisplay_->BindAbstractScreen(abstractScreenController_->GetAbstractScreen(realAbsScreen->dmsId_));
if (updateFlag) {
DisplayManagerAgentController::GetInstance().OnDisplayCreate(dummyDisplay_->ConvertToDisplayInfo());
dmserver/src/display_manager_config.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
namespace OHOS {
namespace Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "DisplayManagerConfig"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerConfig"};
}
std::map<std::string, std::vector<int>> DisplayManagerConfig::intNumbersConfig_;
interfaces/kits/napi/display_runtime/js_display.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ namespace OHOS {
namespace Rosen {
using namespace AbilityRuntime;
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "JsDisplay"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplay"};
}
static thread_local std::map<DisplayId, std::shared_ptr<NativeReference>> g_JsDisplayMap;
interfaces/kits/napi/display_runtime/js_display_listener.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ namespace OHOS {
namespace Rosen {
using namespace AbilityRuntime;
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "JsDisplayListener"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplayListener"};
}
void JsDisplayListener::AddCallback(const std::string& type, NativeValue* jsListenerObject)
interfaces/kits/napi/display_runtime/js_display_manager.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ constexpr size_t ARGC_ONE = 1;
constexpr size_t ARGC_TWO = 2;
constexpr int32_t INDEX_ONE = 1;
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "JsDisplayManager"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplayManager"};
}
class JsDisplayManager {
interfaces/kits/napi/screen_runtime/napi/js_screen.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ using namespace AbilityRuntime;
constexpr size_t ARGC_ONE = 1;
constexpr size_t ARGC_TWO = 2;
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "JsScreen"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsScreen"};
}
static thread_local std::map<ScreenId, std::shared_ptr<NativeReference>> g_JsScreenMap;
utils/include/future.h
+2 -1
View File
@@ -17,11 +17,12 @@
#define OHOS_WM_INCLUDE_FUTURE_H
#include "hilog/log.h"
#include "window_manager_hilog.h"
namespace OHOS::Rosen {
template<class T>
class Future {
constexpr static HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "Future"};
constexpr static HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "Future"};
public:
T GetResult(long timeOut)
{
wmserver/src/window_node.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
namespace OHOS {
namespace Rosen {
namespace {
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "WindowNode"};
constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowNode"};
}
WindowNode::~WindowNode()