From: luozheng <1732036298@qq.com>
Date: Tue, 20 Aug 2024 03:12:00 +0000 (+0800)
Subject: 1.运动识别弹窗根据弹窗汇总设置显示时长为10s，并添加震动
X-Git-Tag: release_V1.2.70_20241020_135402~626
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0db554ac7cc071eb31ba6e79630244d2823f5758;p=mirrors%2FFD230.git

1.运动识别弹窗根据弹窗汇总设置显示时长为10s，并添加震动
2.修复开始按钮的视图Id
---

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 2b05cd551..10c7a7f92 100644
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1142,11 +1142,6 @@ void MsgCenterNotifyArAlertProc(const Topic topic, Request* req)
     {
         return;
     }
-    const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    if (display_api->get_screen_state() != SCREEN_ON)
-    {
-        display_api->turn_on_screen();
-    }
     MotionRecognitionViewEventListener::GetInstance().SetMotionTypeId(*motionType);
     NotificationManager::GetInstance()->ShowNotify(showMotionRecognitionNotify, (uint16_t)topic, true);
 }
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp
index 2dbd7a4fd..c4c9770a0 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-17 16:44:20
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-19 11:25:09
+ * @LastEditTime: 2024-08-20 11:01:16
  * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp
  */
 #include "notification_manager.h"
@@ -19,7 +19,8 @@
 #include <service/graphic_service.h>
 #include "ConfigModel.h"
 #include "traing/include/TraingModel.h"
-
+#include "ui_service.h"
+#include "vibrator_service.h"
 namespace OHOS
 {
 
@@ -292,7 +293,7 @@ namespace OHOS
                 MotionRecognitionStartButton = new UIButton();
             }
             MotionRecognitionStartButton->SetPosition(238, MotionRecognitionNoteLabel->GetY() + MotionRecognitionNoteLabel->GetHeight() + 40, 170, 90);
-            MotionRecognitionStartButton->SetViewId(MOTION_RECOGNITION_IGNORE_BUTTONVIEWID);
+            MotionRecognitionStartButton->SetViewId(MOTION_RECOGNITION_START_BUTTONVIEWID);
             MotionRecognitionStartButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c);
             MotionRecognitionStartButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff383838, UIButton::PRESSED);
             MotionRecognitionStartButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
@@ -330,6 +331,10 @@ namespace OHOS
             MotionRecognitionScrollView->Add(MotionRecognitionIgnoreLabel);
             MotionRecognitionGroupView->Add(MotionRecognitionScrollView);
         }
+        /* -------------------------------------------------------------------------- */
+        ScreenTurnOn(10*1000);//显示时长10s
+        ui_api_vibrate_once_func();
+        /* -------------------------------------------------------------------------- */
         NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(FreeMotionRecognitionView);
         return MotionRecognitionGroupView;
     }