openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2024-11-27 00:20:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

异moduleName接续

Browse Source 
Signed-off-by: MisterE <smart_e@126.com>
This commit is contained in:
MisterE 2024-11-11 17:44:08 +08:00
commit 180fe0bafb
4 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/dtbschedmgr/include/continue/dsched_continue.h
View File

@ -146,6 +146,7 @@ private:
int32_t PostContinueSendTask(const OHOS::AAFwk::Want& want, int32_t callerUid, int32_t status,
uint32_t accessToken);
int32_t PostContinueDataTask(std::shared_ptr<DSchedContinueDataCmd> cmd);
int32_t UpdateElementInfo(std::shared_ptr<DSchedContinueDataCmd> cmd);
int32_t PostNotifyCompleteTask(int32_t result);
int32_t PostContinueEndTask(int32_t result);

2
services/dtbschedmgr/include/mission/distributed_bm_storage.h
View File

@ -64,7 +64,7 @@ public:
bool GetDistributedBundleInfo(const std::string &networkId, const uint16_t &bundleNameId,
DmsBundleInfo &distributeBundleInfo);
bool GetDistributedBundleInfo(const std::string &networkId, const std::string &bundleName,
DmsBundleInfo &distributeBundleInfo);
DmsBundleInfo &distributeBundleInfo);
bool GetBundleNameId(const std::string& bundleName, uint16_t &bundleNameId);
std::string GetContinueType(const std::string &networkId, std::string &bundleName, uint8_t continueTypeId);
std::string GetAbilityName(const std::string &networkId, std::string &bundleName, std::string &continueType);

53
services/dtbschedmgr/src/continue/dsched_continue.cpp
View File

@ -390,14 +390,30 @@ int32_t DSchedContinue::OnContinueDataCmd(std::shared_ptr<DSchedContinueDataCmd>
int32_t DSchedContinue::PostContinueDataTask(std::shared_ptr<DSchedContinueDataCmd> cmd)
{
DSchedContinueEventType eventType = DSCHED_CONTINUE_DATA_EVENT;
cmd->want_.SetBundle(cmd->dstBundleName_);
std::string senderNetWorkId = cmd->callerInfo_.sourceDeviceId;
std::string continueType = cmd->continueType_;
std::string moduleName = cmd->want_.GetModuleName();
if (UpdateElementInfo(cmd) != ERR_OK) {
return INVALID_PARAMETERS_ERR;
}
HILOGI("PostContinueDataTask %{public}d, continueInfo %{public}s; ", eventType, continueInfo_.toString().c_str());
if (eventHandler_ == nullptr) {
HILOGE("PostContinueDataTask eventHandler is nullptr");
return INVALID_PARAMETERS_ERR;
}
auto msgEvent = AppExecFwk::InnerEvent::Get(eventType, cmd, 0);
if (!eventHandler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) {
HILOGE("PostContinueDataTask eventHandler send event type %{public}d fail", eventType);
return CONTINUE_SEND_EVENT_FAILED;
}
return ERR_OK;
}
int32_t DSchedContinue::UpdateElementInfo(std::shared_ptr<DSchedContinueDataCmd> cmd)
{
std::string moduleName = cmd->want_.GetStringParam(OHOS::AAFwk::Want::PARAM_MODULE_NAME);
DmsBundleInfo distributedBundleInfo;
if (!DmsBmStorage::GetInstance()->GetDistributedBundleInfo(senderNetWorkId, cmd->dstBundleName_,
distributedBundleInfo)) {
HILOGE("PostContinueDataTask can not found bundle info for bundle name: %{public}s",
if (!DmsBmStorage::GetInstance()->GetDistributedBundleInfo(
cmd->dstDeviceId_, cmd->dstBundleName_, distributedBundleInfo)) {
HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s",
cmd->dstBundleName_.c_str());
return INVALID_PARAMETERS_ERR;
}
@ -409,7 +425,7 @@ int32_t DSchedContinue::PostContinueDataTask(std::shared_ptr<DSchedContinueDataC
for (const auto &abilityInfoElement: dmsAbilityInfos) {
std::vector<std::string> continueTypes = abilityInfoElement.continueType;
for (const auto &continueTypeElement: continueTypes) {
if (continueTypeElement == continueType) {
if (continueTypeElement == cmd->continueType_) {
if (continueTypeElement == abilityInfoElement.abilityName &&
moduleName == abilityInfoElement.moduleName) {
sameAbilityGot = true;
@ -431,28 +447,15 @@ int32_t DSchedContinue::PostContinueDataTask(std::shared_ptr<DSchedContinueDataC
break;
}
}
if (result.empty()) {
HILOGE("PostContinueDataTask can not found bundle info for bundle name: %{public}s",
HILOGE("UpdateElementInfo can not found bundle info for bundle name: %{public}s",
cmd->dstBundleName_.c_str());
return INVALID_PARAMETERS_ERR;
}
auto element = cmd->want_.GetElement();
cmd->want_.SetElementName(element.GetDeviceId(), element.GetBundleName(), element.GetAbilityName(),
result[0].moduleName);
HILOGI("PostContinueDataTask %{public}d, continueInfo %{public}s", eventType, continueInfo_.toString().c_str());
if (eventHandler_ == nullptr) {
HILOGE("PostContinueDataTask eventHandler is nullptr");
return INVALID_PARAMETERS_ERR;
}
auto msgEvent = AppExecFwk::InnerEvent::Get(eventType, cmd, 0);
if (!eventHandler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) {
HILOGE("PostContinueDataTask eventHandler send event type %{public}d fail", eventType);
return CONTINUE_SEND_EVENT_FAILED;
}
DmsAbilityInfo finalAbility = result[0];
cmd->want_.SetElementName(element.GetDeviceID(), cmd->dstBundleName_, finalAbility.abilityName,
finalAbility.moduleName);
return ERR_OK;
}

2
services/dtbschedmgr/src/mission/distributed_bm_storage.cpp
View File

@ -453,7 +453,7 @@ bool DmsBmStorage::GetDistributedBundleInfo(const std::string &networkId,
return true;
}
bool GetDistributedBundleInfo(const std::string &networkId, const std::string &bundleName,
bool DmsBmStorage::GetDistributedBundleInfo(const std::string &networkId, const std::string &bundleName,
DmsBundleInfo &distributeBundleInfo){
HILOGD("networkId: %{public}s bundleNameId: %{public}s", GetAnonymStr(networkId).c_str(), bundleName.c_str());
if (!CheckKvStore()) {