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

!10313 回退https://gitee.com/openharmony/window_window_manager/issues/IANOXE

Browse Source 
Merge pull request !10313 from ningyuanfeng/master
This commit is contained in:
openharmony_ci 2024-10-31 04:13:37 +00:00 committed by Gitee
commit a6474c8f61
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
interfaces/kits/napi/picture_in_picture_napi/inner/js_pip_manager.cpp
View File

@ -27,13 +27,6 @@ namespace {
constexpr int32_t NUMBER_TWO = 2; constexpr int32_t NUMBER_TWO = 2;
} }
napi_valuetype GetType(napi_env env, napi_value value)
{
napi_valuetype res = napi_undefined;
napi_typeof(env, value, &res);
return res;
}
napi_value NapiGetUndefined(napi_env env) napi_value NapiGetUndefined(napi_env env)
{ {
napi_value result = nullptr; napi_value result = nullptr;
@ -186,37 +179,6 @@ napi_value JsPipManager::OnSetTypeNodeEnabled(napi_env env, napi_callback_info i
return NapiGetUndefined(env); return NapiGetUndefined(env);
} }
napi_value JsPipManager::SetPipNodeType(napi_env env, napi_callback_info info)
{
JsPipManager* me = CheckParamsAndGetThis<JsPipManager>(env, info);
return (me != nullptr) ? me->OnSetPipNodeType(env, info) : nullptr;
}
napi_value JsPipManager::OnSetPipNodeType(napi_env env, napi_callback_info info)
{
TLOGD(WmsLogTag::WMS_PIP, "[NAPI]");
size_t argc = 4; // 4: arg number
napi_value argv[4] = { nullptr };
napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
if (argc != NUMBER_TWO) {
TLOGE(WmsLogTag::WMS_PIP, "[NAPI]Argc count is invalid: %{public}zu", argc);
return NapiGetUndefined(env);
}
napi_value typeNode = argv[0];
bool markPip = false;
if (!ConvertFromJsValue(env, argv[1], markPip)) {
TLOGW(WmsLogTag::WMS_PIP, "Failed to convert param to bool");
}
if (typeNode != nullptr && GetType(env, typeNode) != napi_undefined) {
XComponentControllerErrorCode ret =
XComponentController::SetSurfaceCallbackMode(env, typeNode, markPip ?
SurfaceCallbackMode::PIP : SurfaceCallbackMode::DEFAULT);
TLOGI(WmsLogTag::WMS_PIP, "set surface mode, ret: %{public}u, isPip: %{public}d",
static_cast<uint32_t>(ret), static_cast<uint32_t>(markPip));
}
return NapiGetUndefined(env);
}
napi_value JsPipManager::RegisterCallback(napi_env env, napi_callback_info info) napi_value JsPipManager::RegisterCallback(napi_env env, napi_callback_info info)
{ {
JsPipManager* me = CheckParamsAndGetThis<JsPipManager>(env, info); JsPipManager* me = CheckParamsAndGetThis<JsPipManager>(env, info);
@ -288,7 +250,6 @@ napi_value JsPipManagerInit(napi_env env, napi_value exportObj)
BindNativeFunction(env, exportObj, "on", moduleName, JsPipManager::RegisterCallback); BindNativeFunction(env, exportObj, "on", moduleName, JsPipManager::RegisterCallback);
BindNativeFunction(env, exportObj, "off", moduleName, JsPipManager::UnregisterCallback); BindNativeFunction(env, exportObj, "off", moduleName, JsPipManager::UnregisterCallback);
BindNativeFunction(env, exportObj, "setTypeNodeEnabled", moduleName, JsPipManager::SetTypeNodeEnabled); BindNativeFunction(env, exportObj, "setTypeNodeEnabled", moduleName, JsPipManager::SetTypeNodeEnabled);
BindNativeFunction(env, exportObj, "setPipNodeType", moduleName, JsPipManager::SetPipNodeType);
return NapiGetUndefined(env); return NapiGetUndefined(env);
} }
} // namespace Rosen } // namespace Rosen

2
interfaces/kits/napi/picture_in_picture_napi/inner/js_pip_manager.h
View File

@ -32,7 +32,6 @@ public:
static napi_value RegisterCallback(napi_env env, napi_callback_info info); static napi_value RegisterCallback(napi_env env, napi_callback_info info);
static napi_value UnregisterCallback(napi_env env, napi_callback_info info); static napi_value UnregisterCallback(napi_env env, napi_callback_info info);
static napi_value SetTypeNodeEnabled(napi_env env, napi_callback_info info); static napi_value SetTypeNodeEnabled(napi_env env, napi_callback_info info);
static napi_value SetPipNodeType(napi_env env, napi_callback_info info);
private: private:
napi_value OnInitXComponentController(napi_env env, napi_callback_info info); napi_value OnInitXComponentController(napi_env env, napi_callback_info info);
napi_value OnGetCustomUIController(napi_env env, napi_callback_info info); napi_value OnGetCustomUIController(napi_env env, napi_callback_info info);
@ -40,7 +39,6 @@ private:
napi_value OnRegisterCallback(napi_env env, napi_callback_info info); napi_value OnRegisterCallback(napi_env env, napi_callback_info info);
napi_value OnUnregisterCallback(napi_env env, napi_callback_info info); napi_value OnUnregisterCallback(napi_env env, napi_callback_info info);
napi_value OnSetTypeNodeEnabled(napi_env env, napi_callback_info info); napi_value OnSetTypeNodeEnabled(napi_env env, napi_callback_info info);
napi_value OnSetPipNodeType(napi_env env, napi_callback_info info);
}; };
} // namespace Rosen } // namespace Rosen
} // namespace OHOS } // namespace OHOS

7
resources/abc/pip/interface/PiPContent.js
View File

@ -99,13 +99,6 @@ export class PiPContent extends ViewPU {
return; return;
} }
this.useNode = true; this.useNode = true;
let parent = this.xComponent.getParent();
if (parent === null || parent === undefined) {
pip.setPipNodeType(this.xComponent, false);
} else {
pip.setPipNodeType(this.xComponent, true);
parent.removeChild(this.xComponent);
}
pip.setTypeNodeEnabled(); pip.setTypeNodeEnabled();
this.mXCNodeController = new XCNodeController(this.xComponent); this.mXCNodeController = new XCNodeController(this.xComponent);
console.info(TAG, 'use Node Controller'); console.info(TAG, 'use Node Controller');

7
resources/abc/pip/source/PiPContent.ets
View File

@ -63,13 +63,6 @@ export struct PiPContent {
return; return;
} }
this.useNode = true; this.useNode = true;
let parent: FrameNode | null = this.xComponent.getParent();
if (parent === null || parent === undefined) {
pip.setPipNodeType(this.xComponent, false);
} else {
pip.setPipNodeType(this.xComponent, true);
parent.removeChild(this.xComponent);
}
pip.setTypeNodeEnabled(); pip.setTypeNodeEnabled();
this.mXCNodeController = new XCNodeController(this.xComponent); this.mXCNodeController = new XCNodeController(this.xComponent);
console.info(TAG, 'use Node Controller'); console.info(TAG, 'use Node Controller');