openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

添加对外接口

Browse Source 
Signed-off-by: dubj <dubingjian@huawei.com>
Change-Id: Ib322eaa5d71fa83984d5beba7afdc1def68160ae
This commit is contained in:
dubj
2022-04-25 19:44:55 +08:00
parent 031be0b40b
commit 24ecadd080
12 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.json
+10
View File
@@ -91,6 +91,16 @@
],
"header_base": "//foundation/windowmanager/interfaces/innerkits/dm"
}
},
{
"type": "so",
"name": "//foundation/windowmanager/extension/extension_connection:libwindow_extension_client",
"header": {
"header_files": [
"window_extension_connection.h"
],
"header_base": "//foundation/windowmanager/interfaces/innerkits/extension"
}
}
],
"test": [
extension/extension_connection/BUILD.gn
+10 -9
View File
@@ -19,17 +19,16 @@ config("libwindow_extension_client_private_config") {
include_dirs = [
"include",
"include/zidl",
"../window_extension/include",
"../window_extension/include/zidl",
"../../interface/innerkits/wm",
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
]
}
config("libextension_connection_public_config") {
include_dirs = [ "../../interfaces/innerkits/extension" ]
}
ohos_shared_library("libwindow_extension_client") {
install_enable = true
sources = [
"../window_extension/src/window_extension_proxy.cpp",
"src/window_extension_connection.cpp",
@@ -37,21 +36,23 @@ ohos_shared_library("libwindow_extension_client") {
"src/window_extension_client_stub_impl.cpp",
]
public_configs = [ ":libextension_connection_public_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:libwindow_extension",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
"//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
]
external_deps = [
"ability_base:want",
"ability_runtime:abilitykit_native",
"ability_runtime:ability_manager",
"ability_runtime:runtime",
"bundle_framework:appexecfwk_base",
"eventhandler:libeventhandler",
"graphic_standard:surface",
"hiviewdfx_hilog_native:libhilog",
"input:libmmi-client",
extension/extension_connection/src/window_extension_client_proxy.cpp
+2 -2
View File
@@ -74,8 +74,8 @@ void WindowExtensionClientProxy::OnKeyEvent(std::shared_ptr<MMI::KeyEvent>& keyE
}
if (!keyEvent->WriteToParcel(data)) {
WLOGFE("write key event failed");
return;
WLOGFE("write key event failed");
return;
}
if (Remote()->SendRequest(TRANS_ID_ON_KEY_EVENT, data, replay, option) != ERR_NONE) {
WLOGFE("send request failed");
extension/extension_connection/src/window_extension_connection.cpp
+12 -1
View File
@@ -116,7 +116,6 @@ void WindowExtensionConnection::Impl::ConnectExtension(const AppExecFwk::Element
void WindowExtensionConnection::Impl::Show()
{
if (proxy_ != nullptr) {
proxy_->Show();
WLOGFI("show window");
@@ -139,6 +138,13 @@ void WindowExtensionConnection::Impl::RequestFocus()
}
}
void WindowExtensionConnection::Impl::Resize(Rect rect)
{
if (proxy_ != nullptr) {
proxy_->Resize(rect);
}
}
void WindowExtensionConnection::Impl::OnAbilityConnectDone(const AppExecFwk::ElementName &element,
const sptr<IRemoteObject> &remoteObject, int resultCode)
{
@@ -197,5 +203,10 @@ void WindowExtensionConnection::RequestFocus()
{
pImpl_->RequestFocus();
}
void WindowExtensionConnection::SetBounds(Rect rect)
{
pImpl_->Resize(rect);
}
} // namespace Rosen
} // namespace OHOS
extension/window_extension/BUILD.gn
+1 -11
View File
@@ -22,16 +22,8 @@ config("libwindow_extension_private_config") {
"../extension_connection/include",
"../extension_connection/include/zidl",
"../../interfaces/kits/napi/window_runtime/window_napi",
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
"//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common",
"//foundation/aafwk/standard/interfaces/innerkits/runtime/include",
]
}
config("libwindow_extension_public_config") {
include_dirs = [
"../../interfaces/innerkits/extension",
"../../interfaces/innerkits/wm",
"../../utils/include",
]
}
@@ -48,8 +40,6 @@ ohos_shared_library("libwindow_extension") {
configs = [ ":libwindow_extension_private_config" ]
public_configs = [ ":libwindow_extension_public_config" ]
deps = [
"//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
extension/window_extension/include/js_window_extension_context.h
-1
View File
@@ -30,7 +30,6 @@ class JsWindowConnectCallback : public AbilityRuntime::AbilityConnectCallback {
public:
explicit JsWindowConnectCallback() = default;
~JsWindowConnectCallback() = default;
// void OnWindowCreate(sptr<Window> window); //TODO
virtual void OnAbilityConnectDone(const AppExecFwk::ElementName &element,
const sptr<IRemoteObject> &remoteObject, int resultCode) override;
virtual void OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) override;
extension/window_extension/include/window_extension_context.h
+3 -2
View File
@@ -13,10 +13,11 @@
* limitations under the License.
*/
#include <extension_context.h>
#ifndef WINDOW_EXTENSION_CONTEXT_H
#define WINDOW_EXTENSION_CONTEXT_H
#include <extension_context.h>
namespace OHOS {
namespace Rosen {
class WindowExtensionContext : public AbilityRuntime::ExtensionContext {
extension/window_extension/src/js_window_extension.cpp
+5 -5
View File
@@ -124,13 +124,13 @@ void JsWindowExtension::GetSrcPath(std::string &srcPath)
if (!Extension::abilityInfo_->isModuleJson) {
srcPath.append(Extension::abilityInfo_->package);
srcPath.append("/assets/js/");
srcPath.append("/assets/js/");
if (!Extension::abilityInfo_->srcPath.empty()) {
srcPath.append(Extension::abilityInfo_->srcPath);
}
srcPath.append("/").append(Extension::abilityInfo_->name).append(".abc");
return;
}
}
if (!Extension::abilityInfo_->srcEntrance.empty()) {
srcPath.append(Extension::abilityInfo_->moduleName + "/");
@@ -189,12 +189,12 @@ void JsWindowExtension::OnStart(const AAFwk::Want &want)
{
Extension::OnStart(want);
ElementName elementName = want.GetElement(); // TODO 为何之前是GetElementName()？
ElementName elementName = want.GetElement();
std::string windowName = elementName.GetBundleName();
stub_ = new(std::nothrow)WindowExtensionStubImpl(windowName);
WLOGFI("JsWindowExtension OnStart begin..");
Rect rect { want.GetIntParam(RECT_FORM_KEY_POS_X, 0),
Rect rect { want.GetIntParam(RECT_FORM_KEY_POS_X, 0),
want.GetIntParam(RECT_FORM_KEY_POS_Y, 0),
want.GetIntParam(RECT_FORM_KEY_WIDTH, 0),
want.GetIntParam(RECT_FORM_KEY_HEIGHT, 0) };
@@ -211,7 +211,7 @@ void JsWindowExtension::OnStart(const AAFwk::Want &want)
}
OnWindowCreated();
WLOGFI("ability context onWindowReady rect x =%{public}d y=%{public}d w=%{public}d h=%{public}d ",
rect.posX_, rect.posY_, rect.width_, rect.height_);
rect.posX_, rect.posY_, rect.width_, rect.height_);
}
}
extension/window_extension/src/js_window_extension_context.cpp
+2 -6
View File
@@ -42,13 +42,9 @@ public:
private:
std::shared_ptr<WindowExtensionContext> context_;
};
// void JsWindowConnectCallback::OnWindowCreate(sptr<Window> window)
// {
// // call js api
// }
void JsWindowConnectCallback::OnAbilityConnectDone(const AppExecFwk::ElementName &element,
const sptr<IRemoteObject> &remoteObject, int resultCode)
const sptr<IRemoteObject> &remoteObject, int resultCode)
{
WLOGFI("called");
}
@@ -62,7 +58,7 @@ NativeValue* CreateJsWindowExtensionContext(NativeEngine& engine,
std::shared_ptr<WindowExtensionContext> context)
{
WLOGFI("CreateJsWindowExtensionContext begin");
NativeValue* objValue = CreateJsExtensionContext(engine, context); // TODO CreateJsBaseContext?
NativeValue* objValue = CreateJsExtensionContext(engine, context);
NativeObject* object = AbilityRuntime::ConvertNativeValueTo<NativeObject>(objValue);
std::unique_ptr<JsWindowExtensionContext> jsContext
extension/window_extension/src/window_extension.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ void WindowExtension::Init(const std::shared_ptr<AbilityRuntime::AbilityLocalRec
const sptr<IRemoteObject> &token)
{
ExtensionBase<WindowExtensionContext>::Init(record, application, handler, token);
WLOGFI("WindowExtension begin init");
WLOGFI("WindowExtension begin init");
}
std::shared_ptr<WindowExtensionContext> WindowExtension::CreateAndInitContext(
extension/window_extension/src/window_extension_stub_impl.cpp
-1
View File
@@ -33,7 +33,6 @@ WindowExtensionStubImpl::WindowExtensionStubImpl(const std::string& windowName)
WindowExtensionStubImpl::~WindowExtensionStubImpl()
{
if (window_ != nullptr) {
// window_->RemoveDispatchInoutEventLisenser(); // TODO
window_->Destroy();
}
}
interfaces/innerkits/wm/window_extension_connection.h → interfaces/innerkits/extension/window_extension_connection.h
+2
View File
@@ -52,9 +52,11 @@ public:
~WindowExtensionConnection() = default;
void ConnectExtension(const AppExecFwk::ElementName &element, Rect rect,
uint32_t uid, sptr<IWindowExtensionCallback>& callback);
void DisconnectExtension();
void Show();
void Hide();
void RequestFocus();
void SetBounds(Rect rect);
private:
class Impl;
sptr<Impl> pImpl_;