Merge #1396 into sdk602patch0911 from refs/changes/1396/head

Code review from 罗正

* refs/changes/1396/head: (2 commits squashed)

  - 将震动服务初始化放到ohos_startup前，并在震动服务初始化成功后震动一次， 经测试有无LCD都能震动

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1396

diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index 48bfe83..73e862a 100755 (executable)
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -442,6 +442,11 @@ static void thread_main(const void *unused)
     button_app_init();\r
     uapi_calendar_init();\r
     uapi_calendar_recover_date();\r
+\r
+#ifdef SUPPORT_AT_VIBRATOR\r
+    uapi_vibrator_service_init();\r
+#endif\r
+\r
 #ifdef SUPPORT_AT_OHOSFWK\r
     ohos_startup();\r
 #endif\r
@@ -453,9 +458,9 @@ static void thread_main(const void *unused)
 #endif\r
 uapi_pm_remove_sleep_veto(PM_ID_DEBUG);\r
 \r
-#ifdef SUPPORT_AT_VIBRATOR\r
-    uapi_vibrator_service_init();\r
-#endif\r
+// #ifdef SUPPORT_AT_VIBRATOR\r
+//     uapi_vibrator_service_init();\r
+// #endif\r
 #ifdef SUPPORT_BATTERY_SERVICE\r
     uapi_battery_init();\r
 #endif\r

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index d1700f9..4cf44df 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -600,7 +600,7 @@ namespace OHOS
             cm_initializeScreenDuration();
 
             // 开机增加震动 页面启动震动一次
-            ui_api_vibrate_once_func();
+            // ui_api_vibrate_once_func();
         }
         // 注册开机时间  
         SystemLogData systemlog;  

diff --git a/code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp b/code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp
index 759e09b..e6865fd 100644 (file)
--- a/code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp
+++ b/code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp
@@ -1,8 +1,8 @@
 /*
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-08-08 16:33:23
- * @LastEditors: SnickerSun snickersun@163.com
- * @LastEditTime: 2024-10-12 13:56:57
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-11-13 16:51:45
  * @FilePath: /FD230/code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp
  * @Description: 
  * 
@@ -219,6 +219,10 @@ errcode_t uapi_vibrator_service_init(void)
     }
 
     OHOS::VibratorManager::GetInstance()->RegisterVibratorFunc(custom_VibratorFunc);
+
+    /* ---------------------------------- 开机震动一次 ---------------------------------- */
+    ui_api_vibrate_once_func();
+    /* -------------------------------------------------------------------------- */
     
     return ERRCODE_SUCC;
 }