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

!1153 BugFix: 使用distributedWant代替want进行传输

Browse Source 
Merge pull request !1153 from zhx/master
This commit is contained in:
openharmony_ci 2024-11-04 03:46:28 +00:00 committed by Gitee
commit 193a4509ec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/dtbschedmgr/include/continue/dsched_continue_event.h
View File

@ -91,9 +91,10 @@ private:
int32_t MarshalCallerInfo(std::string &jsonStr);
int32_t MarshalAccountInfo(std::string &jsonStr);
int32_t UnmarshalParcel(const std::string &jsonStr);
int32_t UnmarshalCallerInfo(std::string &jsonStr);
int32_t UnmarshalCallerInfoExtra(std::string &jsonStr);
int32_t UnmarshalAccountInfo(std::string &jsonStr);
int32_t UnmarshalWantStr(const std::string &jsonStr);
int32_t UnmarshalCallerInfo(const std::string &jsonStr);
int32_t UnmarshalCallerInfoExtra(const std::string &jsonStr);
int32_t UnmarshalAccountInfo(const std::string &jsonStr);
public:
using AccountInfo = IDistributedSched::AccountInfo;

52
services/dtbschedmgr/src/continue/dsched_continue_event.cpp
View File

@ -18,6 +18,7 @@
#include "cJSON.h"
#include "parcel.h"
#include "distributedWant/distributed_want.h"
#include "distributed_sched_utils.h"
#include "dms_constant.h"
#include "dtbschedmgr_log.h"
@ -220,8 +221,9 @@ int32_t DSchedContinueDataCmd::Marshal(std::string &jsonStr)
cJSON_AddStringToObject(rootValue, "BaseCmd", baseJsonStr.c_str());
DistributedWant dtbWant(want_);
Parcel wantParcel;
if (!want_.Marshalling(wantParcel)) {
if (!dtbWant.Marshalling(wantParcel)) {
cJSON_Delete(rootValue);
return INVALID_PARAMETERS_ERR;
}
@ -418,20 +420,11 @@ int32_t DSchedContinueDataCmd::UnmarshalParcel(const std::string &jsonStr)
HILOGE("Want term is null or not string.");
return INVALID_PARAMETERS_ERR;
}
Parcel wantParcel;
int32_t ret = Base64StrToParcel(wantStr->valuestring, wantParcel);
if (ret != ERR_OK) {
if (UnmarshalWantStr(wantStr->valuestring) != ERR_OK) {
cJSON_Delete(rootValue);
HILOGE("Want parcel Base64Str unmarshal fail, ret %{public}d.", ret);
HILOGE("UnmarshalWantStr failed!");
return INVALID_PARAMETERS_ERR;
}
auto wantPtr = AAFwk::Want::Unmarshalling(wantParcel);
if (wantPtr == nullptr) {
cJSON_Delete(rootValue);
HILOGE("AAFwk Want unmarshalling fail, check return null.");
return INVALID_PARAMETERS_ERR;
}
want_ = *wantPtr;
};
cJSON *abilityInfoStr = cJSON_GetObjectItemCaseSensitive(rootValue, "AbilityInfo");
if (abilityInfoStr == nullptr || !cJSON_IsString(abilityInfoStr) || (abilityInfoStr->valuestring == nullptr)) {
@ -440,7 +433,7 @@ int32_t DSchedContinueDataCmd::UnmarshalParcel(const std::string &jsonStr)
return INVALID_PARAMETERS_ERR;
}
Parcel abilityParcel;
ret = Base64StrToParcel(abilityInfoStr->valuestring, abilityParcel);
int32_t ret = Base64StrToParcel(abilityInfoStr->valuestring, abilityParcel);
if (ret != ERR_OK) {
cJSON_Delete(rootValue);
HILOGE("AbilityInfo parcel Base64Str unmarshal fail, ret %{public}d.", ret);
@ -458,7 +451,32 @@ int32_t DSchedContinueDataCmd::UnmarshalParcel(const std::string &jsonStr)
return ERR_OK;
}
int32_t DSchedContinueDataCmd::UnmarshalCallerInfo(std::string &jsonStr)
int32_t DSchedContinueDataCmd::UnmarshalWantStr(const std::string &jsonStr)
{
Parcel wantParcel;
int32_t ret = Base64StrToParcel(jsonStr, wantParcel);
if (ret != ERR_OK) {
HILOGE("Want parcel Base64Str unmarshal fail, ret %{public}d.", ret);
return INVALID_PARAMETERS_ERR;
}
auto dtbWantPtr = DistributedWant::Unmarshalling(wantParcel);
if (dtbWantPtr == nullptr) {
HILOGE("Distributed want unmarshalling fail, check return null.");
return INVALID_PARAMETERS_ERR;
}
DistributedWant dtbWant = *dtbWantPtr;
auto wantPtr = dtbWant.ToWant();
if (wantPtr == nullptr) {
HILOGE("Convert distributedWant to want failed.");
return INVALID_PARAMETERS_ERR;
}
want_ = *wantPtr;
return ERR_OK;
}
int32_t DSchedContinueDataCmd::UnmarshalCallerInfo(const std::string &jsonStr)
{
cJSON *rootValue = cJSON_Parse(jsonStr.c_str());
if (rootValue == nullptr) {
@ -510,7 +528,7 @@ int32_t DSchedContinueDataCmd::UnmarshalCallerInfo(std::string &jsonStr)
return ERR_OK;
}
int32_t DSchedContinueDataCmd::UnmarshalCallerInfoExtra(std::string &jsonStr)
int32_t DSchedContinueDataCmd::UnmarshalCallerInfoExtra(const std::string &jsonStr)
{
cJSON *rootValue = cJSON_Parse(jsonStr.c_str());
if (rootValue == nullptr) {
@ -558,7 +576,7 @@ int32_t DSchedContinueDataCmd::UnmarshalCallerInfoExtra(std::string &jsonStr)
return ERR_OK;
}
int32_t DSchedContinueDataCmd::UnmarshalAccountInfo(std::string &jsonStr)
int32_t DSchedContinueDataCmd::UnmarshalAccountInfo(const std::string &jsonStr)
{
cJSON *rootValue = cJSON_Parse(jsonStr.c_str());
if (rootValue == nullptr) {

24
services/dtbschedmgr/test/unittest/continue/dsched_continue_event_test.cpp
View File

@ -15,6 +15,8 @@
#include "dsched_continue_event_test.h"
#include "distributedWant/distributed_want.h"
#include "distributed_sched_utils.h"
#include "dsched_continue_event.h"
#include "dtbschedmgr_log.h"
#include "test_log.h"
@ -216,5 +218,27 @@ HWTEST_F(DSchedContinueEventTest, DSchedContinueEventTest_005_1, TestSize.Level0
EXPECT_EQ(ret, ERR_OK);
DTEST_LOG << "DSchedContinueEventTest DSchedContinueEventTest_005_1 end ret:" << ret << std::endl;
}
/**
* @tc.name: DSchedContinueEventTest_006_1
* @tc.desc: Test UnmarshalWantStr
* @tc.type: FUNC
*/
HWTEST_F(DSchedContinueEventTest, DSchedContinueEventTest_006_1, TestSize.Level0)
{
DTEST_LOG << "DSchedContinueEventTest DSchedContinueEventTest_006_1 begin" << std::endl;
DistributedWant dtbWant;
Parcel wantParcel;
ASSERT_EQ(dtbWant.Marshalling(wantParcel), true);
std::string wantStr = ParcelToBase64Str(wantParcel);
DSchedContinueDataCmd cmd;
int32_t ret = cmd.UnmarshalWantStr(wantStr);
EXPECT_EQ(ret, ERR_OK);
ret = cmd.UnmarshalWantStr("");
EXPECT_EQ(ret, INVALID_PARAMETERS_ERR);
DTEST_LOG << "DSchedContinueEventTest DSchedContinueEventTest_006_1 end ret:" << ret << std::endl;
}
}
}