From 2c6f8ea657c15f8db8af8aa806bc7e0d9b7f8bb3 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Tue, 28 Nov 2023 10:41:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- frameworks/native/include/fd_listener.h | 2 +- frameworks/native/include/i_sensor_client.h | 2 +- frameworks/native/include/i_sensor_service.h | 2 +- frameworks/native/include/sensor_agent_proxy.h | 2 +- frameworks/native/include/sensor_client_proxy.h | 2 +- frameworks/native/include/sensor_client_stub.h | 2 +- frameworks/native/include/sensor_data_channel.h | 2 +- frameworks/native/include/sensor_event_handler.h | 2 +- frameworks/native/include/sensor_file_descriptor_listener.h | 2 +- frameworks/native/include/sensor_service_client.h | 2 +- frameworks/native/include/sensor_service_proxy.h | 2 +- frameworks/native/include/sensors_ipc_interface_code.h | 2 +- .../hdi_connection/adapter/include/compatible_connection.h | 2 +- services/hdi_connection/adapter/include/hdi_connection.h | 2 +- services/hdi_connection/hardware/include/hdi_service_impl.h | 2 +- .../interface/include/i_sensor_hdi_connection.h | 2 +- .../interface/include/sensor_hdi_connection.h | 2 +- services/include/client_info.h | 2 +- services/include/fifo_cache_data.h | 2 +- services/include/flush_info_record.h | 2 +- services/include/sensor_data_processer.h | 2 +- services/include/sensor_dump.h | 2 +- services/include/sensor_manager.h | 2 +- services/include/sensor_service.h | 2 +- services/include/sensor_service_proxy.h | 2 +- services/include/sensor_service_stub.h | 2 +- services/include/stream_server.h | 2 +- test/unittest/interfaces/js/sensor/ExampleJsunit.test.js | 6 +++--- utils/common/include/active_info.h | 2 +- utils/common/include/app_thread_info.h | 2 +- utils/common/include/death_recipient_template.h | 2 +- utils/common/include/permission_util.h | 2 +- utils/common/include/report_data_callback.h | 4 ++-- utils/common/include/sensor.h | 2 +- utils/common/include/sensor_basic_data_channel.h | 2 +- utils/common/include/sensor_basic_info.h | 2 +- utils/common/include/sensor_channel_info.h | 2 +- utils/common/include/sensor_data_event.h | 2 +- utils/common/include/sensor_delayed_sp_singleton.h | 2 +- utils/common/include/sensor_errors.h | 4 ++-- utils/common/include/sensor_utils.h | 2 +- utils/ipc/include/circle_stream_buffer.h | 2 +- utils/ipc/include/net_packet.h | 2 +- utils/ipc/include/proto.h | 2 +- utils/ipc/include/stream_buffer.h | 2 +- utils/ipc/src/stream_socket.cpp | 2 +- .../core/algorithm/conversion/include/conversion_filter.h | 2 +- .../core/algorithm/conversion/include/conversion_mfcc.h | 2 +- vibration_convert/core/algorithm/conversion/include/fft.h | 2 +- .../frequency_estimation/include/frequency_estimation.h | 2 +- .../core/algorithm/peak_finder/include/peak_finder.h | 2 +- vibration_convert/core/native/include/audio_parsing.h | 2 +- .../core/native/include/generate_vibration_json_file.h | 2 +- .../core/native/include/vibration_convert_core.h | 2 +- .../core/native/include/vibration_convert_type.h | 2 +- vibration_convert/core/native/test/unittest/data.h | 2 +- vibration_convert/core/utils/include/utils.h | 4 ++-- 57 files changed, 62 insertions(+), 62 deletions(-) diff --git a/frameworks/native/include/fd_listener.h b/frameworks/native/include/fd_listener.h index e8e2ad85..a3d97b54 100644 --- a/frameworks/native/include/fd_listener.h +++ b/frameworks/native/include/fd_listener.h @@ -37,4 +37,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // FD_LISTENER_H +#endif // FD_LISTENER_H diff --git a/frameworks/native/include/i_sensor_client.h b/frameworks/native/include/i_sensor_client.h index 2486a862..44553870 100755 --- a/frameworks/native/include/i_sensor_client.h +++ b/frameworks/native/include/i_sensor_client.h @@ -28,4 +28,4 @@ public: }; } // namespace Sensors } // namespace OHOS -#endif // I_SENSOR_CLIENT_H +#endif // I_SENSOR_CLIENT_H diff --git a/frameworks/native/include/i_sensor_service.h b/frameworks/native/include/i_sensor_service.h index 5b89bc66..7ee56812 100755 --- a/frameworks/native/include/i_sensor_service.h +++ b/frameworks/native/include/i_sensor_service.h @@ -52,4 +52,4 @@ public: }; } // namespace Sensors } // namespace OHOS -#endif // I_SENSOR_SERVICE_H +#endif // I_SENSOR_SERVICE_H diff --git a/frameworks/native/include/sensor_agent_proxy.h b/frameworks/native/include/sensor_agent_proxy.h index 912f7141..6f878079 100644 --- a/frameworks/native/include/sensor_agent_proxy.h +++ b/frameworks/native/include/sensor_agent_proxy.h @@ -68,4 +68,4 @@ private: #define SENSOR_AGENT_IMPL OHOS::DelayedSingleton::GetInstance() } // namespace Sensors } // namespace OHOS -#endif // endif SENSOR_PROXY_H +#endif // endif SENSOR_PROXY_H \ No newline at end of file diff --git a/frameworks/native/include/sensor_client_proxy.h b/frameworks/native/include/sensor_client_proxy.h index eb0b75a3..6b895937 100755 --- a/frameworks/native/include/sensor_client_proxy.h +++ b/frameworks/native/include/sensor_client_proxy.h @@ -36,4 +36,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_CLIENT_PROXY_H +#endif // SENSOR_CLIENT_PROXY_H diff --git a/frameworks/native/include/sensor_client_stub.h b/frameworks/native/include/sensor_client_stub.h index ab2db5b3..2ed785d5 100755 --- a/frameworks/native/include/sensor_client_stub.h +++ b/frameworks/native/include/sensor_client_stub.h @@ -32,4 +32,4 @@ public: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_CLIENT_STUB_H +#endif // SENSOR_CLIENT_STUB_H diff --git a/frameworks/native/include/sensor_data_channel.h b/frameworks/native/include/sensor_data_channel.h index ca2712d8..ee32f464 100644 --- a/frameworks/native/include/sensor_data_channel.h +++ b/frameworks/native/include/sensor_data_channel.h @@ -54,4 +54,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_DATA_CHANNEL_H +#endif // SENSOR_DATA_CHANNEL_H diff --git a/frameworks/native/include/sensor_event_handler.h b/frameworks/native/include/sensor_event_handler.h index b1b2e8cb..1798f5fa 100755 --- a/frameworks/native/include/sensor_event_handler.h +++ b/frameworks/native/include/sensor_event_handler.h @@ -33,4 +33,4 @@ public: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_EVENT_HANDLER_H \ No newline at end of file +#endif // SENSOR_EVENT_HANDLER_H \ No newline at end of file diff --git a/frameworks/native/include/sensor_file_descriptor_listener.h b/frameworks/native/include/sensor_file_descriptor_listener.h index aec4ac3b..91a80a0c 100644 --- a/frameworks/native/include/sensor_file_descriptor_listener.h +++ b/frameworks/native/include/sensor_file_descriptor_listener.h @@ -38,4 +38,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_FILE_DESCRIPTOR_LISTENER_H +#endif // SENSOR_FILE_DESCRIPTOR_LISTENER_H diff --git a/frameworks/native/include/sensor_service_client.h b/frameworks/native/include/sensor_service_client.h index ecc33883..47033cae 100755 --- a/frameworks/native/include/sensor_service_client.h +++ b/frameworks/native/include/sensor_service_client.h @@ -76,4 +76,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_SERVICE_CLIENT_H +#endif // SENSOR_SERVICE_CLIENT_H \ No newline at end of file diff --git a/frameworks/native/include/sensor_service_proxy.h b/frameworks/native/include/sensor_service_proxy.h index 174f7c62..6712df8f 100755 --- a/frameworks/native/include/sensor_service_proxy.h +++ b/frameworks/native/include/sensor_service_proxy.h @@ -50,4 +50,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_SERVICE_PROXY_H +#endif // SENSOR_SERVICE_PROXY_H diff --git a/frameworks/native/include/sensors_ipc_interface_code.h b/frameworks/native/include/sensors_ipc_interface_code.h index 70c1e4e7..1cbfc1e3 100644 --- a/frameworks/native/include/sensors_ipc_interface_code.h +++ b/frameworks/native/include/sensors_ipc_interface_code.h @@ -36,4 +36,4 @@ enum class SensorInterfaceCode { }; } // namespace Sensors } // namespace OHOS -#endif // SENSORS_IPC_INTERFACE_CODE_H +#endif // SENSORS_IPC_INTERFACE_CODE_H diff --git a/services/hdi_connection/adapter/include/compatible_connection.h b/services/hdi_connection/adapter/include/compatible_connection.h index 7790dd61..f720f51e 100644 --- a/services/hdi_connection/adapter/include/compatible_connection.h +++ b/services/hdi_connection/adapter/include/compatible_connection.h @@ -43,4 +43,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // COMPATIBLE_CONNECTION_H \ No newline at end of file +#endif // COMPATIBLE_CONNECTION_H \ No newline at end of file diff --git a/services/hdi_connection/adapter/include/hdi_connection.h b/services/hdi_connection/adapter/include/hdi_connection.h index b6c1b3ab..d895dd61 100644 --- a/services/hdi_connection/adapter/include/hdi_connection.h +++ b/services/hdi_connection/adapter/include/hdi_connection.h @@ -52,4 +52,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // HDI_CONNECTION_H \ No newline at end of file +#endif // HDI_CONNECTION_H \ No newline at end of file diff --git a/services/hdi_connection/hardware/include/hdi_service_impl.h b/services/hdi_connection/hardware/include/hdi_service_impl.h index 5bd18569..fee4b17b 100644 --- a/services/hdi_connection/hardware/include/hdi_service_impl.h +++ b/services/hdi_connection/hardware/include/hdi_service_impl.h @@ -53,4 +53,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // HDI_SERVICE_IMPL_H \ No newline at end of file +#endif // HDI_SERVICE_IMPL_H \ No newline at end of file diff --git a/services/hdi_connection/interface/include/i_sensor_hdi_connection.h b/services/hdi_connection/interface/include/i_sensor_hdi_connection.h index b598c70b..c9d9775e 100644 --- a/services/hdi_connection/interface/include/i_sensor_hdi_connection.h +++ b/services/hdi_connection/interface/include/i_sensor_hdi_connection.h @@ -43,4 +43,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // I_SENSOR_HDI_CONNECTION_H \ No newline at end of file +#endif // I_SENSOR_HDI_CONNECTION_H \ No newline at end of file diff --git a/services/hdi_connection/interface/include/sensor_hdi_connection.h b/services/hdi_connection/interface/include/sensor_hdi_connection.h index 838b814c..09a145b9 100644 --- a/services/hdi_connection/interface/include/sensor_hdi_connection.h +++ b/services/hdi_connection/interface/include/sensor_hdi_connection.h @@ -56,4 +56,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_HDI_CONNECTION_H \ No newline at end of file +#endif // SENSOR_HDI_CONNECTION_H \ No newline at end of file diff --git a/services/include/client_info.h b/services/include/client_info.h index c6c020e3..d90e919b 100644 --- a/services/include/client_info.h +++ b/services/include/client_info.h @@ -107,4 +107,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // CLIENT_INFO_H +#endif // CLIENT_INFO_H diff --git a/services/include/fifo_cache_data.h b/services/include/fifo_cache_data.h index 3fc800b3..1a44751d 100644 --- a/services/include/fifo_cache_data.h +++ b/services/include/fifo_cache_data.h @@ -45,4 +45,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // FIFO_CACHE_DATA_H \ No newline at end of file +#endif // FIFO_CACHE_DATA_H \ No newline at end of file diff --git a/services/include/flush_info_record.h b/services/include/flush_info_record.h index 2d5fa642..9a0bc1ae 100644 --- a/services/include/flush_info_record.h +++ b/services/include/flush_info_record.h @@ -66,4 +66,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // FLUSH_INFO_RECORD_H +#endif // FLUSH_INFO_RECORD_H diff --git a/services/include/sensor_data_processer.h b/services/include/sensor_data_processer.h index bd229494..6998d34f 100644 --- a/services/include/sensor_data_processer.h +++ b/services/include/sensor_data_processer.h @@ -64,4 +64,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // endif SENSORS_DATA_PROCESSER_H +#endif // endif SENSORS_DATA_PROCESSER_H diff --git a/services/include/sensor_dump.h b/services/include/sensor_dump.h index 2e2faaea..1a311d3d 100644 --- a/services/include/sensor_dump.h +++ b/services/include/sensor_dump.h @@ -49,4 +49,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_DUMP_H +#endif // SENSOR_DUMP_H diff --git a/services/include/sensor_manager.h b/services/include/sensor_manager.h index 5f8d1905..a3afe0a1 100644 --- a/services/include/sensor_manager.h +++ b/services/include/sensor_manager.h @@ -62,4 +62,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_MANAGER_H +#endif // SENSOR_MANAGER_H diff --git a/services/include/sensor_service.h b/services/include/sensor_service.h index 98a0e9dc..6c5867f7 100644 --- a/services/include/sensor_service.h +++ b/services/include/sensor_service.h @@ -117,4 +117,4 @@ private: #define POWER_POLICY SensorPowerPolicy::GetInstance() } // namespace Sensors } // namespace OHOS -#endif // SENSOR_SERVICE_H +#endif // SENSOR_SERVICE_H diff --git a/services/include/sensor_service_proxy.h b/services/include/sensor_service_proxy.h index 9f61c4a9..80804353 100644 --- a/services/include/sensor_service_proxy.h +++ b/services/include/sensor_service_proxy.h @@ -44,4 +44,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_SERVICE_PROXY_H +#endif // SENSOR_SERVICE_PROXY_H diff --git a/services/include/sensor_service_stub.h b/services/include/sensor_service_stub.h index 0baa6da6..25a76d35 100644 --- a/services/include/sensor_service_stub.h +++ b/services/include/sensor_service_stub.h @@ -51,4 +51,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_SERVICE_STUB_H +#endif // SENSOR_SERVICE_STUB_H diff --git a/services/include/stream_server.h b/services/include/stream_server.h index 64864c2c..b9496445 100644 --- a/services/include/stream_server.h +++ b/services/include/stream_server.h @@ -43,4 +43,4 @@ protected: }; } // namespace Sensors } // namespace OHOS -#endif // STREAM_SERVER_H +#endif // STREAM_SERVER_H diff --git a/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js index 00719bf2..d0b5c36f 100755 --- a/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js @@ -540,7 +540,7 @@ describe("SensorJsTest", function () { */ it('Sensor_GetGeomagneticField_001', 0, async function (done) { console.info("---------------------------Sensor_GetGeomagneticField_001----------------------------------"); - let promiseArray = [] + let promiseArray = [] for (let i = 0; i < timeMillis.length; i++) { promiseArray.push(new Promise((resolve, reject) => { let j = i @@ -581,7 +581,7 @@ describe("SensorJsTest", function () { */ it('Sensor_GetGeomagneticField_002', 0, async function (done) { console.info("---------------------------Sensor_GetGeomagneticField_002----------------------------------"); - let promiseArray = [] + let promiseArray = [] for (let i = 0; i < GEOMAGNETIC_COORDINATES.length; i++) { promiseArray.push(new Promise((resolve, reject) => { let j = i @@ -2502,7 +2502,7 @@ describe("SensorJsTest", function () { * @tc.author: */ it('Sensor_GetDirection_005', 0, async function (done) { - try { + try { sensor.getOrientation([1,2,3,1,2,3,1,2,3,0]).then((data) => { for (let i = 0; i < data.length; i++) { console.info("Sensor_GetDirection_005 failed") diff --git a/utils/common/include/active_info.h b/utils/common/include/active_info.h index 721e96c4..4ffcc794 100644 --- a/utils/common/include/active_info.h +++ b/utils/common/include/active_info.h @@ -44,4 +44,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // ACTIVE_INFO_H \ No newline at end of file +#endif // ACTIVE_INFO_H \ No newline at end of file diff --git a/utils/common/include/app_thread_info.h b/utils/common/include/app_thread_info.h index 8e6738ba..b034726b 100644 --- a/utils/common/include/app_thread_info.h +++ b/utils/common/include/app_thread_info.h @@ -31,4 +31,4 @@ struct AppThreadInfo { }; } // namespace Sensors } // namespace OHOS -#endif // APP_THREAD_INFO_H +#endif // APP_THREAD_INFO_H diff --git a/utils/common/include/death_recipient_template.h b/utils/common/include/death_recipient_template.h index d3a13a7a..41d82591 100755 --- a/utils/common/include/death_recipient_template.h +++ b/utils/common/include/death_recipient_template.h @@ -35,4 +35,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // DEATH_RECIPIENT_TEMPLATE_H +#endif // DEATH_RECIPIENT_TEMPLATE_H diff --git a/utils/common/include/permission_util.h b/utils/common/include/permission_util.h index 1fef8a2f..b6b0eb41 100644 --- a/utils/common/include/permission_util.h +++ b/utils/common/include/permission_util.h @@ -45,4 +45,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // PERMISSION_UTIL_H +#endif // PERMISSION_UTIL_H diff --git a/utils/common/include/report_data_callback.h b/utils/common/include/report_data_callback.h index c7c6fa37..abb363d0 100644 --- a/utils/common/include/report_data_callback.h +++ b/utils/common/include/report_data_callback.h @@ -25,7 +25,7 @@ constexpr int32_t CIRCULAR_BUF_LEN = 1024; constexpr int32_t SENSOR_DATA_LENGTH = 64; struct CircularEventBuf { - struct SensorData *circularBuf; + struct SensorData *circularBuf; int32_t readPos; int32_t writePosition; int32_t eventNum; @@ -43,4 +43,4 @@ public: using ReportDataCb = int32_t (ReportDataCallback::*)(SensorData *sensorData, sptr cb); } // namespace Sensors } // namespace OHOS -#endif // REPORT_DATA_CALLBACK_H +#endif // REPORT_DATA_CALLBACK_H diff --git a/utils/common/include/sensor.h b/utils/common/include/sensor.h index 6bf0499c..b31bb411 100644 --- a/utils/common/include/sensor.h +++ b/utils/common/include/sensor.h @@ -74,4 +74,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_H +#endif // SENSOR_H diff --git a/utils/common/include/sensor_basic_data_channel.h b/utils/common/include/sensor_basic_data_channel.h index 14552779..38d098fb 100644 --- a/utils/common/include/sensor_basic_data_channel.h +++ b/utils/common/include/sensor_basic_data_channel.h @@ -52,4 +52,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_H +#endif // SENSOR_H diff --git a/utils/common/include/sensor_basic_info.h b/utils/common/include/sensor_basic_info.h index 05345a06..28f40a2a 100755 --- a/utils/common/include/sensor_basic_info.h +++ b/utils/common/include/sensor_basic_info.h @@ -41,4 +41,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_BASIC_INFO_H +#endif // SENSOR_BASIC_INFO_H diff --git a/utils/common/include/sensor_channel_info.h b/utils/common/include/sensor_channel_info.h index b8183295..fa53f3b4 100644 --- a/utils/common/include/sensor_channel_info.h +++ b/utils/common/include/sensor_channel_info.h @@ -49,4 +49,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_CHANNEL_INFO_H +#endif // SENSOR_CHANNEL_INFO_H diff --git a/utils/common/include/sensor_data_event.h b/utils/common/include/sensor_data_event.h index 51bcbaca..f62d79e0 100755 --- a/utils/common/include/sensor_data_event.h +++ b/utils/common/include/sensor_data_event.h @@ -56,4 +56,4 @@ struct ExtraSensorInfo { }; } // namespace Sensors } // namespace OHOS -#endif // SENSOR_DATA_EVENT_H +#endif // SENSOR_DATA_EVENT_H diff --git a/utils/common/include/sensor_delayed_sp_singleton.h b/utils/common/include/sensor_delayed_sp_singleton.h index a8f14ce9..22f72414 100644 --- a/utils/common/include/sensor_delayed_sp_singleton.h +++ b/utils/common/include/sensor_delayed_sp_singleton.h @@ -70,4 +70,4 @@ void SensorDelayedSpSingleton::DestroyInstance() } } // namespace Sensors } // namespace OHOS -#endif // SENSOR_DELAYED_SP_SINGLETON_H \ No newline at end of file +#endif // SENSOR_DELAYED_SP_SINGLETON_H \ No newline at end of file diff --git a/utils/common/include/sensor_errors.h b/utils/common/include/sensor_errors.h index f4330c33..3bf14b8c 100644 --- a/utils/common/include/sensor_errors.h +++ b/utils/common/include/sensor_errors.h @@ -139,7 +139,7 @@ private: const char *func_ { nullptr }; }; -#define CALL_LOG_ENTER InnerFunctionTracer ___innerFuncTracer___ { LABEL, __FUNCTION__ } +#define CALL_LOG_ENTER InnerFunctionTracer ___innerFuncTracer___ { LABEL, __FUNCTION__ } #ifdef DEBUG_CODE_TEST #define CHKPL(cond, ...) \ @@ -310,4 +310,4 @@ private: #endif } // namespace Sensors } // namespace OHOS -#endif // SENSORS_ERRORS_H +#endif // SENSORS_ERRORS_H diff --git a/utils/common/include/sensor_utils.h b/utils/common/include/sensor_utils.h index c37d2ca1..e9e252af 100644 --- a/utils/common/include/sensor_utils.h +++ b/utils/common/include/sensor_utils.h @@ -27,4 +27,4 @@ bool IsEqual(const T &left, const T &right) } // namespace Sensors } // namespace OHOS -#endif // SENSOR_UTILS_H +#endif // SENSOR_UTILS_H diff --git a/utils/ipc/include/circle_stream_buffer.h b/utils/ipc/include/circle_stream_buffer.h index 569ab5b1..a97bca7e 100644 --- a/utils/ipc/include/circle_stream_buffer.h +++ b/utils/ipc/include/circle_stream_buffer.h @@ -34,4 +34,4 @@ protected: }; } // namespace Sensors } // namespace OHOS -#endif // CIRCLE_STREAM_BUFFER_H \ No newline at end of file +#endif // CIRCLE_STREAM_BUFFER_H \ No newline at end of file diff --git a/utils/ipc/include/net_packet.h b/utils/ipc/include/net_packet.h index e4481796..503f4795 100644 --- a/utils/ipc/include/net_packet.h +++ b/utils/ipc/include/net_packet.h @@ -47,4 +47,4 @@ protected: }; } // namespace Sensors } // namespace OHOS -#endif // NET_PACKET_H \ No newline at end of file +#endif // NET_PACKET_H \ No newline at end of file diff --git a/utils/ipc/include/proto.h b/utils/ipc/include/proto.h index bbde86ad..79565458 100644 --- a/utils/ipc/include/proto.h +++ b/utils/ipc/include/proto.h @@ -35,4 +35,4 @@ enum class MessageId : int32_t { }; } // namespace Sensors } // namespace OHOS -#endif // PROTO_H \ No newline at end of file +#endif // PROTO_H \ No newline at end of file diff --git a/utils/ipc/include/stream_buffer.h b/utils/ipc/include/stream_buffer.h index 8da0ed3a..316c520f 100644 --- a/utils/ipc/include/stream_buffer.h +++ b/utils/ipc/include/stream_buffer.h @@ -191,4 +191,4 @@ StreamBuffer &StreamBuffer::operator<<(const T &data) } } // namespace Sensors } // namespace OHOS -#endif // STREAM_BUFFER_H \ No newline at end of file +#endif // STREAM_BUFFER_H \ No newline at end of file diff --git a/utils/ipc/src/stream_socket.cpp b/utils/ipc/src/stream_socket.cpp index 0cb15c29..bd37f51d 100644 --- a/utils/ipc/src/stream_socket.cpp +++ b/utils/ipc/src/stream_socket.cpp @@ -80,7 +80,7 @@ void StreamSocket::OnReadPackets(CircleStreamBuffer &circBuf, StreamSocket::Pack } } } -#endif // OHOS_BUILD_ENABLE_RUST +#endif // OHOS_BUILD_ENABLE_RUST void StreamSocket::Close() { diff --git a/vibration_convert/core/algorithm/conversion/include/conversion_filter.h b/vibration_convert/core/algorithm/conversion/include/conversion_filter.h index 255aa4cf..925af0f9 100644 --- a/vibration_convert/core/algorithm/conversion/include/conversion_filter.h +++ b/vibration_convert/core/algorithm/conversion/include/conversion_filter.h @@ -130,4 +130,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // CONVERSION_FILTER_H \ No newline at end of file +#endif // CONVERSION_FILTER_H \ No newline at end of file diff --git a/vibration_convert/core/algorithm/conversion/include/conversion_mfcc.h b/vibration_convert/core/algorithm/conversion/include/conversion_mfcc.h index b7fef112..51598242 100644 --- a/vibration_convert/core/algorithm/conversion/include/conversion_mfcc.h +++ b/vibration_convert/core/algorithm/conversion/include/conversion_mfcc.h @@ -108,4 +108,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // CONVERSION_MFCC_H \ No newline at end of file +#endif // CONVERSION_MFCC_H \ No newline at end of file diff --git a/vibration_convert/core/algorithm/conversion/include/fft.h b/vibration_convert/core/algorithm/conversion/include/fft.h index 7b1a1786..958392d3 100644 --- a/vibration_convert/core/algorithm/conversion/include/fft.h +++ b/vibration_convert/core/algorithm/conversion/include/fft.h @@ -122,4 +122,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // FFT_H \ No newline at end of file +#endif // FFT_H \ No newline at end of file diff --git a/vibration_convert/core/algorithm/frequency_estimation/include/frequency_estimation.h b/vibration_convert/core/algorithm/frequency_estimation/include/frequency_estimation.h index 8ba3e5f4..cc7d46d0 100644 --- a/vibration_convert/core/algorithm/frequency_estimation/include/frequency_estimation.h +++ b/vibration_convert/core/algorithm/frequency_estimation/include/frequency_estimation.h @@ -64,4 +64,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // FREQUENCY_ESTIMATION_H \ No newline at end of file +#endif // FREQUENCY_ESTIMATION_H \ No newline at end of file diff --git a/vibration_convert/core/algorithm/peak_finder/include/peak_finder.h b/vibration_convert/core/algorithm/peak_finder/include/peak_finder.h index 0d8971de..811f54e2 100644 --- a/vibration_convert/core/algorithm/peak_finder/include/peak_finder.h +++ b/vibration_convert/core/algorithm/peak_finder/include/peak_finder.h @@ -186,4 +186,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // PEAK_FINDER_H \ No newline at end of file +#endif // PEAK_FINDER_H \ No newline at end of file diff --git a/vibration_convert/core/native/include/audio_parsing.h b/vibration_convert/core/native/include/audio_parsing.h index d8a4f011..094ce211 100644 --- a/vibration_convert/core/native/include/audio_parsing.h +++ b/vibration_convert/core/native/include/audio_parsing.h @@ -48,4 +48,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // AUDIO_PARSING_H \ No newline at end of file +#endif // AUDIO_PARSING_H \ No newline at end of file diff --git a/vibration_convert/core/native/include/generate_vibration_json_file.h b/vibration_convert/core/native/include/generate_vibration_json_file.h index f03242e8..a9a60427 100644 --- a/vibration_convert/core/native/include/generate_vibration_json_file.h +++ b/vibration_convert/core/native/include/generate_vibration_json_file.h @@ -35,4 +35,4 @@ public: }; } // namespace Sensors } // namespace OHOS -#endif // GENERATE_VIBRATION_JSON_FILE_H \ No newline at end of file +#endif // GENERATE_VIBRATION_JSON_FILE_H \ No newline at end of file diff --git a/vibration_convert/core/native/include/vibration_convert_core.h b/vibration_convert/core/native/include/vibration_convert_core.h index 9757ba43..159d87a1 100644 --- a/vibration_convert/core/native/include/vibration_convert_core.h +++ b/vibration_convert/core/native/include/vibration_convert_core.h @@ -205,4 +205,4 @@ private: }; } // namespace Sensors } // namespace OHOS -#endif // VIBRATION_CONVERT_CORE_H \ No newline at end of file +#endif // VIBRATION_CONVERT_CORE_H \ No newline at end of file diff --git a/vibration_convert/core/native/include/vibration_convert_type.h b/vibration_convert/core/native/include/vibration_convert_type.h index f180bca3..8d39a3c6 100644 --- a/vibration_convert/core/native/include/vibration_convert_type.h +++ b/vibration_convert/core/native/include/vibration_convert_type.h @@ -141,4 +141,4 @@ struct RawFileDescriptor { #ifdef __cplusplus }; #endif -#endif // VIBRATION_CONVERT_TYPE_H +#endif // VIBRATION_CONVERT_TYPE_H diff --git a/vibration_convert/core/native/test/unittest/data.h b/vibration_convert/core/native/test/unittest/data.h index ca3eb9ca..40960a2f 100644 --- a/vibration_convert/core/native/test/unittest/data.h +++ b/vibration_convert/core/native/test/unittest/data.h @@ -40,4 +40,4 @@ std::vector AudioSrcDatas = { }; } // namespace Sensors } // namespace OHOS -#endif // UT_TEST_DATA_H \ No newline at end of file +#endif // UT_TEST_DATA_H \ No newline at end of file diff --git a/vibration_convert/core/utils/include/utils.h b/vibration_convert/core/utils/include/utils.h index f6a32870..07689309 100644 --- a/vibration_convert/core/utils/include/utils.h +++ b/vibration_convert/core/utils/include/utils.h @@ -46,7 +46,7 @@ constexpr double F_HALF = 0.5; constexpr double F_THREE = 3.0; constexpr double SAMPLE_IN_MS = 1000.0; constexpr double INTERSITY_BOUNDARY_POINT = 0.25; -constexpr double INTERSITY_NUMBER_BOUNDARY_POINT = 0.75; +constexpr double INTERSITY_NUMBER_BOUNDARY_POINT = 0.75; } // namespace enum WindowType { @@ -207,4 +207,4 @@ inline double ConvertHtkHz(double mels) } } // namespace Sensors } // namespace OHOS -#endif // CONVERSION_UTILS_H \ No newline at end of file +#endif // CONVERSION_UTILS_H \ No newline at end of file -- Gitee