diff --git a/inspector/connect_inspector.cpp b/inspector/connect_inspector.cpp index e89b5ef13217a896b9b054dba32ca4d7ad8cc801..5570c01d7ed858f93e60bc11df058e309191d8b8 100644 --- a/inspector/connect_inspector.cpp +++ b/inspector/connect_inspector.cpp @@ -26,8 +26,6 @@ using panda::ecmascript::tooling::Result; std::mutex g_connectMutex; std::unique_ptr g_inspector = nullptr; static constexpr char CONNECTED_MESSAGE[] = "connected"; -static constexpr char OPEN_MESSAGE[] = "layoutOpen"; -static constexpr char CLOSE_MESSAGE[] = "layoutClose"; static constexpr char REQUEST_MESSAGE[] = "tree"; static constexpr char STOPDEBUGGER_MESSAGE[] = "stopDebugger"; static constexpr char OPEN_ARKUI_STATE_PROFILER[] = "ArkUIStateProfilerOpen"; @@ -65,16 +63,6 @@ void OnConnectedMessage(const std::string& message) } } -void OnOpenMessage(const std::string& message) -{ - if (message.find(OPEN_MESSAGE, 0) != std::string::npos) { - if (g_inspector->setSwitchStatus_ != nullptr) { - LOGI("layoutOpen start"); - g_inspector->setSwitchStatus_(true); - } - } -} - void OnInspectorRecordMessage(const std::string& message) { if (message.find(START_RECORD_MESSAGE, 0) != std::string::npos) { @@ -137,16 +125,6 @@ void OnMessage(const std::string &message) if (OnArkUIInspectorMessage(message)) { return; } - OnOpenMessage(message); - if (message.find(CLOSE_MESSAGE, 0) != std::string::npos) { - if (g_setConnectCallBack != nullptr) { - g_setConnectCallBack(false); - } - if (g_inspector->setSwitchStatus_ != nullptr) { - LOGI("layoutClose start"); - g_inspector->setSwitchStatus_(false); - } - } if (message.find(OPEN_ARKUI_STATE_PROFILER, 0) != std::string::npos) { if (g_inspector->setArkUIStateProfilerStatus_ != nullptr) { LOGI("state profiler open"); @@ -167,6 +145,9 @@ void OnMessage(const std::string &message) } if (message.find(STOPDEBUGGER_MESSAGE, 0) != std::string::npos) { g_inspector->waitingForDebugger_ = true; + if (g_setConnectCallBack != nullptr) { + g_setConnectCallBack(false); + } if (g_inspector->setDebugMode_ != nullptr) { LOGI("stopDebugger start"); g_inspector->setDebugMode_(); @@ -176,14 +157,12 @@ void OnMessage(const std::string &message) } } -void SetSwitchCallBack(const std::function& setSwitchStatus, - const std::function& createLayoutInfo, int32_t instanceId) +void SetSwitchCallBack(const std::function& createLayoutInfo, int32_t instanceId) { std::lock_guard lock(g_connectMutex); if (g_inspector == nullptr) { g_inspector = std::make_unique(); } - g_inspector->setSwitchStatus_ = setSwitchStatus; g_inspector->createLayoutInfo_ = createLayoutInfo; g_inspector->instanceId_ = instanceId; } diff --git a/inspector/connect_inspector.h b/inspector/connect_inspector.h index d44f138121ef64f70fd7830cbb837dac24a83c32..b6b30bb2c08c30bc847a3baa5b5b44483ab1318e 100644 --- a/inspector/connect_inspector.h +++ b/inspector/connect_inspector.h @@ -48,8 +48,7 @@ bool WaitForConnection(); void SetDebugModeCallBack(const std::function& setDebugMode); -void SetSwitchCallBack(const std::function& setSwitchStatus, - const std::function& createLayoutInfo, int32_t instanceId); +void SetSwitchCallBack(const std::function& createLayoutInfo, int32_t instanceId); void SetProfilerCallback(const std::function &setArkUIStateProfilerStatus); @@ -85,7 +84,6 @@ public: std::unordered_map infoBuffer_; std::unique_ptr connectServer_; std::atomic waitingForDebugger_ = true; - std::function setSwitchStatus_; std::function setArkUIStateProfilerStatus_; std::function createLayoutInfo_; std::function setDebugMode_; diff --git a/inspector/test/connect_server_test.cpp b/inspector/test/connect_server_test.cpp index b1bdb7bfed4b574e5e9ffc3247c30c53c00f1d5a..8f811eb7722a36a8777d640ca110e8bbd6ec0b26 100644 --- a/inspector/test/connect_server_test.cpp +++ b/inspector/test/connect_server_test.cpp @@ -40,8 +40,6 @@ public: #if defined(OHOS_PLATFORM) static constexpr char CONNECTED_MESSAGE_TEST[] = "connected"; - static constexpr char OPEN_MESSAGE_TEST[] = "layoutOpen"; - static constexpr char CLOSE_MESSAGE_TEST[] = "layoutClose"; static constexpr char REQUEST_MESSAGE_TEST[] = "tree"; static constexpr char STOPDEBUGGER_MESSAGE_TEST[] = "stopDebugger"; static constexpr char OPEN_ARKUI_STATE_PROFILER_TEST[] = "ArkUIStateProfilerOpen"; @@ -61,8 +59,6 @@ public: bool g_profilerFlag = false; bool g_connectFlag = false; -bool g_switchStatus = false; -int32_t g_createInfoId = 0; int32_t g_instanceId = 1; std::string g_arkUIMsg = ""; std::string g_wMSMsg = ""; @@ -84,14 +80,6 @@ void CallbackInit() }; SetDebugModeCallBack(debugModeCb); - auto switchStatusCb = [](bool flag) -> void { - g_switchStatus = flag; - }; - auto createInfoCb = [](int32_t id) -> void { - g_createInfoId = id; - }; - SetSwitchCallBack(switchStatusCb, createInfoCb, g_instanceId); - auto startRecordFunc = []() -> void {}; auto stopRecordFunc = []() -> void {}; SetRecordCallback(startRecordFunc, stopRecordFunc); @@ -135,7 +123,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) EXPECT_TRUE(clientSocket.SendReply(CONNECTED_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(OPEN_ARKUI_STATE_PROFILER_TEST)); EXPECT_TRUE(clientSocket.SendReply(REQUEST_MESSAGE_TEST)); - EXPECT_TRUE(clientSocket.SendReply(OPEN_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(START_RECORD_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(STOP_RECORD_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(ARKUI_MESSAGE)); @@ -145,7 +132,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) std::string recv = clientSocket.Decode(); EXPECT_STREQ(recv.c_str(), INSPECTOR_SERVER_OK); if (strcmp(recv.c_str(), INSPECTOR_SERVER_OK) == 0) { - EXPECT_TRUE(clientSocket.SendReply(CLOSE_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(STOPDEBUGGER_MESSAGE_TEST)); EXPECT_TRUE(clientSocket.SendReply(CLOSE_ARKUI_STATE_PROFILER_TEST)); } @@ -158,8 +144,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) // Waiting for executing the message instruction sent by the client sleep(WAIT_TIME); ASSERT_TRUE(g_profilerFlag); - ASSERT_EQ(g_createInfoId, g_instanceId); - ASSERT_TRUE(g_switchStatus); ASSERT_TRUE(g_connectFlag); EXPECT_STREQ(g_arkUIMsg.c_str(), ARKUI_MESSAGE); EXPECT_STREQ(g_wMSMsg.c_str(), WMS_MESSAGE); @@ -171,7 +155,6 @@ HWTEST_F(ConnectServerTest, InspectorConnectTest, testing::ext::TestSize.Level0) // Waiting for executing the message instruction sent by the client sleep(WAIT_TIME); ASSERT_FALSE(g_profilerFlag); - ASSERT_FALSE(g_switchStatus); ASSERT_FALSE(g_connectFlag); SendMessage(INSPECTOR_QUIT);