From b5717fcb1eba6aa756821bcd11b265bf8bc20a6c Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 9 Mar 2022 17:11:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- frameworks/native/sensor/include/i_sensor_service.h | 5 +++-- .../native/sensor/include/my_file_descriptor_listener.h | 1 + frameworks/native/sensor/include/sensor_agent_proxy.h | 1 + frameworks/native/sensor/include/sensor_client_proxy.h | 5 +++-- frameworks/native/sensor/include/sensor_client_stub.h | 3 ++- frameworks/native/sensor/include/sensor_data_channel.h | 1 + frameworks/native/sensor/include/sensor_service_client.h | 9 ++++++--- frameworks/native/sensor/include/sensor_service_proxy.h | 3 ++- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/frameworks/native/sensor/include/i_sensor_service.h b/frameworks/native/sensor/include/i_sensor_service.h index 4c210e08..0cf519a5 100755 --- a/frameworks/native/sensor/include/i_sensor_service.h +++ b/frameworks/native/sensor/include/i_sensor_service.h @@ -19,10 +19,11 @@ #include #include "errors.h" -#include "i_sensor_client.h" #include "iremote_broker.h" -#include "sensor.h" + +#include "i_sensor_client.h" #include "sensor_basic_data_channel.h" +#include "sensor.h" namespace OHOS { namespace Sensors { diff --git a/frameworks/native/sensor/include/my_file_descriptor_listener.h b/frameworks/native/sensor/include/my_file_descriptor_listener.h index a2a5ff7a..2267028f 100755 --- a/frameworks/native/sensor/include/my_file_descriptor_listener.h +++ b/frameworks/native/sensor/include/my_file_descriptor_listener.h @@ -23,6 +23,7 @@ #include "event_handler.h" #include "event_runner.h" #include "file_descriptor_listener.h" + #include "sensor_agent_type.h" #include "sensor_data_channel.h" diff --git a/frameworks/native/sensor/include/sensor_agent_proxy.h b/frameworks/native/sensor/include/sensor_agent_proxy.h index f3795ce6..cb69dd6d 100644 --- a/frameworks/native/sensor/include/sensor_agent_proxy.h +++ b/frameworks/native/sensor/include/sensor_agent_proxy.h @@ -20,6 +20,7 @@ #include #include "refbase.h" + #include "sensor_agent_type.h" #include "sensor_data_channel.h" diff --git a/frameworks/native/sensor/include/sensor_client_proxy.h b/frameworks/native/sensor/include/sensor_client_proxy.h index 006c28c3..57424f67 100755 --- a/frameworks/native/sensor/include/sensor_client_proxy.h +++ b/frameworks/native/sensor/include/sensor_client_proxy.h @@ -16,11 +16,12 @@ #ifndef SENSOR_CLIENT_PROXY_H #define SENSOR_CLIENT_PROXY_H -#include "i_sensor_client.h" #include "iremote_proxy.h" -#include "sensor_agent_type.h" #include "nocopyable.h" +#include "i_sensor_client.h" +#include "sensor_agent_type.h" + namespace OHOS { namespace Sensors { class SensorClientProxy : public IRemoteProxy { diff --git a/frameworks/native/sensor/include/sensor_client_stub.h b/frameworks/native/sensor/include/sensor_client_stub.h index 39e749d9..f3047157 100755 --- a/frameworks/native/sensor/include/sensor_client_stub.h +++ b/frameworks/native/sensor/include/sensor_client_stub.h @@ -16,10 +16,11 @@ #ifndef SENSOR_CLIENT_STUB_H #define SENSOR_CLIENT_STUB_H -#include "i_sensor_client.h" #include "iremote_stub.h" #include "message_parcel.h" +#include "i_sensor_client.h" + namespace OHOS { namespace Sensors { class SensorClientStub : public IRemoteStub { diff --git a/frameworks/native/sensor/include/sensor_data_channel.h b/frameworks/native/sensor/include/sensor_data_channel.h index 2902f914..782c68b4 100755 --- a/frameworks/native/sensor/include/sensor_data_channel.h +++ b/frameworks/native/sensor/include/sensor_data_channel.h @@ -18,6 +18,7 @@ #include #include + #include "sensor_basic_data_channel.h" #include "sensor_agent_type.h" #include "my_event_handler.h" diff --git a/frameworks/native/sensor/include/sensor_service_client.h b/frameworks/native/sensor/include/sensor_service_client.h index 304f6637..57a07166 100755 --- a/frameworks/native/sensor/include/sensor_service_client.h +++ b/frameworks/native/sensor/include/sensor_service_client.h @@ -18,15 +18,18 @@ #include #include + #include "iservice_registry.h" -#include "sensor.h" +#include "singleton.h" + +#include "sensor_agent_type.h" #include "sensor_basic_data_channel.h" #include "sensor_basic_info.h" #include "sensor_client_stub.h" #include "sensor_data_channel.h" +#include "sensor.h" #include "sensor_service_proxy.h" -#include "singleton.h" -#include "sensor_agent_type.h" + namespace OHOS { namespace Sensors { diff --git a/frameworks/native/sensor/include/sensor_service_proxy.h b/frameworks/native/sensor/include/sensor_service_proxy.h index a694ca2d..2894fbc8 100755 --- a/frameworks/native/sensor/include/sensor_service_proxy.h +++ b/frameworks/native/sensor/include/sensor_service_proxy.h @@ -17,10 +17,11 @@ #define SENSOR_SERVICE_PROXY_H #include "errors.h" -#include "i_sensor_service.h" #include "iremote_proxy.h" #include "nocopyable.h" + #include "sensor_agent_type.h" +#include "i_sensor_service.h" namespace OHOS { namespace Sensors { -- Gitee From 10c19e88f07ffeef8098a122c8c1a012c5f4d853 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Wed, 9 Mar 2022 17:39:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- frameworks/native/sensor/include/my_file_descriptor_listener.h | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/native/sensor/include/my_file_descriptor_listener.h b/frameworks/native/sensor/include/my_file_descriptor_listener.h index 2267028f..36b35e93 100755 --- a/frameworks/native/sensor/include/my_file_descriptor_listener.h +++ b/frameworks/native/sensor/include/my_file_descriptor_listener.h @@ -17,6 +17,7 @@ #define MY_FILE_DESCRIPTOR_LISTENER_H #include + #include #include -- Gitee