openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

!12662 delete layoutOpen&&layoutClose

Browse Source 
Merge pull request !12662 from 叶江浩/layoutDelete0213
This commit is contained in:
openharmony_ci
2025-03-13 11:44:02 +00:00
committed by Gitee
parent 3088d7d06e e66d4c90e9
commit fb2ebcb5b5
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/connect_server_manager/include/connect_server_manager.h
+1 -2
View File
@@ -47,8 +47,7 @@ public:
int32_t tid, int32_t instanceId, const std::string& instanceName = "PandaDebugger");
void StoreDebuggerInfo(int32_t tid, void* vm, const panda::JSNApi::DebugOption& debugOption,
const DebuggerPostTask& debuggerPostTask, bool isDebugApp);
void SetSwitchCallback(const std::function<void(bool)> &setSwitchStatus,
const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId);
void SetSwitchCallback(const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId);
void SetProfilerCallBack(const std::function<void(bool)> &setStateProfilerStatus);
void SetConnectedCallback();
bool SendInstanceMessage(int32_t tid, int32_t instanceId, const std::string& instanceName);
interfaces/inner_api/connect_server_manager/src/connect_server_manager.cpp
+3 -5
View File
@@ -49,8 +49,7 @@ using SendMessage = void (*)(const std::string&);
using StopServer = void (*)(const std::string&);
using StoreMessage = void (*)(int32_t, const std::string&);
using SetProfilerCallback = void (*)(const std::function<void(bool)> &setStateProfilerStatus);
using SetSwitchCallBack = void (*)(const std::function<void(bool)> &setSwitchStatus,
const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId);
using SetSwitchCallBack = void (*)(const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId);
using SetConnectCallback = void (*)(const std::function<void(bool)>);
using RemoveMessage = void (*)(int32_t);
using WaitForConnection = bool (*)();
@@ -205,8 +204,7 @@ void ConnectServerManager::SetConnectedCallback()
});
}
void ConnectServerManager::SetSwitchCallback(const std::function<void(bool)> &setSwitchStatus,
const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId)
void ConnectServerManager::SetSwitchCallback(const std::function<void(int32_t)> &createLayoutInfo, int32_t instanceId)
{
LoadConnectServerDebuggerSo();
auto setSwitchCallBack = reinterpret_cast<SetSwitchCallBack>(
@@ -215,7 +213,7 @@ void ConnectServerManager::SetSwitchCallback(const std::function<void(bool)> &se
TAG_LOGE(AAFwkTag::JSRUNTIME, "null setSwitchCallBack");
return;
}
setSwitchCallBack(setSwitchStatus, createLayoutInfo, instanceId);
setSwitchCallBack(createLayoutInfo, instanceId);
}
void ConnectServerManager::SetProfilerCallBack(const std::function<void(bool)> &setStateProfilerStatus)
test/unittest/connect_server_manager_test/connect_server_manager_test.cpp
+1 -2
View File
@@ -219,11 +219,10 @@ HWTEST_F(ConnectServerManagerTest, GetDebuggerPostTaskTest_0100, TestSize.Level1
{
TAG_LOGI(AAFwkTag::TEST, "GetDebuggerPostTaskTest_0100 is start");
auto setStateProfilerStatus = [](bool) {};
auto setSwitchStatus = [](bool) {};
auto createLayoutInfo = [](int32_t) {};
int32_t instanceId = 1;
ConnectServerManager &connectServerManager = AbilityRuntime::ConnectServerManager::Get();
connectServerManager.SetSwitchCallback(setSwitchStatus, createLayoutInfo, instanceId);
connectServerManager.SetSwitchCallback(createLayoutInfo, instanceId);
connectServerManager.SetProfilerCallBack(setStateProfilerStatus);
int32_t tid = 1;
EXPECT_EQ(connectServerManager.GetDebuggerPostTask(tid), nullptr);