From aeb145b229588811550518de1c67079a23ff85e5 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Thu, 10 Mar 2022 17:53:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- interfaces/native/include/geomagnetic_field.h | 4 +++- interfaces/plugin/include/sensor_napi_utils.h | 6 ++++-- services/sensor/include/client_info.h | 3 ++- services/sensor/include/fifo_cache_data.h | 4 ++-- services/sensor/include/flush_info_record.h | 10 ++++++---- services/sensor/include/sensor_data_processer.h | 3 ++- services/sensor/include/sensor_dump.h | 3 ++- services/sensor/include/sensor_service.h | 6 ++++-- services/sensor/include/sensor_service_proxy.h | 3 ++- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/interfaces/native/include/geomagnetic_field.h b/interfaces/native/include/geomagnetic_field.h index d58584bd..00409d82 100755 --- a/interfaces/native/include/geomagnetic_field.h +++ b/interfaces/native/include/geomagnetic_field.h @@ -17,12 +17,14 @@ #define GEOMAGNETIC_FIELD_H #include -#include #include #include + #include +#include #include #include + #include "iostream" class GeomagneticField { diff --git a/interfaces/plugin/include/sensor_napi_utils.h b/interfaces/plugin/include/sensor_napi_utils.h index ecc8ad7f..c2f84e52 100644 --- a/interfaces/plugin/include/sensor_napi_utils.h +++ b/interfaces/plugin/include/sensor_napi_utils.h @@ -15,11 +15,13 @@ #ifndef SENSOR_NAPI_UTILS_H #define SENSOR_NAPI_UTILS_H +#include +#include + #include "napi/native_api.h" #include "napi/native_node_api.h" -#include + #include "sensor_agent.h" -#include using std::vector; using std::string; diff --git a/services/sensor/include/client_info.h b/services/sensor/include/client_info.h index ef42b728..61fee175 100644 --- a/services/sensor/include/client_info.h +++ b/services/sensor/include/client_info.h @@ -25,9 +25,10 @@ #include "singleton.h" #include "accesstoken_kit.h" -#include "app_thread_info.h" #include "iremote_object.h" #include "nocopyable.h" + +#include "app_thread_info.h" #include "sensor_basic_data_channel.h" #include "sensor_basic_info.h" #include "sensor_channel_info.h" diff --git a/services/sensor/include/fifo_cache_data.h b/services/sensor/include/fifo_cache_data.h index 89e4b5eb..22d25798 100755 --- a/services/sensor/include/fifo_cache_data.h +++ b/services/sensor/include/fifo_cache_data.h @@ -19,11 +19,11 @@ #include #include "refbase.h" +#include "nocopyable.h" + #include "sensor_agent_type.h" #include "sensor_basic_data_channel.h" -#include "nocopyable.h" - namespace OHOS { namespace Sensors { class FifoCacheData : public RefBase { diff --git a/services/sensor/include/flush_info_record.h b/services/sensor/include/flush_info_record.h index 2b074c00..ea69b461 100644 --- a/services/sensor/include/flush_info_record.h +++ b/services/sensor/include/flush_info_record.h @@ -20,14 +20,16 @@ #include #include -#include "client_info.h" #include "refbase.h" -#include "sensor_basic_data_channel.h" -#include "sensor_hdi_connection.h" -#include "sensors_errors.h" + #include "singleton.h" #include "nocopyable.h" + +#include "client_info.h" #include "sensor_agent_type.h" +#include "sensor_basic_data_channel.h" +#include "sensors_errors.h" +#include "sensor_hdi_connection.h" namespace OHOS { namespace Sensors { diff --git a/services/sensor/include/sensor_data_processer.h b/services/sensor/include/sensor_data_processer.h index a4daddff..40816c74 100644 --- a/services/sensor/include/sensor_data_processer.h +++ b/services/sensor/include/sensor_data_processer.h @@ -21,10 +21,11 @@ #include "refbase.h" +#include "nocopyable.h" + #include "client_info.h" #include "fifo_cache_data.h" #include "flush_info_record.h" -#include "nocopyable.h" #include "report_data_callback.h" #include "sensor.h" #include "sensors_log_domain.h" diff --git a/services/sensor/include/sensor_dump.h b/services/sensor/include/sensor_dump.h index bdce9041..310a21bf 100755 --- a/services/sensor/include/sensor_dump.h +++ b/services/sensor/include/sensor_dump.h @@ -20,9 +20,10 @@ #include "singleton.h" +#include "nocopyable.h" + #include "client_info.h" #include "sensor.h" -#include "nocopyable.h" #include "sensor_agent_type.h" namespace OHOS { diff --git a/services/sensor/include/sensor_service.h b/services/sensor/include/sensor_service.h index a6be0bd2..95b0f40a 100644 --- a/services/sensor/include/sensor_service.h +++ b/services/sensor/include/sensor_service.h @@ -20,14 +20,16 @@ #include #include + +#include "nocopyable.h" +#include "system_ability.h" + #include "client_info.h" #include "death_recipient_template.h" -#include "nocopyable.h" #include "sensor_agent_type.h" #include "sensor_hdi_connection.h" #include "sensor_manager.h" #include "sensor_service_stub.h" -#include "system_ability.h" namespace OHOS { namespace Sensors { diff --git a/services/sensor/include/sensor_service_proxy.h b/services/sensor/include/sensor_service_proxy.h index a694ca2d..8c69e6f4 100755 --- a/services/sensor/include/sensor_service_proxy.h +++ b/services/sensor/include/sensor_service_proxy.h @@ -17,9 +17,10 @@ #define SENSOR_SERVICE_PROXY_H #include "errors.h" -#include "i_sensor_service.h" #include "iremote_proxy.h" #include "nocopyable.h" + +#include "i_sensor_service.h" #include "sensor_agent_type.h" namespace OHOS { -- Gitee From e34d9c74826a98fde975efd2d6dae8b388fa1f6a Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Fri, 11 Mar 2022 09:23:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- interfaces/native/include/geomagnetic_field.h | 9 ++++----- interfaces/native/include/sensor_algorithm.h | 2 +- interfaces/plugin/include/sensor_napi_utils.h | 2 +- services/sensor/include/flush_info_record.h | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/interfaces/native/include/geomagnetic_field.h b/interfaces/native/include/geomagnetic_field.h index 00409d82..fbd10bf1 100755 --- a/interfaces/native/include/geomagnetic_field.h +++ b/interfaces/native/include/geomagnetic_field.h @@ -16,16 +16,15 @@ #ifndef GEOMAGNETIC_FIELD_H #define GEOMAGNETIC_FIELD_H -#include -#include -#include - #include #include #include +#include #include -#include "iostream" +#include +#include +#include class GeomagneticField { public: diff --git a/interfaces/native/include/sensor_algorithm.h b/interfaces/native/include/sensor_algorithm.h index 3a2955bc..4dd157f0 100644 --- a/interfaces/native/include/sensor_algorithm.h +++ b/interfaces/native/include/sensor_algorithm.h @@ -16,7 +16,7 @@ #ifndef SENSOR_ALGORITHM_H #define SENSOR_ALGORITHM_H -#include +#include #include class SensorAlgorithm { diff --git a/interfaces/plugin/include/sensor_napi_utils.h b/interfaces/plugin/include/sensor_napi_utils.h index c2f84e52..f585c2b6 100644 --- a/interfaces/plugin/include/sensor_napi_utils.h +++ b/interfaces/plugin/include/sensor_napi_utils.h @@ -15,8 +15,8 @@ #ifndef SENSOR_NAPI_UTILS_H #define SENSOR_NAPI_UTILS_H -#include #include +#include #include "napi/native_api.h" #include "napi/native_node_api.h" diff --git a/services/sensor/include/flush_info_record.h b/services/sensor/include/flush_info_record.h index ea69b461..eb26b745 100644 --- a/services/sensor/include/flush_info_record.h +++ b/services/sensor/include/flush_info_record.h @@ -20,10 +20,9 @@ #include #include +#include "nocopyable.h" #include "refbase.h" - #include "singleton.h" -#include "nocopyable.h" #include "client_info.h" #include "sensor_agent_type.h" -- Gitee