震动强度修改

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
index e9b578f..9bf9fdd 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckAbnormalView.cpp
@@ -184,7 +184,8 @@ namespace OHOS
         
         if(true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         // 增加按键监听

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckInvalidView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckInvalidView.cpp
index 727f9cb..77c9cc7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckInvalidView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/health/CheckInvalidView.cpp
@@ -245,7 +245,8 @@ namespace OHOS
         if(true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             // 震动提醒
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         // 增加按键监听

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
index a49cab7..afe2f2a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
@@ -197,7 +197,8 @@ bool VolumeSliderEventListener::OnRotateEnd(UIView& view, const RotateEvent& eve
         if (slider == progress)\r
         {\r
             ChangeVolume(VOLUMEDRAG);\r
-            custom_VibratorFunc_int(0);//受设置中震动强度控制\r
+            custom_VibratorFunc_int(5);//受设置中震动强度控制\r
+            custom_VibratorFunc_int(5);//受设置中震动强度控制\r
         }\r
     }\r
     return true;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index f92836a..7315eb7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -91,7 +91,7 @@ namespace OHOS
         }
         else if (strcmp(view.GetViewId(), FACTORY_RESET_BUTTON_CHECK_ON) == 0) // 恢复出厂设置确认
         {
-            custom_VibratorFunc_int(0); //恢复出厂增加震动
+            custom_VibratorFunc_int(5); //恢复出厂增加震动
             view_->ChangeView(FACTORYRESET, SHUTDOWNANIMATOR);
             ShutDownImageAnimatorView::GetInstance()->ShutDownImageAnimator_Start(2);
             isShutDownImageAnimatorStart = true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/record/src/RecordingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/record/src/RecordingModel.cpp
index 2247daa..77f2f84 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/record/src/RecordingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/record/src/RecordingModel.cpp
@@ -1122,7 +1122,7 @@ namespace OHOS
                 if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
                 {
                     // 震动提醒
-                    custom_VibratorFunc_int(0);
+                    custom_VibratorFunc_int(5);
                 }
                 RecordingPresenter::GetInstance()->StopRecord();  //  停止录制
                 RecordingPresenter::GetInstance()->showWarning(); // 显示警告

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
index 0586cde..26b78a4 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
@@ -200,7 +200,7 @@ namespace OHOS
                     breath->SetTextId(STR_EXHALE_NOW);
                 }
                 // 震动提醒
-                custom_VibratorFunc_int(0);
+                custom_VibratorFunc_int(5);
                 breath->ForceResetText();
             }
         }
@@ -244,7 +244,7 @@ namespace OHOS
         StartRespiratoryTraining();                          // 开始呼吸训练
         HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::INITIATIVE); // 开启心率检测
         RespiratoryTrainingModel::GetInstance().RT_StartTimer(RespiratoryTrainingModel::GetInstance().GetRespiratoryTrainingTime()); // 开启定时器
-        custom_VibratorFunc_int(0);                                                                                                  // 震动
+        custom_VibratorFunc_int(5);                                                                                                  // 震动
     }
 
     bool RespiratoryTrainingView::OnClick(UIView &view, const ClickEvent &event)
@@ -481,7 +481,7 @@ namespace OHOS
         StartRespiratoryTraining();                                                          // 开始呼吸训练
         HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::INITIATIVE); // 开启心率检测
         RespiratoryTrainingModel::GetInstance().RT_StartTimer(ONE_MIN);                      // 开启一个一分钟的定时器
-        custom_VibratorFunc_int(0);                                                          // 震动提醒
+        custom_VibratorFunc_int(5);                                                          // 震动提醒
 #endif
     }
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
index 03aa7e4..2dbff69 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
@@ -204,7 +204,7 @@ namespace OHOS
     bool VoumeProcessSliderEventListener::OnRotateEnd(UIView& view, const RotateEvent& event)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "VoumeProcessSliderEventListener::OnRotateEnd,%d",event.GetRotate());
