diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 0a4b53111628898ebc99bd7243c4733be31891d2..e08f64579d7090b181e9935be8057e0fb403de3a 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -75,6 +75,9 @@ private: bool InitInterface(); bool InitLightInterface(); std::string GetPackageName(AccessTokenID tokenId); +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO + int32_t FastVibratorEffect(const VibrateInfo &info); +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO void StartVibrateThread(VibrateInfo info); int32_t StopVibratorService(int32_t vibratorId); void StopVibrateThread(); diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 401f2e7e2a4cbec6f1ba9604bae6ecf12bc408d3..b7d0655720a4a4a696085ed0c49fe209590c72ef 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -70,7 +70,7 @@ VibratorCapacity g_capacity; const std::string PHONE_TYPE = "phone"; #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM #ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO -constexpr int32_t VIBRATOR_DURATION = 50; +constexpr int32_t SHORT_VIBRATOR_DURATION = 50; #endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO } // namespace @@ -476,9 +476,9 @@ void MiscdeviceService::StartVibrateThread(VibrateInfo info) #ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO VibrateInfo currentVibrateInfo = vibratorThread_->GetCurrentVibrateInfo(); if (info.duration <= VIBRATOR_DURATION && currentVibrateInfo.duration <= VIBRATOR_DURATION && - info.mode == VIBRATE_PRESET && currentVibrateInfo.mode == VIBRATE_PRESET) { + info.mode == VIBRATE_PRESET && currentVibrateInfo.mode == VIBRATE_PRESET && info.count == 1) { vibratorThread_->UpdateVibratorEffect(info); - vibratorThread_->Start("VibratorThread"); + FastVibratorEffect(info); } else { #endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO StopVibrateThread(); @@ -519,7 +519,8 @@ int32_t MiscdeviceService::StopVibratorByMode(int32_t vibratorId, const std::str MISC_HILOGE("CheckVibratePermission failed, ret:%{public}d", ret); return PERMISSION_DENIED; } - if ((vibratorThread_ == nullptr) || (!vibratorThread_->IsRunning())) { + if ((vibratorThread_ == nullptr) || (!vibratorThread_->IsRunning() && + !vibratorHdiConnection_.IsVibratorRunning())) { MISC_HILOGD("No vibration, no need to stop"); return ERROR; } @@ -529,6 +530,9 @@ int32_t MiscdeviceService::StopVibratorByMode(int32_t vibratorId, const std::str return ERROR; } StopVibrateThread(); + if (vibratorHdiConnection_.IsVibratorRunning()) { + vibratorHdiConnection_.Stop(HDF_VIBRATOR_MODE_PRESET); + } std::string packageName = GetPackageName(GetCallingTokenID()); std::string curVibrateTime = GetCurrentTime(); MISC_HILOGI("Stop vibrator, currentTime:%{public}s, package:%{public}s, pid:%{public}d, vibratorId:%{public}d," @@ -1073,5 +1077,17 @@ int32_t MiscdeviceService::GetVibratorCapacity(VibratorCapacity &capacity) capacity = g_capacity; return ERR_OK; } + +// 手表短振快速下发不启动线程 +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO +int32_t MiscdeviceService::FastVibratorEffect(const VibrateInfo &info) +{ + int32_t ret = VibratorDevice.StartByIntensity(info.effect, info.intensity); + if (ret != SUCCESS) { + MISC_HILOGE("Vibrate effect %{public}s failed.", info.effect.c_str()); + } + return NO_ERROR; +} +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO } // namespace Sensors } // namespace OHOS diff --git a/test/unittest/vibrator/js/config.json b/test/unittest/vibrator/js/config.json index e5ff85146c2c33ffdcbc57657f21b86fbfba106e..cf70146affa147eda81aa3282d6ea2a5d5a6061b 100644 --- a/test/unittest/vibrator/js/config.json +++ b/test/unittest/vibrator/js/config.json @@ -18,7 +18,8 @@ "deviceType": [ "default", "tablet", - "2in1" + "2in1", + "wearable" ], "distro": { "deliveryWithInstall": true,