Merge #367 into sdk602patch0521 from refs/changes/367/head

Code review from 胡传军

* refs/changes/367/head: (7 commits squashed)

  - 电话修改

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

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

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

  - 修改产测马达使用接口 修改表盘协议BUG

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

  - 修改产测马达使用接口

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/367

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
index 3fbb94e..2206ade 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmotor.cpp
@@ -5,6 +5,7 @@
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
 #include "dock/vibrator_manager.h"
+#include  "vibrator_service.h"
 
 
 #ifdef __cplusplus
@@ -133,10 +134,12 @@ namespace OHOS
                     // // //GRAPHIC_LOGI("UIList::MoveChildByOffset calls TYPE_TWO vibrator");
                     // // }
                     // }
-                    // mail.cycle_time_ms = 235;
-                    // mail.duty = 10;
-                    // mail.duration_time_ms = 100;
-                    g_VibratorFunc(10,235,100);
+                    vibrator_cmd_t mail = {0};
+                    mail.cycle_time_ms = 235;
+                    mail.duty = 60;
+                    mail.duration_time_ms = 100;
+                    do_vibrator_cmd(mail);
+                    //g_VibratorFunc(10,235,100);
                 }
             }
             RootView::GetInstance()->Invalidate();