-        custom_VibratorFunc_int(0);//受设置中震动强度控制
+        custom_VibratorFunc_int(5);//受设置中震动强度控制
         return true;
     }
 }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
index 5488fc4..8cb798a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/stress/src/stressTestModel.cpp
@@ -518,7 +518,7 @@ namespace OHOS
             StressTestModel::GetInstance().SetCurrentFailType(StressTestModel::FAIL_TYPE_INVALID_DATA);
             StressTest_StopTimer();
             // 震动提醒
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
             // 亮屏
             uapi_set_screen_on_api();
             // 切换到失败页面
@@ -579,7 +579,7 @@ namespace OHOS
             // 停止压力测试
             StressTest_StopTimer();
             // 震动
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
             // 亮屏
             uapi_set_screen_on_api();
             return;
@@ -591,7 +591,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "压力测试: 有效数据不足 ringBufferIndex:%d", ringBufferIndex);
             StressTestModel::GetInstance().SetCurrentFailType(StressTestModel::FAIL_TYPE_INVALID_DATA);
             // 震动提醒
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
             // 停止压力测试
             StressTest_StopTimer();
             // 切换到失败页面
@@ -616,7 +616,7 @@ namespace OHOS
             StressTestModel::GetInstance().SetCurrentFailType(StressTestModel::FAIL_TYPE_NOT_WORN);
             StressTest_StopTimer();
             // 震动提醒
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
             // 切换到失败页面
             if (StressTestPresenter::GetInstance())
             {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemPresenter.cpp
index fdd3fbe..1bf344a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemPresenter.cpp
@@ -230,7 +230,7 @@ namespace OHOS
         }\r
         else if (strcmp(view.GetViewId(), FACTORYRESET_CHECKON) == 0) // 恢复出厂设置确认\r
         {\r
-            custom_VibratorFunc_int(0); //恢复出厂增加震动\r
+            custom_VibratorFunc_int(5); //恢复出厂增加震动\r
             p_SystemView->ChangeView(FACTORYRESETVIEW, SHUTDOWNANIMATIONVIEW);\r
             ShutDownImageAnimatorView::GetInstance()->ShutDownImageAnimator_Start(2);\r
             isShutDownImageAnimatorStart = true;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
index aafcf1c..2df1f6f 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -548,7 +548,7 @@
      uapi_set_screen_on_api(); // 亮屏检测
      if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() &&
          (!uapi_sleep_mode_flag_get())) {
-       custom_VibratorFunc_int(0);
+       custom_VibratorFunc_int(5);
      }
      if (TraingCardView::GetInstance()) {
        GraphicService::GetInstance()->PostGraphicEvent(
@@ -1285,7 +1285,7 @@ void TraingModel::SetSportdata(SportData *data) {
        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "目标完成");
        uapi_set_screen_on_api(); // 亮屏检测
        if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb()) {
-         custom_VibratorFunc_int(0); // 震动提示
+         custom_VibratorFunc_int(5); // 震动提示
        }
        if (TraingCardView::GetInstance()) {
          GraphicService::GetInstance()->PostGraphicEvent(
@@ -1310,7 +1310,7 @@ void TraingModel::SetSportdata(SportData *data) {
      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "目标完成");
      uapi_set_screen_on_api(); // 亮屏检测
      if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb()) {
-       custom_VibratorFunc_int(0); // 震动提示
+       custom_VibratorFunc_int(5); // 震动提示
      }
      if (TraingCardView::GetInstance()) {
        GraphicService::GetInstance()->PostGraphicEvent(
@@ -1934,7 +1934,7 @@ bool TraingModel::GetMomentum() {
    // 振动反馈
    if ((sportdata->goaldegree >= 100) && (shock_count < 4)) {
      shock_count++;
-     custom_VibratorFunc_int(0); // 触发振动反馈
+     custom_VibratorFunc_int(5); // 触发振动反馈
      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "触发了振动。振动计数: %d",
                    shock_count);
    }

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/alarm_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/alarm_notification.cpp
index ffdc01b..eaa7454 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/alarm_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/alarm_notification.cpp
@@ -118,7 +118,7 @@ namespace OHOS
             // }\r
             if (g_alarmView)\r
             {\r
-                custom_VibratorFunc_int(0);\r
+                custom_VibratorFunc_int(5);\r
             }\r
         }\r
     }\r

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/drinkReminder_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/drinkReminder_notification.cpp
index 4f5f10c..8f3781b 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/drinkReminder_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/drinkReminder_notification.cpp
@@ -101,6 +101,7 @@ namespace OHOS
         {
             // uapi_vibrationModeSet(ConfigModel::GetInstance()->GetVibrationReminder());
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
     }
 
@@ -252,6 +253,7 @@ namespace OHOS
             if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
             {
                 custom_VibratorFunc_int(5); // 震动一次
+                custom_VibratorFunc_int(5); // 震动一次
             }
 
             ScreenTurnOn(10 * 1000); // 亮屏操作  10秒关闭

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/findwatch_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/findwatch_notification.cpp
index f8effa3..453f6e8 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/findwatch_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/findwatch_notification.cpp
@@ -106,7 +106,7 @@ namespace OHOS
     {
         if (nullptr != FindWatchGroupView)
         {
-            custom_VibratorFunc_int(0);
+            custom_VibratorFunc_int(5);
         }
     }
 

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
index 57033ef..ced2cda 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/goal_notification.cpp
@@ -304,6 +304,7 @@ namespace OHOS
             if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
             {
                 custom_VibratorFunc_int(5);
+                custom_VibratorFunc_int(5);
             }
         }
         if (GoalviewShowCallBack_FALG == 0)

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/message_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/message_notification.cpp
index 8fbbab6..466b5e0 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/message_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/message_notification.cpp
@@ -274,6 +274,7 @@ namespace OHOS
         {
             // 震动提醒
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         MessageViewEventListener::GetInstance()

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/motion_recognition_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/motion_recognition_notification.cpp
index a2ab5c3..cdfc894 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/motion_recognition_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/motion_recognition_notification.cpp
@@ -353,6 +353,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
         /* -------------------------------------------------------------------------- */
         NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(FreeMotionRecognitionView);

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/pairing_notification.cpp
index 1d8a686..93efab2 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/pairing_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/pairing_notification.cpp
@@ -395,6 +395,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         ScreenTurnOn(40 * 1000); // 亮屏操作  40秒关闭
@@ -557,6 +558,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5); // 震动一次
+            custom_VibratorFunc_int(5); // 震动一次
         }
 
         ScreenTurnOff();    //先设置为0

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/phone_crt.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/phone_crt.cpp
index ce93cf5..0163402 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/phone_crt.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/phone_crt.cpp
@@ -863,7 +863,7 @@ void phone_VibratorFunc(void)
 {
     if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
     {
-        custom_VibratorFunc_int(0);
+        custom_VibratorFunc_int(5);
     }
 }
  

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sedentaryReminder_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sedentaryReminder_notification.cpp
index d604fa5..5ccc2b2 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sedentaryReminder_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sedentaryReminder_notification.cpp
@@ -289,6 +289,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
         /* -------------------------------------------------------------------------- */
         NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(FreeSedentaryReminderView);

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sleep_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sleep_notification.cpp
index 9587348..7450bbc 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sleep_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/sleep_notification.cpp
@@ -162,6 +162,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         ScreenTurnOn(100000); // 亮屏操作 100000ms 10秒关闭
@@ -208,6 +209,7 @@ namespace OHOS
         if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
         {
             custom_VibratorFunc_int(5);
+            custom_VibratorFunc_int(5);
         }
 
         ScreenTurnOn(600000); // 亮屏操作 600000ms 60秒关闭