diff --git a/interfaces/native/vibrator/include/vibrator_agent.h b/interfaces/native/vibrator/include/vibrator_agent.h index 2b68e5b4ed5b38e01aae7605f1c7222ff2e8d124..0cc52546582f2ab4bbf90b5cb7bfe0b03c49d7ac 100755 --- a/interfaces/native/vibrator/include/vibrator_agent.h +++ b/interfaces/native/vibrator/include/vibrator_agent.h @@ -35,6 +35,8 @@ extern "C" { #endif +namespace OHOS { +namespace Sensors { /** * @brief Indicates the mode of stopping a one-shot vibration effect. * @@ -42,7 +44,6 @@ extern "C" { */ const char *VIBRATOR_STOP_MODE_TIME = "time"; - /** * @brief Indicates the mode of stopping a preset vibration effect. * @@ -67,7 +68,6 @@ const char *VIBRATOR_STOP_MODE_PRESET = "preset"; */ int32_t StartVibrator(const char *effectId); - /** * @brief Controls this vibrator to perform a one-shot vibration at a given duration. * @@ -79,14 +79,12 @@ int32_t StartVibrator(const char *effectId); */ int32_t StartVibratorOnce(uint32_t duration); - /** * @brief Enables this vibrator to perform a periodic vibration. * @since 6 */ void EnableLooping(); - /** * @brief Disables this vibrator from performing a periodic vibration. * @@ -96,7 +94,6 @@ void EnableLooping(); */ int32_t DisableLooping(); - /** * @brief Stops the vibration of this vibrator. * @@ -106,10 +103,10 @@ int32_t DisableLooping(); * @since 6 */ int32_t StopVibrator(const char *mode); - +} // namespace Sensors +} // namespace OHOS #ifdef __cplusplus }; #endif - /** @} */ #endif // endif VIBRATOR_AGENT_H \ No newline at end of file diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index fc0075b9426300698a364627cbb6e58a46e9c6ff..6285721d643d931d76433923ab22613482d13c10 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -17,6 +17,8 @@ #include "sensors_log_domain.h" #include "vibrator_service_client.h" +namespace OHOS { +namespace Sensors { using OHOS::HiviewDFX::HiLog; using OHOS::HiviewDFX::HiLogLabel; using OHOS::Sensors::VibratorServiceClient; @@ -38,44 +40,46 @@ int32_t DisableLooping() int32_t StartVibrator(const char *effectId) { - CHKPR(effectId, OHOS::Sensors::ERROR); + CHKPR(effectId, ERROR); bool isLooping = (g_loopingFlag == 1) ? true : false; auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, effectId, isLooping); - if (ret != OHOS::ERR_OK) { + if (ret != ERR_OK) { MISC_HILOGE("vibrator effectId failed, ret: %{public}d", ret); - return OHOS::Sensors::ERROR; + return ERROR; } - return OHOS::Sensors::SUCCESS; + return SUCCESS; } int32_t StartVibratorOnce(uint32_t duration) { if (duration == 0) { MISC_HILOGE("duration is invalid"); - return OHOS::Sensors::ERROR; + return ERROR; } auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, duration); - if (ret != OHOS::ERR_OK) { + if (ret != ERR_OK) { MISC_HILOGE("vibrator duration failed, ret: %{public}d", ret); - return OHOS::Sensors::ERROR; + return ERROR; } - return OHOS::Sensors::SUCCESS; + return SUCCESS; } int32_t StopVibrator(const char *mode) { - CHKPR(mode, OHOS::Sensors::ERROR); + CHKPR(mode, ERROR); if (strcmp(mode, "time") != 0 && strcmp(mode, "preset") != 0) { MISC_HILOGE("mode is invalid, mode is %{public}s", mode); - return OHOS::Sensors::ERROR; + return ERROR; } auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Stop(DEFAULT_VIBRATOR_ID, mode); - if (ret != OHOS::ERR_OK) { + if (ret != ERR_OK) { MISC_HILOGE("client is failed, ret: %{public}d", ret); - return OHOS::Sensors::ERROR; + return ERROR; } - return OHOS::Sensors::SUCCESS; -} \ No newline at end of file + return SUCCESS; +} +} // namespace Sensors +} // namespace OHOS \ No newline at end of file diff --git a/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h index d56efcbbc169872ce69e692876248698bec59496..9cde81d22f60c3f05d0c760791d9537e3ef86b95 100644 --- a/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h +++ b/services/miscdevice_service/hdi_connection/adpter/include/compatible_connection.h @@ -30,7 +30,7 @@ public: int32_t StartOnce(uint32_t duration) override; - int32_t Start(const char *effectType) override; + int32_t Start(const std::string &effectType) override; int32_t Stop(VibratorStopMode mode) override; diff --git a/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h b/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h index 3cbf0dff2d6279d71e38487bac1b59e28559d7ee..b128f4a0688c94eb2c3ed9ad914cc5e11a3e09d5 100644 --- a/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/adpter/include/hdi_connection.h @@ -31,7 +31,7 @@ public: int32_t StartOnce(uint32_t duration) override; - int32_t Start(const char *effectType) override; + int32_t Start(const std::string &effectType) override; int32_t Stop(VibratorStopMode mode) override; diff --git a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp index 18b5cd22fb3807ce613656428b27159bfd42872a..26b1ad394b1569de515d0b674ac187c01944eb80 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/compatible_connection.cpp @@ -57,11 +57,11 @@ int32_t CompatibleConnection::StartOnce(uint32_t duration) return ERR_OK; } -int32_t CompatibleConnection::Start(const char *effectType) +int32_t CompatibleConnection::Start(const std::string &effectType) { CALL_LOG_ENTER; if (std::find(vibratorEffect_.begin(), vibratorEffect_.end(), effectType) == vibratorEffect_.end()) { - MISC_HILOGE("Not support %{public}s type", effectType); + MISC_HILOGE("Not support %{public}s type", effectType.c_str()); return VIBRATOR_ON_ERR; } if (!vibrateThread_.joinable()) { diff --git a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp index aab42003031f4ee42da7758707230dab890ca5d9..06723c0e8be138afaabac5a8f98e2e2a2cf697b8 100644 --- a/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adpter/src/hdi_connection.cpp @@ -54,9 +54,9 @@ int32_t HdiConnection::StartOnce(uint32_t duration) return ERR_OK; } -int32_t HdiConnection::Start(const char *effectType) +int32_t HdiConnection::Start(const std::string &effectType) { - if (effectType == nullptr) { + if (effectType.empty()) { MISC_HILOGE("effectType is null"); return VIBRATOR_ON_ERR; } diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h index aca818eb3a156ba05a6e0d66c3c6e0b3d2d17638..139e0a0935521d8f272fcb70399d6295c96d4668 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h @@ -17,6 +17,7 @@ #define I_VIBRATOR_HDI_CONNECTION_H #include #include +#include namespace OHOS { namespace Sensors { class IVibratorHdiConnection { @@ -35,7 +36,7 @@ public: virtual int32_t StartOnce(uint32_t duration) = 0; - virtual int32_t Start(const char *effectType) = 0; + virtual int32_t Start(const std::string &effectType) = 0; virtual int32_t Stop(VibratorStopMode mode) = 0; diff --git a/services/miscdevice_service/hdi_connection/interface/include/vibrator_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/vibrator_hdi_connection.h index e61e9ac76151cc66c6bc65ebe6e2fb6fcf431378..d9bd476a0f0ca4dea695b9861cf432acb5a479d6 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/vibrator_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/vibrator_hdi_connection.h @@ -31,7 +31,7 @@ public: int32_t StartOnce(uint32_t duration) override; - int32_t Start(const char *effectType) override; + int32_t Start(const std::string &effectType) override; int32_t Stop(VibratorStopMode mode) override; diff --git a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp index 7fb2cf1afc994d175c403a03bc131ff393a283a8..037f76ffdd757f9fc0a011ebedf41d756814a829 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/vibrator_hdi_connection.cpp @@ -53,7 +53,7 @@ int32_t VibratorHdiConnection::StartOnce(uint32_t duration) return ERR_OK; } -int32_t VibratorHdiConnection::Start(const char *effectType) +int32_t VibratorHdiConnection::Start(const std::string &effectType) { int32_t ret = iVibratorHdiConnection_->Start(effectType); if (ret < 0) { diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index f6a8cc4aec5dca8e21a78a9682672ab3857d82a7..5dc2fdcf25b51c427a5e19ba328322f151ec8ded 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -227,8 +227,7 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str } if (!isLooping) { vibratorEffectMap_[vibratorId] = effect; - const char *effectType = (char *)effect.data(); - return vibratorHdiConnection_.Start(effectType); + return vibratorHdiConnection_.Start(effect); } std::unordered_map::iterator iter = hapticRingMap_.find(effect); if (iter == hapticRingMap_.end()) {