修改震动方式待测试

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
index 6aa7511..0e99ab4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
@@ -48,6 +48,8 @@ void CAT1_ChangeStatusScreendisplay(int lastStatus);
 void InitCallingTimer();\r
 \r
 void calllognameupdate(void);\r
+void InitshakeTimer();\r
+void DisshakeTimer();\r
 \r
 void Call_headset_state_updata(int data);\r
 namespace OHOS {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
index 6ecaa78..da417ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -99,7 +99,7 @@ static void SetPriorityNumber()
 }
 
 
-static void DisshakeTimer()
+ void DisshakeTimer()
 {
     if (g_shake != nullptr) {
         osStatus_t ret = osTimerDelete(g_shake);
@@ -330,7 +330,7 @@ void InitCallingTimer()
     }
 }
 
-static void InitshakeTimer()
+void InitshakeTimer()
 {
     if (g_shake != nullptr) {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallerLogModel::CallerTimer already exists!!");

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
index e7dc57d..dc25cb0 100755 (executable)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
@@ -743,7 +743,7 @@ void  using_cat1_phone_state_change_cb(uint8_t state)
 {
     g_callOperate = state;
     DisableCallTimer(CallTimerType::NOTIFY_PHONE_DIAL_DISPLAY);
-
+    DisshakeTimer();
 
     switch (g_callOperate) {
         case OPERATE_DIALING:
@@ -765,11 +765,12 @@ void  using_cat1_phone_state_change_cb(uint8_t state)
             IncomingHandle();
             calllog_info_init(0);
 
-            if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
-            {
-                ui_api_vibrate_once_func();
+            // if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
+            // {
+            //     ui_api_vibrate_once_func();
 
-            }
+            // }
+            InitshakeTimer();
             
             call_stat=2;
              uapi_save_runtime_log(RUNTIME_LOG_PHONE_CAT1_INCOMING);