openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-19 14:43:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!2174 【新增特性】FA卡片能力补齐-支持删除无效卡片

Browse Source 
Merge pull request !2174 from yangzk/rk_dev
This commit is contained in:
openharmony_ci
2022-04-12 06:25:30 +00:00
committed by Gitee
parent a19077b5c9 c1a17595e4
commit 63ff85dc75
13 changed files with 104 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapter/ohos/entrance/ace_form_ability.cpp
+11
View File
@@ -141,6 +141,17 @@ void AceFormAbility::OnTriggerEvent(const int64_t formId, const std::string& mes
Platform::PaContainer::OnTriggerEvent(instanceId_, formId, message);
}
AppExecFwk::FormState AceFormAbility::OnAcquireFormState(const OHOS::AAFwk::Want &want)
{
LOGI("AceFormAbility::OnAcquireState called");
int32_t formState = Platform::PaContainer::OnAcquireFormState(instanceId_, want);
if (formState <= (int32_t) AppExecFwk::FormState::UNKNOWN || formState > (int32_t) AppExecFwk::FormState::READY) {
return AppExecFwk::FormState::UNKNOWN;
} else {
return (AppExecFwk::FormState) formState;
}
}
void AceFormAbility::OnUpdate(const int64_t formId)
{
LOGI("AceFormAbility::OnUpdate called: %{public}s", std::to_string(formId).c_str());
adapter/ohos/entrance/ace_form_ability.h
+8
View File
@@ -69,6 +69,14 @@ public:
*/
void OnTriggerEvent(const int64_t formId, const std::string& message) override;
/**
* @brief Called to notify the form supplier to acquire form state.
*
* @param want Indicates the detailed information about the form to be obtained, including
* the bundle name, module name, ability name, form name and form dimension.
*/
virtual AppExecFwk::FormState OnAcquireFormState(const OHOS::AAFwk::Want& want) override;
/**
* @brief Called to notify the form provider to update a specified form.
*
adapter/ohos/entrance/pa_container.cpp
+23
View File
@@ -199,6 +199,29 @@ bool PaContainer::OnTriggerEvent(int32_t instanceId, int64_t formId, const std::
return true;
}
int32_t PaContainer::OnAcquireFormState(int32_t instanceId, const OHOS::AAFwk::Want& want)
{
LOGI("PA: PaContainer::OnAcquireFormState start");
auto container = AceEngine::Get().GetContainer(instanceId);
if (!container) {
LOGE("PA: container is nullptr");
return -1;
}
auto aceContainer = AceType::DynamicCast<PaContainer>(container);
if (!aceContainer) {
LOGE("PA: aceContainer is nullptr");
return -1;
}
auto paBackend = AceType::DynamicCast<PaBackend>(aceContainer->GetBackend());
if (!paBackend) {
LOGE("PA: paBackend is nullptr");
return -1;
}
int32_t formState = paBackend->OnAcquireFormState(want);
LOGI("PA: PaContainer::OnAcquireFormState end");
return formState;
}
bool PaContainer::OnUpdate(int32_t instanceId, int64_t formId)
{
LOGI("PA: PaContainer::OnUpdate start");
adapter/ohos/entrance/pa_container.h
+1
View File
@@ -132,6 +132,7 @@ public:
static bool OnCreate(int32_t instanceId, const OHOS::AAFwk::Want& want);
static bool OnDelete(int32_t instanceId, int64_t formId);
static bool OnTriggerEvent(int32_t instanceId, int64_t formId, const std::string& message);
static int32_t OnAcquireFormState(int32_t instanceId, const OHOS::AAFwk::Want& want);
static bool OnUpdate(int32_t instanceId, int64_t formId);
static bool OnCastTemptoNormal(int32_t instanceId, int64_t formId);
static bool OnVisibilityChanged(int32_t instanceId, const std::map<int64_t, int32_t>& formEventsMap);
adapter/ohos/entrance/pa_engine/backend_delegate_impl.cpp
+5 -2
View File
@@ -459,10 +459,13 @@ void BackendDelegateImpl::OnVisibilityChanged(const std::map<int64_t, int32_t>&
TaskExecutor::TaskType::JS);
}
void BackendDelegateImpl::OnAcquireState(const OHOS::AAFwk::Want& want)
int32_t BackendDelegateImpl::OnAcquireFormState(const OHOS::AAFwk::Want &want)
{
taskExecutor_->PostTask([acquireStateCallback = acquireStateCallback_, want] { acquireStateCallback(want); },
auto ret = (int32_t) AppExecFwk::FormState::UNKNOWN;
taskExecutor_->PostSyncTask(
[acquireStateCallback = acquireStateCallback_, &ret, want] { ret = acquireStateCallback(want); },
TaskExecutor::TaskType::JS);
return ret;
}
void BackendDelegateImpl::OnCommand(const OHOS::AAFwk::Want &want, int startId)
adapter/ohos/entrance/pa_engine/backend_delegate_impl.h
+2 -2
View File
@@ -63,7 +63,7 @@ using TriggerEventCallback = std::function<void(const int64_t formId, const std:
using UpdateFormCallback = std::function<void(const int64_t formId)>;
using CastTemptoNormalCallback = std::function<void(const int64_t formId)>;
using VisibilityChangedCallback = std::function<void(const std::map<int64_t, int32_t>& formEventsMap)>;
using AcquireStateCallback = std::function<void(const OHOS::AAFwk::Want &want)>;
using AcquireStateCallback = std::function<int32_t(const OHOS::AAFwk::Want &want)>;
using CommandCallback = std::function<void(const OHOS::AAFwk::Want &want, int startId)>;
using CommandApplicationCallback = std::function<void(const std::string& intent, int startId)>;
@@ -184,7 +184,7 @@ public:
void OnUpdate(const int64_t formId);
void OnCastTemptoNormal(const int64_t formId);
void OnVisibilityChanged(const std::map<int64_t, int32_t>& formEventsMap);
void OnAcquireState(const OHOS::AAFwk::Want& want);
int32_t OnAcquireFormState(const OHOS::AAFwk::Want& want);
private:
void LoadPa(const std::string& url, const OHOS::AAFwk::Want& want);
adapter/ohos/entrance/pa_engine/engine/common/js_backend_engine.h
+1 -1
View File
@@ -78,7 +78,7 @@ public:
virtual void OnUpdate(const int64_t formId) = 0;
virtual void OnCastTemptoNormal(const int64_t formId) = 0;
virtual void OnVisibilityChanged(const std::map<int64_t, int32_t>& formEventsMap) = 0;
virtual void OnAcquireState(const OHOS::AAFwk::Want &want) = 0;
virtual int32_t OnAcquireFormState(const OHOS::AAFwk::Want &want) = 0;
virtual void OnCommand(const OHOS::AAFwk::Want &want, int startId) = 0;
void SetFormData(const AppExecFwk::FormProviderData &formProviderData)
adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine.cpp
+27 -4
View File
@@ -1336,12 +1336,35 @@ void JsiPaEngine::OnVisibilityChanged(const std::map<int64_t, int32_t>& formEven
CallFunc(func, argv);
}
void JsiPaEngine::OnAcquireState(const OHOS::AAFwk::Want &want)
int32_t JsiPaEngine::OnAcquireFormState(const OHOS::AAFwk::Want &want)
{
LOGI("JsiPaEngine OnAcquireState");
LOGI("JsiPaEngine OnAcquireFormState");
ACE_DCHECK(engineInstance_);
shared_ptr<JsRuntime> runtime = engineInstance_->GetJsRuntime();
const std::vector<shared_ptr<JsValue>>& argv = { WantToJsValue(want) };
auto func = GetPaFunc("onAcquireState");
CallFunc(func, argv);
auto func = GetPaFunc("onAcquireFormState");
if (func == nullptr) {
LOGI("no OnAcquireFormState!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
auto result = CallFunc(func, argv);
auto arkJSValue = std::static_pointer_cast<ArkJSValue>(result);
if (arkJSValue->IsException(runtime)) {
LOGE("JsiPaEngine CallFunc FAILED!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
if (!arkJSValue->IsInt32(runtime)) {
LOGE("invalid return value!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
int32_t formState = arkJSValue->ToInt32(runtime);
LOGI("JsiPaEngine OnAcquireFormState, formState: %{public}d", formState);
return formState;
}
} // namespace OHOS::Ace
adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine.h
+1 -1
View File
@@ -162,7 +162,7 @@ public:
void OnUpdate(const int64_t formId) override;
void OnCastTemptoNormal(const int64_t formId) override;
void OnVisibilityChanged(const std::map<int64_t, int32_t>& formEventsMap) override;
void OnAcquireState(const OHOS::AAFwk::Want &want) override;
int32_t OnAcquireFormState(const OHOS::AAFwk::Want &want) override;
private:
void SetPostTask(NativeEngine* nativeEngine);
adapter/ohos/entrance/pa_engine/engine/quickjs/qjs_pa_engine.cpp
+18 -6
View File
@@ -1481,14 +1481,18 @@ void QjsPaEngine::OnVisibilityChanged(const std::map<int64_t, int32_t>& formEven
return;
}
void QjsPaEngine::OnAcquireState(const OHOS::AAFwk::Want& want)
int32_t QjsPaEngine::OnAcquireFormState(const OHOS::AAFwk::Want& want)
{
LOGI("PA: QjsPaEngine OnAcquireState");
LOGI("PA: QjsPaEngine OnAcquireFormState");
JSContext* ctx = engineInstance_->GetQjsContext();
ACE_DCHECK(ctx);
Framework::QJSHandleScope handleScope(ctx);
JSValue paFunc = GetPaFunc("onAcquireState");
JSValue paFunc = GetPaFunc("onAcquireFormState");
if (JS_IsUndefined(paFunc)) {
LOGI("no OnAcquireFormState!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
napi_value napiWant = OHOS::AppExecFwk::WrapWant(reinterpret_cast<napi_env>(nativeEngine_), want);
NativeValue* nativeWant = reinterpret_cast<NativeValue*>(napiWant);
@@ -1496,10 +1500,18 @@ void QjsPaEngine::OnAcquireState(const OHOS::AAFwk::Want& want)
JSValueConst argv[] = { jsWant };
JSValue retVal = Framework::QJSUtils::Call(ctx, paFunc, JS_UNDEFINED, countof(argv), argv);
if (JS_IsException(retVal)) {
LOGE("PA: OnAcquireState FAILED!");
return;
LOGE("PA: OnAcquireFormState FAILED!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
return;
if (!JS_IsNumber(retVal)) {
LOGE("invalid return value!");
return (int32_t)AppExecFwk::FormState::DEFAULT;
}
int32_t formState = GetJsInt32Val(ctx, retVal);
LOGI("JsiPaEngine OnAcquireFormState, formState: %{public}d", formState);
return formState;
}
void QjsPaEngine::OnCommand(const OHOS::AAFwk::Want &want, int startId)
adapter/ohos/entrance/pa_engine/engine/quickjs/qjs_pa_engine.h
+1 -1
View File
@@ -170,7 +170,7 @@ public:
void OnUpdate(const int64_t formId) override;
void OnCastTemptoNormal(const int64_t formId) override;
void OnVisibilityChanged(const std::map<int64_t, int32_t>& formEventsMap) override;
void OnAcquireState(const OHOS::AAFwk::Want &want) override;
int32_t OnAcquireFormState(const OHOS::AAFwk::Want &want) override;
void OnCommand(const OHOS::AAFwk::Want &want, int startId) override;
private:
adapter/ohos/entrance/pa_engine/pa_backend.cpp
+5 -5
View File
@@ -296,12 +296,12 @@ void PaBackend::InitializeBackendDelegate(const RefPtr<TaskExecutor>& taskExecut
};
builder.acquireStateCallback = [weakEngine = WeakPtr<JsBackendEngine>(jsBackendEngine_)](
const OHOS::AAFwk::Want& want) {
const OHOS::AAFwk::Want& want) -> int32_t {
auto jsBackendEngine = weakEngine.Upgrade();
if (!jsBackendEngine) {
return;
return -1;
}
jsBackendEngine->OnAcquireState(want);
return jsBackendEngine->OnAcquireFormState(want);
};
builder.commandApplicationCallback = [weakEngine = WeakPtr<JsBackendEngine>(jsBackendEngine_)](
@@ -494,9 +494,9 @@ void PaBackend::OnVisibilityChanged(const std::map<int64_t, int32_t>& formEvents
delegate_->OnVisibilityChanged(formEventsMap);
}
void PaBackend::OnAcquireState(const OHOS::AAFwk::Want& want)
int32_t PaBackend::OnAcquireFormState(const OHOS::AAFwk::Want& want)
{
delegate_->OnAcquireState(want);
return delegate_->OnAcquireFormState(want);
}
sptr<IRemoteObject> PaBackend::OnConnect(const OHOS::AAFwk::Want& want)
adapter/ohos/entrance/pa_engine/pa_backend.h
+1 -1
View File
@@ -84,7 +84,7 @@ public:
void OnUpdate(const int64_t formId);
void OnCastTemptoNormal(const int64_t formId);
void OnVisibilityChanged(const std::map<int64_t, int32_t>& formEventsMap);
void OnAcquireState(const OHOS::AAFwk::Want& want);
int32_t OnAcquireFormState(const OHOS::AAFwk::Want& want);
sptr<IRemoteObject> OnConnect(const OHOS::AAFwk::Want& want);
void OnDisConnect(const OHOS::AAFwk::Want& want);