From 8d1ceec43403d69c39f9bb5ba8baafac8c1e0f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E9=A2=96=E6=95=A6?= Date: Thu, 17 Apr 2025 09:21:08 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20services/miscdevice=5Fservice/src/?= =?UTF-8?q?vibration=5Fpriority=5Fmanager.cpp.=20=E6=89=8B=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E9=9C=87=E5=8A=A8?= =?UTF-8?q?=E5=BC=BA=E5=BA=A6=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=A9=AC=E8=BE=BE=E6=9C=8D=E5=8A=A1=E4=BE=A7?= =?UTF-8?q?=E7=9A=84=E9=9C=87=E5=8A=A8=E5=BC=BA=E5=BA=A6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=20=E4=B8=BA=20=E5=BC=BA=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=BC=80=E6=9C=BA=E6=9E=81=E4=BD=8E=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E9=A9=AC=E8=BE=BE=E4=B8=8D=E9=9C=87=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴颖敦 --- services/miscdevice_service/src/vibration_priority_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp index e674bc4..1e9daf0 100644 --- a/services/miscdevice_service/src/vibration_priority_manager.cpp +++ b/services/miscdevice_service/src/vibration_priority_manager.cpp @@ -456,6 +456,7 @@ void VibrationPriorityManager::MiscCrownIntensityFeedbackInit(void) int32_t intensity = miscIntensity_; if (GetIntValue(SETTING_VIBRATE_INTENSITY_KEY, intensity) != ERR_OK) { + intensity = FEEDBACK_INTENSITY_WEAK; MISC_HILOGE("Get intensity failed"); } miscIntensity_ = intensity; @@ -582,7 +583,7 @@ void VibrationPriorityManager::UpdateStatus() if (miscIntensity_ == FEEDBACK_INTENSITY_INVALID) { int32_t intensity = FEEDBACK_INTENSITY_INVALID; if (GetIntValue(SETTING_VIBRATE_INTENSITY_KEY, intensity) != ERR_OK) { - intensity = FEEDBACK_INTENSITY_NONE; + intensity = FEEDBACK_INTENSITY_WEAK; MISC_HILOGE("Get intensity failed"); } miscIntensity_ = intensity; -- Gitee From 25fe5ee7e4dfa9859fe7efd76ddd532c3c509009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E9=A2=96=E6=95=A6?= Date: Thu, 17 Apr 2025 11:36:26 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E8=A1=A8=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=8E=B7=E5=8F=96=E9=9C=87=E5=8A=A8=E5=BC=BA=E5=BA=A6?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=A9=AC=E8=BE=BE=E6=9C=8D=E5=8A=A1=E4=BE=A7=E7=9A=84=E9=9C=87?= =?UTF-8?q?=E5=8A=A8=E5=BC=BA=E5=BA=A6=E9=BB=98=E8=AE=A4=E5=80=BC=20?= =?UTF-8?q?=E4=B8=BA=20=E5=BC=BA=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E5=BC=80=E6=9C=BA=E6=9E=81=E4=BD=8E=E6=A6=82=E7=8E=87?= =?UTF-8?q?=E9=A9=AC=E8=BE=BE=E4=B8=8D=E9=9C=87=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴颖敦 --- .../miscdevice_service/include/vibration_priority_manager.h | 4 ++-- .../miscdevice_service/src/vibration_priority_manager.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/miscdevice_service/include/vibration_priority_manager.h b/services/miscdevice_service/include/vibration_priority_manager.h index 7ede8b5..5b3bab1 100644 --- a/services/miscdevice_service/include/vibration_priority_manager.h +++ b/services/miscdevice_service/include/vibration_priority_manager.h @@ -56,8 +56,8 @@ enum FeedbackMode { #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CROWN enum FeedbackIntensity { FEEDBACK_INTENSITY_INVALID = -1, - FEEDBACK_INTENSITY_WEAK = 0, - FEEDBACK_INTENSITY_STRONGE = 1, + FEEDBACK_INTENSITY_STRONGE = 0, + FEEDBACK_INTENSITY_WEAK = 1, FEEDBACK_INTENSITY_NONE = 2, }; #endif diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp index 1e9daf0..f535972 100644 --- a/services/miscdevice_service/src/vibration_priority_manager.cpp +++ b/services/miscdevice_service/src/vibration_priority_manager.cpp @@ -456,7 +456,7 @@ void VibrationPriorityManager::MiscCrownIntensityFeedbackInit(void) int32_t intensity = miscIntensity_; if (GetIntValue(SETTING_VIBRATE_INTENSITY_KEY, intensity) != ERR_OK) { - intensity = FEEDBACK_INTENSITY_WEAK; + intensity = FEEDBACK_INTENSITY_STRONGE; MISC_HILOGE("Get intensity failed"); } miscIntensity_ = intensity; @@ -583,7 +583,7 @@ void VibrationPriorityManager::UpdateStatus() if (miscIntensity_ == FEEDBACK_INTENSITY_INVALID) { int32_t intensity = FEEDBACK_INTENSITY_INVALID; if (GetIntValue(SETTING_VIBRATE_INTENSITY_KEY, intensity) != ERR_OK) { - intensity = FEEDBACK_INTENSITY_WEAK; + intensity = FEEDBACK_INTENSITY_STRONGE; MISC_HILOGE("Get intensity failed"); } miscIntensity_ = intensity; -- Gitee