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

header files order

Browse Source 
Signed-off-by: xinking129 <xinxin13@huawei.com>
This commit is contained in:
xinking129 2023-05-11 14:57:44 +08:00
parent ef17cba5e9
commit 99bc820034
8 changed files with 24 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/dtbschedmgr/include/distributedWant/distributed_operation_builder.h
View File

@ -16,9 +16,9 @@
#ifndef OHOS_ABILITY_BASE_DISTRIBUTED_OPERATION_BUILDER_H
#define OHOS_ABILITY_BASE_DISTRIBUTED_OPERATION_BUILDER_H
#include <memory>
#include <string>
#include <vector>
#include <memory>
#include "uri.h"

2
services/dtbschedmgr/include/distributedWant/distributed_want.h
View File

@ -16,9 +16,9 @@
#ifndef OHOS_AAFWK_DISTRIBUTED_WANT_H
#define OHOS_AAFWK_DISTRIBUTED_WANT_H
#include <algorithm>
#include <string>
#include <vector>
#include <algorithm>
#include "distributedWant/distributed_operation.h"
#include "distributedWant/distributed_want_params.h"

3
services/dtbschedmgr/include/distributedWant/distributed_want_params.h
View File

@ -22,6 +22,7 @@
#include "base_interfaces.h"
#include "parcel.h"
#include "refbase.h"
#include "want_params.h"
namespace OHOS {
namespace AAFwk {
@ -82,6 +83,8 @@ public:
void DumpInfo(int level) const;
WantParams ToWantParams();
private:
enum {
VALUE_TYPE_NULL = -1,

2
services/dtbschedmgr/src/distributedWant/distributed_operation.cpp
View File

@ -13,9 +13,9 @@
* limitations under the License.
*/
#include "parcel_macro_base.h"
#include "distributedWant/distributed_operation.h"
#include "distributedWant/distributed_operation_builder.h"
#include "parcel_macro_base.h"
using namespace OHOS::AppExecFwk;
namespace OHOS {

2
services/dtbschedmgr/src/distributedWant/distributed_operation_builder.cpp
View File

@ -13,8 +13,8 @@
* limitations under the License.
*/
#include "distributedWant/distributed_operation_builder.h"
#include "distributedWant/distributed_operation.h"
#include "distributedWant/distributed_operation_builder.h"
namespace OHOS {
namespace AAFwk {

71
services/dtbschedmgr/src/distributedWant/distributed_want.cpp
View File

@ -13,8 +13,6 @@
* limitations under the License.
*/
#include "distributedWant/distributed_want.h"
#include <algorithm>
#include <climits>
#include <cstdlib>
@ -25,6 +23,9 @@
#include "base_object.h"
#include "bool_wrapper.h"
#include "byte_wrapper.h"
#include "distributedWant/distributed_operation_builder.h"
#include "distributedWant/distributed_want.h"
#include "distributedWant/distributed_want_params_wrapper.h"
#include "double_wrapper.h"
#include "float_wrapper.h"
#include "int_wrapper.h"
@ -35,9 +36,6 @@
#include "string_wrapper.h"
#include "zchar_wrapper.h"
#include "distributedWant/distributed_operation_builder.h"
#include "distributedWant/distributed_want_params_wrapper.h"
using namespace OHOS::AppExecFwk;
using OHOS::AppExecFwk::ElementName;
@ -138,67 +136,6 @@ DistributedWant::DistributedWant(const Want& want)
}
}
void DistributedWant::SetParameters(std::shared_ptr<Want>& want, DistributedWantParams& params) {
std::map<std::string, sptr<IInterface>> data = params.GetParams();
for (auto it = data.begin(); it != data.end(); it++) {
auto tp = DistributedWantParams::GetDataType(it->second);
if (tp == DistributedWantParams::VALUE_TYPE_BOOLEAN) {
want->SetParam(it->first, GetBoolParam(it->first, false));
} else if (tp == DistributedWantParams::VALUE_TYPE_BYTE) {
want->SetParam(it->first, GetByteParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_CHAR) {
want->SetParam(it->first, GetCharParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_SHORT) {
want->SetParam(it->first, GetShortParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_INT) {
want->SetParam(it->first, GetIntParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_LONG) {
want->SetParam(it->first, GetLongParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_FLOAT) {
want->SetParam(it->first, GetFloatParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_DOUBLE) {
want->SetParam(it->first, GetDoubleParam(it->first, 0));
} else if (tp == DistributedWantParams::VALUE_TYPE_STRING) {
want->SetParam(it->first, GetStringParam(it->first));
} else if (tp == DistributedWantParams::VALUE_TYPE_ARRAY) {
IArray* ao = IArray::Query(it->second);
if (Array::IsBooleanArray(ao)) {
want->SetParam(it->first, GetBoolArrayParam(it->first));
} else if (Array::IsCharArray(ao)) {
want->SetParam(it->first, GetCharArrayParam(it->first));
} else if (Array::IsByteArray(ao)) {
want->SetParam(it->first, GetByteArrayParam(it->first));
} else if (Array::IsShortArray(ao)) {
want->SetParam(it->first, GetShortArrayParam(it->first));
} else if (Array::IsIntegerArray(ao)) {
want->SetParam(it->first, GetIntArrayParam(it->first));
} else if (Array::IsLongArray(ao)) {
want->SetParam(it->first, GetLongArrayParam(it->first));
} else if (Array::IsFloatArray(ao)) {
want->SetParam(it->first, GetFloatArrayParam(it->first));
} else if (Array::IsDoubleArray(ao)) {
want->SetParam(it->first, GetDoubleArrayParam(it->first));
} else if (Array::IsStringArray(ao)) {
want->SetParam(it->first, GetStringArrayParam(it->first));
} else if (Array::IsWantParamsArray(ao)) {
auto func = [&](AAFwk::IInterface* object) {
if (object != nullptr) {
auto* value = IDistributedWantParams::Query(object);
if (value != nullptr) {
auto param = DistributedWantParamWrapper::Unbox(value);
SetParameters(want, param);
}
}
};
Array::ForEach(ao, func);
}
} else if (tp == DistributedWantParams::VALUE_TYPE_WANTPARAMS) {
auto param = DistributedWantParamWrapper::Unbox(IDistributedWantParams::Query(it->second));
SetParameters(want, param);
}
}
}
std::shared_ptr<Want> DistributedWant::ToWant() {
auto want = std::make_shared<Want>();
want->SetFlags(GetFlags());
@ -211,7 +148,7 @@ std::shared_ptr<Want> DistributedWant::ToWant() {
for (auto it = ents.begin(); it != ents.end(); it++) {
want->AddEntity(*it);
}
SetParameters(want, parameters_);
want->SetParams(parameters_.ToWantParams());
return want;
}

14
services/dtbschedmgr/src/distributedWant/distributed_want_params.cpp
View File

@ -13,14 +13,13 @@
* limitations under the License.
*/
#include "distributedWant/distributed_want_params.h"
#include "ability_base_log_wrapper.h"
#include "array_wrapper.h"
#include "base_interfaces.h"
#include "base_object.h"
#include "bool_wrapper.h"
#include "byte_wrapper.h"
#include "distributedWant/distributed_want_params.h"
#include "distributedWant/distributed_want_params_wrapper.h"
#include "double_wrapper.h"
#include "float_wrapper.h"
@ -1360,5 +1359,16 @@ void DistributedWantParams::DumpInfo(int level) const
}
ABILITYBASE_LOGI("=======DistributedWantParams::DumpInfo level: %{public}d end=============", level);
}
WantParams DistributedWantParams::ToWantParams() {
ABILITYBASE_LOGI("ToWantParams called.");
WantParams wantParams;
std::map<std::string, sptr<IInterface>> data = GetParams();
for (auto it = data.begin(); it != data.end(); it++) {
wantParams.SetParam(it->first, it->second);
}
ABILITYBASE_LOGI("ToWantParams new wantParams size: %{public}zu", params_.size());
return wantParams;
}
} // namespace AAFwk
} // namespace OHOS

2
services/dtbschedmgr/src/distributedWant/distributed_want_params_wrapper.cpp
View File

@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "distributedWant/distributed_want_params_wrapper.h"
#include <algorithm>
#include "distributedWant/distributed_want_params_wrapper.h"
namespace OHOS {
namespace AAFwk {