openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-12-02 12:17:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改头文件

Browse Source 
Signed-off-by: dubj <dubingjian@huawei.com>
Change-Id: I13ad4e5820cd1f4a0df50884fff5a468ed3b13ac
This commit is contained in:
dubj 2022-04-16 22:59:17 +08:00
parent 39526bb528
commit 2f9ab2137e
25 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundle.json
View File

@ -51,8 +51,8 @@
"//foundation/windowmanager/sa_profile:wms_sa_profile",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
"//foundation/windowmanager/extension/extension_connection:libwec",
"//foundation/windowmanager/extension/window_extension:libwe",
"//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
"//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
"//foundation/windowmanager/extension/window_extension:window_extension_module",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",

8
extension/extension_connection/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/ohos.gni")
config("libwec_private_config") {
config("libwindow_extension_client_private_config") {
visibility = [ ":*" ]
include_dirs = [
@ -27,7 +27,7 @@ config("libwec_private_config") {
]
}
ohos_shared_library("libwec") {
ohos_shared_library("libwindow_extension_client") {
install_enable = true
sources = [
@ -37,14 +37,14 @@ ohos_shared_library("libwec") {
"src/window_extension_client_stub_impl.cpp",
]
configs = [ ":libwec_private_config" ]
configs = [ ":libwindow_extension_client_private_config" ]
deps = [
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/extension/window_extension:libwe",
"//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
"//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
]

2
extension/extension_connection/include/window_extension_client_stub_impl.h
View File

@ -16,8 +16,8 @@
#ifndef WINDOW_EXTENSION_CLIENT_STUB_IMPL_H
#define WINDOW_EXTENSION_CLIENT_STUB_IMPL_H
#include "window_extension_connection.h"
#include "window_extension_client_stub.h"
#include "window_extension_connection.h"
namespace OHOS {
namespace Rosen {

2
extension/extension_connection/include/zidl/window_extension_client_proxy.h
View File

@ -16,8 +16,8 @@
#ifndef WINODW_EXTENSION_CLIENT_PROXY
#define WINODW_EXTENSION_CLIENT_PROXY
#include <iremote_proxy.h>
#include "window_extension_client_interface.h"
#include "iremote_proxy.h"
namespace OHOS {
namespace Rosen {

2
extension/extension_connection/include/zidl/window_extension_client_stub.h
View File

@ -16,8 +16,8 @@
#ifndef WINDOW_EXTENSION_CLIENT_STUB
#define WINDOW_EXTENSION_CLIENT_STUB
#include <iremote_stub.h>
#include "window_extension_client_interface.h"
#include "iremote_stub.h"
namespace OHOS {
namespace Rosen {

3
extension/extension_connection/src/window_extension_client_proxy.cpp
View File

@ -14,8 +14,9 @@
*/
#include "window_extension_client_proxy.h"
#include <ipc_types.h>
#include "message_option.h"
#include <message_option.h>
#include "window_manager_hilog.h"
namespace OHOS {

1
extension/extension_connection/src/window_extension_client_stub_impl.cpp
View File

@ -14,6 +14,7 @@
*/
#include "window_extension_client_stub_impl.h"
#include "window_manager_hilog.h"
namespace OHOS {

14
extension/extension_connection/src/window_extension_connection.cpp
View File

@ -15,14 +15,15 @@
#include "window_extension_connection.h"
#include "ability_connect_callback_stub.h"
#include "ability_manager_client.h"
#include "element_name.h"
#include <ability_connect_callback_stub.h>
#include <ability_manager_client.h>
#include <element_name.h>
#include <iremote_object.h>
#include "window_extension_proxy.h"
#include "window_extension_client_stub_impl.h"
#include "window_manager_hilog.h"
#include "wm_common.h"
#include "./zidl/window_extension_proxy.h"
#include "window_extension_client_stub_impl.h"
namespace OHOS {
namespace Rosen {
@ -167,8 +168,9 @@ void WindowExtensionConnection::Impl::OnAbilityConnectDone(const AppExecFwk::Ele
proxy_->ConnectToExtension(clientToken);
WLOGFI("ConnectToExtension");
}
WLOGFI("end");
WLOGFI("call end");
}
void WindowExtensionConnection::Impl::OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode)
{
WLOGFI("end");

14
extension/window_extension/BUILD.gn
View File

@ -13,7 +13,7 @@
import("//build/ohos.gni")
config("libwe_private_config") {
config("libwindow_exteinsion_private_config") {
visibility = [ ":*" ]
include_dirs = [
@ -25,15 +25,15 @@ config("libwe_private_config") {
]
}
config("libwe_public_config") {
config("libwindow_exteinsion_public_config") {
include_dirs = [
"../../interfaces/innerkits/wm",
"../../utils/include",
]
}
## Build libwe.so
ohos_shared_library("libwe") {
## Build libwindow_exteinsion.so
ohos_shared_library("libwindow_exteinsion") {
sources = [
"../extension_connection/src/window_extension_client_proxy.cpp",
"src/js_window_extension_context.cpp",
@ -43,9 +43,9 @@ ohos_shared_library("libwe") {
"src/window_extension.cpp",
]
configs = [ ":libwe_private_config" ]
configs = [ ":libwindow_exteinsion_private_config" ]
public_configs = [ ":libwe_public_config" ]
public_configs = [ ":libwindow_exteinsion_public_config" ]
deps = [
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
@ -84,7 +84,7 @@ ohos_shared_library("window_extension_module") {
configs = [ ":window_extension_module_private_config" ]
deps = [
"//foundation/windowmanager/extension/window_extension:libwe",
"//foundation/windowmanager/extension/window_extension:libwindow_exteinsion",
]
external_deps = [

5
extension/window_extension/include/js_window_extension.h
View File

@ -16,8 +16,9 @@
#ifndef JS_WINDOW_EXTENSION_H
#define JS_WINDOW_EXTENSION_H
#include "js_runtime.h"
#include "js_runtime_utils.h"
#include <js_runtime.h>
#include <js_runtime_utils.h>
#include "js_window_extension_context.h"
#include "window.h"
#include "window_extension.h"

8
extension/window_extension/include/js_window_extension_context.h
View File

@ -16,10 +16,10 @@
#ifndef JS_WINDOW_EXTENSION_CONTEXT_H
#define JS_WINDOW_EXTENSION_CONTEXT_H
#include "ability_connect_callback.h"
#include "event_handler.h"
#include "extension_context.h"
#include "native_engine/native_engine.h"
#include <ability_connect_callback.h>
#include <event_handler.h>
#include <extension_context.h>
#include <native_engine/native_engine.h>
#include "window.h"
#include "window_extension_context.h"

5
extension/window_extension/include/window_extension.h
View File

@ -16,9 +16,8 @@
#ifndef WINDOW_EXTENSION_H
#define WINDOW_EXTENSION_H
#include "extension_base.h"
#include "service_extension.h"
#include <extension_base.h>
#include <service_extension.h>
namespace OHOS {
namespace Rosen {

2
extension/window_extension/include/window_extension_context.h
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "extension_context.h"
#include <extension_context.h>
#ifndef WINDOW_EXTENSION_CONTEXT_H
#define WINDOW_EXTENSION_CONTEXT_H

2
extension/window_extension/include/window_extension_module_loader.h
View File

@ -16,7 +16,7 @@
#ifndef WINDOW_EXTENSION_MODULE_LOADER_H
#define WINDOW_EXTENSION_MODULE_LOADER_H
#include "extension_module_loader.h"
#include <extension_module_loader.h>
namespace OHOS::Rosen {
class WindowExtensionModuleLoader : public AbilityRuntime::ExtensionModuleLoader,

3
extension/window_extension/include/window_extension_stub_impl.h
View File

@ -16,13 +16,12 @@
#ifndef WINDOW_EXTENSION_STUB_IMPL_H
#define WINDOW_EXTENSION_STUB_IMPL_H
#include "wm_common.h"
#include <string>
#include "window.h"
#include "window_extension_stub.h"
#include "window_extension_client_interface.h"
#include "wm_common.h"
namespace OHOS {
namespace Rosen {

7
extension/window_extension/include/zidl/window_extension_interface.h
View File

@ -16,11 +16,12 @@
#ifndef WINDOW_EXTENSION_INTERFACE_H
#define WINDOW_EXTENSION_INTERFACE_H
#include "iremote_broker.h"
#include "refbase.h"
#include "wm_common.h"
#include <iremote_broker.h>
#include <refbase.h>
#include "window.h"
#include "window_extension_client_interface.h"
#include "wm_common.h"
namespace OHOS {
namespace Rosen {

2
extension/window_extension/include/zidl/window_extension_proxy.h
View File

@ -16,8 +16,8 @@
#ifndef WINDOW_EXTENSION_PROXY_H
#define WINDOW_EXTENSION_PROXY_H
#include <iremote_proxy.h>
#include "window_extension_interface.h"
#include "iremote_proxy.h"
namespace OHOS {
namespace Rosen {

5
extension/window_extension/include/zidl/window_extension_stub.h
View File

@ -16,11 +16,10 @@
#ifndef WINDOW_EXTENSION_STUB_H
#define WINDOW_EXTENSION_STUB_H
#include <iremote_object.h>
#include <iremote_stub.h>
#include "window_extension_interface.h"
#include "iremote_object.h"
#include "iremote_stub.h"
namespace OHOS {
namespace Rosen {
class WindowExtensionStub : public IRemoteStub<IWindowExtension> {

8
extension/window_extension/src/js_window_extension.cpp
View File

@ -15,11 +15,11 @@
#include "js_window_extension.h"
#include "native_engine/native_reference.h"
#include "native_engine/native_value.h"
#include "js_extension_context.h"
#include "js_window_extension_context.h"
#include <native_engine/native_reference.h>
#include <native_engine/native_value.h>
#include <js_extension_context.h>
#include "js_window_extension_context.h"
#include "window_extension_connection.h"
#include "window_manager_hilog.h"
#include "wm_common.h"

4
extension/window_extension/src/js_window_extension_context.cpp
View File

@ -15,8 +15,8 @@
#include "js_window_extension_context.h"
#include "js_runtime_utils.h"
#include "js_extension_context.h"
#include <js_runtime_utils.h>
#include <js_extension_context.h>
#include "service_extension_context.h"
#include "window_manager_hilog.h"

4
extension/window_extension/src/window_extension_module_loader.cpp
View File

@ -15,8 +15,8 @@
#include "window_extension_module_loader.h"
#include "ability_connection.h"
#include "native_engine/native_engine.h"
#include <ability_connection.h>
#include <native_engine/native_engine.h>
#include "window_extension.h"
#include "window_manager_hilog.h"

4
extension/window_extension/src/window_extension_proxy.cpp
View File

@ -14,8 +14,10 @@
*/
#include "window_extension_proxy.h"
#include <ipc_types.h>
#include "message_option.h"
#include <message_option.h>
#include "window_manager_hilog.h"
namespace OHOS {

2
extension/window_extension/src/window_extension_stub_impl.cpp
View File

@ -15,8 +15,6 @@
#include "window_extension_stub_impl.h"
#include<unistd.h> //TODO
#include "js_window_extension.h"
#include "window_extension_connection.h"
#include "window_manager_hilog.h"

2
interfaces/kits/napi/window_extension/window_extension_module.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "native_engine/native_engine.h"
#include <native_engine/native_engine.h>
extern const char _binary_window_extension_js_start[];
extern const char _binary_window_extension_js_end[];

2
interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp
View File

@ -13,7 +13,7 @@
* limitations under the License.
*/
#include "native_engine/native_engine.h"
#include <native_engine/native_engine.h>
extern const char _binary_window_extension_context_js_start[];
extern const char _binary_window_extension_context_js_end[];